Maikel Linke
587d06dced
Merge remote-tracking branch 'origin/master' into groups
...
Conflicts:
db/schema.rb
2016-03-02 15:31:35 +11:00
Rob Harrington
77e74c5642
OC Coordinators can opt to restrict products in an order cycle to those in their inventory only
2016-03-02 12:10:22 +11:00
Rob Harrington
28b143da73
WIP: Splitting Variant overrides into views
2016-03-02 12:10:22 +11:00
Rob Harrington
8f37aa0522
WIP: Adding Loading flash to variant overrides page
2016-03-02 12:10:22 +11:00
Rob Harrington
7008d26f68
WIP: Alerting user to presence of new variant for inventory, new variants can be filtered + limited
2016-03-02 12:10:22 +11:00
Rob Harrington
f06d909c23
WIP: Adding infrastructure to show/hide variants + overrides using inventory items
2016-03-02 12:10:22 +11:00
Maikel Linke
23a1c2a772
Remove scroll bar from enterprise modal description
...
Multiple scroll bars within a modal were confusing. The inner scroll bar
for the long enterprise description got removed. The general modal
scroll bar persists.
Fix #806 Full profile modal about section copy display improvement
2016-03-02 10:42:40 +11:00
Rohan Mitchell
1e288e5f14
Further styling for select2 after upgrade
2016-02-24 11:26:37 +11:00
Rohan Mitchell
9747b0cf96
Upgrade select2-rails
2016-02-24 11:26:37 +11:00
Rohan Mitchell
d699f8321a
Replace with-tip with ofn-with-tip: dashboard
2016-02-24 11:26:37 +11:00
Maikel Linke
3db79aa6b2
Prevent body from scrolling when a modal is open
2016-02-05 15:18:18 +11:00
Maikel Linke
1f1b0bd783
styling groups blurb
2016-01-22 16:20:07 +11:00
Maikel Linke
fd9de730c8
group producer style adjustment
2016-01-20 13:32:08 +11:00
Rohan Mitchell
07d691fc97
Only apply cart scrolling to non-mobile devices
2016-01-15 16:54:56 +11:00
Maikel
eeb31f65c3
Auto-merged master into combined/cart-fit-to-screen_preserve-max-quantity on deployment.
2016-01-15 16:15:09 +11:00
Rob Harrington
7cd8f35ac8
Tidying up styling and use of skeleton columns on index pages
2016-01-13 18:49:33 +11:00
Rob Harrington
9eaec6061e
Pulling columns dropdown out into a shared partial
2016-01-13 18:49:32 +11:00
Rob Harrington
c781113a65
Adding filters to variant overrides interface
2016-01-13 18:49:32 +11:00
Maikel
826d045532
Auto-merged master into cart-fit-to-screen on deployment.
2016-01-13 16:12:41 +11:00
Rohan Mitchell
a07eabca55
Fit cart to screen and allow scrolling so we can always access all of it
2016-01-13 16:00:43 +11:00
Nicolas Blanc
770a8d0b17
#771-minor-bug-on-Firefox
...
Z-index:1 solved problem on Firefox. It works on Chrome too.
2016-01-10 09:54:35 +01:00
Rob Harrington
0ed8cf973d
Adding an example bill calculator to business model config edit page
...
To allow super admin to see the effects of any changes they make to BMC settings
2015-12-16 19:18:58 +11:00
Rob Harrington
cb9b61f393
WIP: Adding an edit view for BMC variables
2015-12-16 19:18:56 +11:00
Rob Harrington
e6a51bb49d
Adding actions dropdown to admin order view/pages
2015-12-16 11:55:23 +11:00
Rohan Mitchell
921210012a
Swap in StatusMessage service for custom message display in order cycles interface
2015-12-10 09:17:25 +11:00
Rohan Mitchell
7820c31976
Show supplier as secondary in information hierarchy
2015-12-10 09:17:25 +11:00
Rohan Mitchell
d314f07887
Use flexbox to more neatly lay out order cycle products
2015-12-10 09:17:25 +11:00
Rohan Mitchell
9fef0a9909
When order cycle is updated, display message instead of reloading the page
2015-12-10 09:17:24 +11:00
Rob Harrington
33454a7090
Adding server validation errors messages to BOM interface
2015-11-18 14:32:29 +11:00
Rob Harrington
193325f81b
Improve formatting around saving on line items index (BOM)
2015-11-12 09:52:10 +11:00
Rob Harrington
27903a46e6
Adding new save-bar directive for handling save actions for index pages
2015-11-06 09:53:31 +11:00
Rob Harrington
330882c689
Pulling out styling for red buttons in admin into more generic .red class
2015-11-06 09:52:48 +11:00
Rob Harrington
cb1f79f59a
Updating front end order details, invoices and pdfs to display names of line_items as opposed to variants
2015-10-28 15:42:14 +11:00
Rob Harrington
33e1322a44
Adding form validation to BOM
2015-10-28 13:07:32 +11:00
Rob Harrington
619c4959ff
Removing button for updating billable periods from accounts and billing settings page
2015-09-17 22:38:12 +10:00
Rob Harrington
128b6853f4
Styling tweaks to the admin account page
2015-09-17 22:38:11 +10:00
Rob Harrington
7c5816af82
Switching accounts interface over to showing invoices
2015-09-17 22:38:10 +10:00
Rob Harrington
c53b5f3edb
Adding finalize step to accounts and billing settigns page + controller
2015-09-17 22:38:10 +10:00
Maikel Linke
e25805aa78
Restoring all changes of the last combined branch
...
This reverts commit 1e55e8a907
2015-09-10 15:03:13 +10:00
Maikel Linke
1e55e8a907
Reverting all changes of the last combined branch
...
The production server hangs on certain requests. To rule out a code bug,
we revert to the last deployed version.
2015-09-10 12:50:40 +10:00
Maikel Linke
2e3ff8f5c6
doubling cart buttons
2015-09-03 15:52:54 +10:00
Rohan Mitchell
61435b2dea
Add brand guide colours next to definition
2015-07-17 17:05:44 +10:00
Rohan Mitchell
b6892c82f1
Rename australia-orange sass var to country-agnostic brand-colour
2015-07-17 16:27:17 +10:00
Rohan Mitchell
07e6a204f3
Do not bindonce ng-repeat, remove translateZ(0) optimisation - address dangling DOM nodes after ng-repeat finishes.
...
https://github.com/angular/angular.js/issues/4490
2015-07-10 17:45:16 +10:00
Rohan Mitchell
46792a4111
Style results tables
2015-07-10 17:45:16 +10:00
Rohan Mitchell
960e4d3015
Scale logo down when display is very short (ie. iPhone 4)
2015-07-01 15:38:50 +10:00
Rohan Mitchell
7e685b646f
Fine-tune header sizes on home page and cutover point for page_alert responsiveness
2015-06-26 15:54:26 +10:00
Rohan Mitchell
eef302635b
Fix alert overflow on mobile
2015-06-26 15:54:26 +10:00
Rohan Mitchell
6105d008df
Show CTA above the fold on iPhone 5
2015-06-26 15:54:26 +10:00
Rohan Mitchell
dd04afe8f8
Make alert box more legible
2015-06-26 15:54:25 +10:00
