Lynne Davis 2d620071f0 Fxing conflicts

2016-02-11 16:14:44 +00:00

..

assets

Prevent body from scrolling when a modal is open

2016-02-05 15:18:18 +11:00

controllers

Refactoring VariantOverridesController#bulk_reset to only reset VOs for a specified hub

2016-01-15 09:07:51 +11:00

helpers

Merge remote-tracking branch 'origin/master' into groups

2016-02-04 16:12:57 +11:00

jobs

Formatting dates for account invoices in rails time zone

2015-12-17 11:34:06 +11:00

mailers

Cleaning up and attempt to add feature spec

2016-01-15 09:07:49 +11:00

models

Order cycles are undated unless they have both open and close dates defined

2016-02-05 09:27:25 +11:00

overrides

Adding BMC link to configurations menu

2015-12-16 19:18:57 +11:00

presenters

Admin can set enterprise fee's tax category

2015-03-05 10:44:25 +11:00

serializers/api

Display receival instructions when editing order cycle

2016-01-29 12:17:20 +11:00

views

Fxing conflicts

2016-02-11 16:14:44 +00:00