Maikel
|
3c8df7c4aa
|
Auto-merged master into delivery_email_updates on deployment.
|
2016-01-30 05:04:11 +11:00 |
|
Lynne Davis
|
c0afa6be49
|
Bug fix
|
2016-01-29 17:57:10 +00:00 |
|
Maikel Linke
|
d0cb9008a2
|
Delete unused shopfront haml
|
2016-01-29 16:09:34 +11:00 |
|
Transifex-Openfoodnetwork
|
e551a6b9f5
|
Updating translations for fr.yml and nb.yml
v1.4.1
|
2016-01-29 14:18:48 +11:00 |
|
Rohan Mitchell
|
533124fe91
|
Display receival instructions when editing order cycle
v1.4.0
|
2016-01-29 12:17:20 +11:00 |
|
Steve Pettitt
|
5b73b80e81
|
sorting orders in reverse date order
|
2016-01-28 23:10:27 +00:00 |
|
Steve Pettitt
|
ccd66bba9c
|
Credit/debit formatting, use filters for money formatting, use full page width for table
|
2016-01-28 22:42:45 +00:00 |
|
Lynne Davis
|
02616a8ac7
|
Updates based on testing on staging
|
2016-01-27 18:43:01 +00:00 |
|
Steve Pettitt
|
aa8457c40f
|
Fix order serializer spec: change from id to number
|
2016-01-26 19:03:19 +00:00 |
|
Lynne Davis
|
a9c37c162e
|
Update email footer to use instance email and social media contacts
|
2016-01-26 13:14:29 +00:00 |
|
Maikel
|
93de2e4b02
|
Auto-merged master into delivery_email_updates on deployment.
|
2016-01-26 11:01:47 +11:00 |
|
Lynne Davis
|
a0f51af355
|
Correcting name tag for order conf email
|
2016-01-25 23:50:53 +00:00 |
|
Maikel
|
3dd3cfa7ec
|
Auto-merged master into uk/account-balances on deployment.
|
2016-01-25 04:43:25 +11:00 |
|
Steve Pettitt
|
295ee47c3a
|
Merge branch 'uk/account-balances' of https://github.com/openfoodfoundation/openfoodnetwork into uk/account-balances
|
2016-01-24 17:34:43 +00:00 |
|
Steve Pettitt
|
c9a8d7efa5
|
Message for users with no orders
|
2016-01-22 19:49:03 +00:00 |
|
Maikel Linke
|
1f1b0bd783
|
styling groups blurb
|
2016-01-22 16:20:07 +11:00 |
|
Maikel Linke
|
d562f6537e
|
Cleaner opengraph meta tags
|
2016-01-20 15:42:01 +11:00 |
|
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 |
|