Maikel Linke
|
51f94119ff
|
Restore links_dropdown
|
2016-03-11 16:39:07 +11:00 |
|
Maikel Linke
|
2a3b3b6dd2
|
Merge remote-tracking branch 'origin/master' into i18n-hackathon
Conflicts:
app/assets/javascripts/admin/enterprise_fees.js
app/assets/javascripts/admin/enterprises/controllers/side_menu_controller.js.coffee
app/views/admin/shared/_columns_dropdown.html.haml
app/views/admin/variant_overrides/_header.html.haml
app/views/admin/variant_overrides/_products.html.haml
spec/features/admin/bulk_order_management_spec.rb
spec/features/admin/variant_overrides_spec.rb
|
2016-03-11 15:38:28 +11:00 |
|
Maikel Linke
|
711f525d98
|
Remove from locale en.yml
|
2016-03-11 14:45:43 +11:00 |
|
Rob Harrington
|
28b143da73
|
WIP: Splitting Variant overrides into views
|
2016-03-02 12:10:22 +11:00 |
|
Rob Harrington
|
9eaec6061e
|
Pulling columns dropdown out into a shared partial
|
2016-01-13 18:49:32 +11:00 |
|
Rob Harrington
|
e6a51bb49d
|
Adding actions dropdown to admin order view/pages
|
2015-12-16 11:55:23 +11:00 |
|
Rob Harrington
|
69ba8540c1
|
Moving toggle_column directive to index_utils
|
2015-05-13 12:44:33 +10:00 |
|
Rob Harrington
|
5bd842fe1a
|
Moving toggle_column directive to dropdown module
|
2015-05-13 12:44:33 +10:00 |
|
Rob Harrington
|
f5c0ae0f41
|
Moving dropdown to its own module folder and renaming
|
2015-05-13 12:44:33 +10:00 |
|
Rob Harrington
|
1c03e27686
|
Moving dropdown to its own folder
|
2015-05-13 12:44:33 +10:00 |
|