Maikel
|
8aeec74fed
|
Auto-merged master into tos on deployment.
|
2016-12-22 23:19:27 +11:00 |
|
Lynne Davis
|
7cd7e7367b
|
Adding UK TOS to repo
|
2016-12-22 12:09:44 +00:00 |
|
Continuous Integration
|
4f4fe90db4
|
Merge remote-tracking branch 'origin/master' into HEAD
|
2016-12-21 15:27:57 +11:00 |
|
Continuous Integration
|
7a7cd3a937
|
Merge remote-tracking branch 'origin/master' into HEAD
|
2016-12-21 14:16:08 +11:00 |
|
Continuous Integration
|
bfc01e7c89
|
Merge remote-tracking branch 'origin/master' into HEAD
|
2016-12-21 11:21:42 +11:00 |
|
Lynne Davis
|
d77f775c4c
|
Moving commits from 1241 to trigger build on UK staging
|
2016-12-19 15:06:43 +00:00 |
|
Matt-Yorkley
|
7531c8cbc9
|
Removed dashes
|
2016-12-19 11:10:12 +00:00 |
|
Matt-Yorkley
|
0b2281dfe2
|
Adjustment for chrome browser
|
2016-12-17 16:07:39 +00:00 |
|
Continuous Integration
|
72cff0688a
|
Merge remote-tracking branch 'origin/master' into HEAD
|
2016-12-16 15:24:52 +11:00 |
|
Rohan Mitchell
|
9793450ed0
|
Make mobile menu mimic the large menu
|
2016-12-16 14:40:13 +11:00 |
|
Rohan Mitchell
|
c8f0502e71
|
Apply connect_learn_homepage feature toggle to mobile menu
|
2016-12-16 14:32:48 +11:00 |
|
Continuous Integration
|
b075ed373a
|
Merge remote-tracking branch 'origin/master' into HEAD
|
2016-12-16 13:46:08 +11:00 |
|
Rafael Braz
|
eef308c4f6
|
create a pr-br translate file (#1266)
|
2016-12-15 08:39:37 +11:00 |
|
Lynne
|
b59e5ad248
|
Merge pull request #1243 from openfoodfoundation/uk/translations
Translation updates
|
2016-12-09 16:37:38 +00:00 |
|
Continuous Integration
|
c6a1560845
|
Auto-merge from CI [skip ci]
|
2016-12-10 01:42:26 +11:00 |
|
Lynne Davis
|
45dc1341d3
|
translation updates
|
2016-12-09 14:41:16 +00:00 |
|
Matt-Yorkley
|
066f42070a
|
Fixed confusing wysiwyg line breaks display discrepency
|
2016-12-09 14:12:00 +00:00 |
|
Lynne Davis
|
cad3464f56
|
Adjusted BOM spec to reflect currency symbol changes
|
2016-12-09 11:40:55 +00:00 |
|
Rohan Mitchell
|
bbcaef20a8
|
Add unit specs for Spree::Admin::NavigationHelper
|
2016-12-09 11:24:58 +11:00 |
|
Rohan Mitchell
|
43726a0b23
|
Fix inventory link not appearing on menu
|
2016-12-08 10:38:29 +11:00 |
|
Rohan Mitchell
|
6e6efea328
|
Fix groups link not appearing on menu
|
2016-12-08 10:38:23 +11:00 |
|
Maikel Linke
|
a2a6ce1b3e
|
Revert "TEMP: Remove override for no-longer-present method"
This reverts commit a3b91dabe5.
Conflicts:
app/helpers/spree/admin/navigation_helper_decorator.rb
|
2016-12-08 10:38:21 +11:00 |
|
Maikel Linke
|
3a69c958ef
|
Hide super admin menu items for enterprise users
Imported temporarily missing Spree functionality. This patch becomes
obsolete with another Spree upgrade.
|
2016-12-08 10:38:21 +11:00 |
|
Continuous Integration
|
14ee7a06ae
|
Merge remote-tracking branch 'origin/master' into HEAD
|
2016-12-07 17:03:27 +11:00 |
|
Maikel Linke
|
6cd8289b27
|
Correct more typos
|
2016-12-02 16:50:54 +11:00 |
|
Rob Harrington
|
d0509b54bf
|
Disabling override the adds coupon field to cart page
|
2016-11-30 18:30:20 +11:00 |
|
Lynne Davis
|
ee905cad5f
|
Translation updates
|
2016-11-29 15:07:35 +00:00 |
|
Rohan Mitchell
|
d4fd66461e
|
Add retry to flaky specs
|
2016-11-25 14:37:47 +11:00 |
|
Rohan Mitchell
|
071ba5285d
|
Put timecop config in spec support
|
2016-11-25 14:28:05 +11:00 |
|
Rohan Mitchell
|
6795237a2d
|
Put timecop into safe mode and fix leaky Timecop.freeze
|
2016-11-25 14:14:42 +11:00 |
|
Rohan Mitchell
|
57363e2da5
|
When a product is deleted, touch the supplier and distributors
|
2016-11-25 14:14:42 +11:00 |
|
Rohan Mitchell
|
da9a3ce9f3
|
Refresh products cache when product is deleted (cf. destroyed)
|
2016-11-25 14:14:42 +11:00 |
|
Rohan Mitchell
|
c4318030d3
|
Fix spec: Second visit doesn't actually reload the page
|
2016-11-25 14:14:42 +11:00 |
|
Rohan Mitchell
|
44a301edb1
|
When touching distributing enterprises, do not touch self -> infinite recursion
|
2016-11-25 14:14:42 +11:00 |
|
Rohan Mitchell
|
dabac50128
|
Replace Enterprise.distributing_product and Enterprise.distributing_any_product_of with Enterprise.distributing_products
|
2016-11-25 14:14:42 +11:00 |
|
Rohan Mitchell
|
6030e9a294
|
Cache enterprise supplied and distributed properties and producer properties
|
2016-11-25 14:14:42 +11:00 |
|
Rohan Mitchell
|
9b656eaf4f
|
Property / ProducerProperty changes update distributor enterprise cache
|
2016-11-25 14:14:42 +11:00 |
|
Rohan Mitchell
|
22080a9a08
|
Property / ProducerProperty changes update supplier enterprise cache
|
2016-11-25 14:14:42 +11:00 |
|
Rohan Mitchell
|
d93fe3cf2c
|
Cache enterprise supplied and distributed taxons
|
2016-11-25 14:14:42 +11:00 |
|
Rohan Mitchell
|
1ea4f4274c
|
Add enterprise cache invalidation for order cycle changes
|
2016-11-25 14:14:42 +11:00 |
|
Rohan Mitchell
|
bd11c6ce14
|
New hash style
|
2016-11-25 14:14:42 +11:00 |
|
Rohan Mitchell
|
e8848451a5
|
Spacing
|
2016-11-25 14:14:42 +11:00 |
|
Rohan Mitchell
|
f4f38b4183
|
Re-apply shop property filters - including performance regression
This reverts commit 7d149ed198.
|
2016-11-25 14:14:42 +11:00 |
|
Rob Harrington
|
27283c50b8
|
Customers service clears array fo each #index request
|
2016-11-25 12:43:48 +11:00 |
|
Rob Harrington
|
5e214a32b3
|
Moving ShippingMethods service to admin.resource module
|
2016-11-25 11:59:00 +11:00 |
|
Rob Harrington
|
7498b7f098
|
Moving PaymentMethods service to admin.resource module
|
2016-11-25 11:57:59 +11:00 |
|
Rob Harrington
|
268c8dbcdd
|
Moving Customers and CustomerResource services to admin.resource module
|
2016-11-25 11:46:51 +11:00 |
|
Rob Harrington
|
dbbd52cace
|
Fixing broken taxons filter on bulk product edit
Was referencing Taxons.taxons instead of Taxons.all
|
2016-11-25 10:37:01 +11:00 |
|
Rob Harrington
|
1770a67cd9
|
Adding #load function to services for resources, for generic loading of data into byID and pristineByID
|
2016-11-25 10:37:01 +11:00 |
|
Rob Harrington
|
3678d4d018
|
Creating new 'resources' module for holding interdependent ngResource services
|
2016-11-25 10:37:01 +11:00 |
|