Commit Graph

6636 Commits

Author SHA1 Message Date
Maikel Linke
1c46b8dccb check_github_status.sh can check for user defined statuses
You can call it like this:

    ./script/ci/check_github_status.sh "pending|success"

It will check if the status is pending or success.
2016-01-20 14:58:21 +11:00
Maikel Linke
8c1a16b371 groups blurb text 2016-01-20 14:00:46 +11:00
Maikel Linke
ea796d4f94 Taxon filter for group hubs 2016-01-20 13:32:08 +11:00
Maikel Linke
d5aea1b00d Taxon filter for group producers 2016-01-20 13:32:08 +11:00
Maikel Linke
fd9de730c8 group producer style adjustment 2016-01-20 13:32:08 +11:00
Maikel Linke
fbdeb557ca Loading only visible enterprises for group 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
Rohan Mitchell
046d0f0d19 Merge branch 'preserve-max-quantity' into combined/cart-fit-to-screen_preserve-max-quantity 2016-01-15 16:07:25 +11:00
ludivinecp
a611e73bed Opengraph facebook: images and description for shops and groups and home => ok 2016-01-15 14:03:33 +11:00
Maikel Linke
aea766327c Add say_no and say_yes to locale 2016-01-15 12:07:43 +11:00
Maikel Linke
f68f7ea2b6 Fix display of "Total" 2016-01-15 12:07:43 +11:00
Maikel
ddf6eef370 Auto-merged master into ng-vo-inventory-reset on deployment. 2016-01-15 09:21:54 +11:00
Rob Harrington
9979e31220 Final tidy up after rebasing default_inventory and ng-vo onto origin/master
Fixes a few VO feature specs and a few interface tweaks
2016-01-15 09:07:51 +11:00
Rob Harrington
669642292b Refactoring VariantOverridesController#bulk_reset to only reset VOs for a specified hub 2016-01-15 09:07:51 +11:00
stveep
ecf1aac5cb Added failure message to VO reset 2016-01-15 09:07:51 +11:00
Rob Harrington
4103ed0ba7 Combining variant override controller specs 2016-01-15 09:07:51 +11:00
Rob Harrington
0bbae19b41 Variant Overrides Index: User can manually reset inheritance 2016-01-15 09:07:51 +11:00
Rob Harrington
607a66b6c6 WIP: Fixing a few broken VO specs 2016-01-15 09:07:50 +11:00
Steve Pettitt
a3f7ff19b0 Add new VO fields to shopping spec 2016-01-15 09:07:50 +11:00
Steve Pettitt
0f4479aceb Back to original (current master) Rspec version 2016-01-15 09:07:50 +11:00
Steve Pettitt
1d38866f86 Add migration file to git repo 2016-01-15 09:07:50 +11:00
Steve Pettitt
e423e890e0 Changed name enable_reset to resettable in Variant Overrides table & updated views, specs accordingly 2016-01-15 09:07:50 +11:00
Steve Pettitt
25454d3e97 Added new fields to fix VO deletion feature specs 2016-01-15 09:07:49 +11:00
Steve Pettitt
75127f2a63 Fix feature specs for VO reset 2016-01-15 09:07:49 +11:00
Rob Harrington
94785d4157 Fixing authorization for VariantOverridesController#bulk_reset 2016-01-15 09:07:49 +11:00
Rob Harrington
d01da727f0 Removing :bulk_update action from actions allowed on nil object, using collection_actions methods on controller instead 2016-01-15 09:07:49 +11:00
Steve Pettitt
5a62098b95 Cleaning up and attempt to add feature spec 2016-01-15 09:07:49 +11:00
Steve Pettitt
0ee078e232 Added toggle to enable/disable reset stock. Updated specs 2016-01-15 09:07:48 +11:00
Steve Pettitt
2921958788 Variant override controller spec added 2016-01-15 09:07:48 +11:00
Steve Pettitt
34c603a9c3 Added angular service tests for variant overrides stock reset 2016-01-15 09:07:48 +11:00
Steve Pettitt
6c0dd7e25f Adding 'default_stock' to VariantOverride 2016-01-15 09:07:48 +11:00
Rob Harrington
53d97dab08 WIP: Adding view and routes for resetting variant_overrides count_on_hand 2016-01-15 09:07:48 +11:00
Rob Harrington
3b7700131c Specify controller specs as such 2016-01-15 09:07:47 +11:00
Rob Harrington
14c8683535 Updating active_model_serializers 2016-01-15 09:07:47 +11:00
Rob Harrington
cc4dc068ab Adding variant SKU field to BPE 2016-01-13 18:49:34 +11:00
Rob Harrington
64cd52e067 Adding SKU and on demand to a few VO specs 2016-01-13 18:49:34 +11:00
Rob Harrington
4553bc2997 Moving SaveBar directive and StatusMessage service into admin.utils module 2016-01-13 18:49:33 +11:00
Rob Harrington
521f227f74 Adding sku and on_demand to VariantOverride 2016-01-13 18:49:33 +11:00
Rob Harrington
cab6871de3 Pulling bulk actions dropdown out into partial 2016-01-13 18:49:33 +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
2b70ddb23c Adding columns toggle to variant overrides index 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
54e7677888 Integrating StatusMessages into save-bar, adding to variant overrides index 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
Rob Harrington
4237a83028 Moving components required for variant overrides into appropriate modules 2016-01-13 18:49:32 +11:00
Rob Harrington
f11e878e7f WIP: Reorganising variant overrides javascript files 2016-01-13 18:49:31 +11:00
Maikel
68e2b9a0b9 Auto-merged master into preserve-max-quantity on deployment. 2016-01-13 16:57:31 +11:00
Rohan Mitchell
406338ea05 Remove cruft 2016-01-13 16:45:14 +11:00
Rohan Mitchell
2c3ff37980 Split order cycles controller into parts 2016-01-13 16:45:03 +11:00