Continuous Integration
52e4722dcb
Merge remote-tracking branch 'origin/master' into HEAD
2017-01-18 11:19:57 +11:00
Rob Harrington
017916b193
Enterprise distributing_products scope uses INNER JOINS instead of OUTER JOINS
2017-01-17 19:28:21 +11:00
Paul Mackay
02e5ba4dfd
Convert .sass files to .scss format
2017-01-15 12:11:53 +00:00
Continuous Integration
20d01c3047
Merge remote-tracking branch 'origin/master' into HEAD
2017-01-13 11:44:47 +11:00
Continuous Integration
a391b6f076
Merge remote-tracking branch 'origin/master' into HEAD
2017-01-13 11:12:17 +11:00
Maikel Linke
44970a13bb
Fix translation of email confirmation notice
...
The `_html` suffix was missing leading to `<br />` being displayed in
plain text. The new version also integrates the email address as a
variable in the translation.
2017-01-13 10:21:25 +11:00
Paul Mackay
d80f080af5
#1027 : Use url helpers for basic pages
...
Set groups change frequency to monthly.
2017-01-12 10:18:30 +00:00
Continuous Integration
2444d3b547
Merge remote-tracking branch 'origin/master' into HEAD
2017-01-11 15:54:08 +11:00
François Turbelin
88dea0f2b8
Adding i18n keys on Admin side (Rails views)
2017-01-11 10:00:06 +11:00
Matt-Yorkley
5150025641
Updated tag rules UI
2017-01-10 22:54:22 +00:00
Paul Mackay
fc400741b4
Remove lastmod for groups
2017-01-10 11:44:57 +00:00
Paul Mackay
5cb2194f5e
#1027 : Add sitemap.xml generation
2017-01-10 11:39:17 +00:00
elf Pavlik
764c95488c
made api key optional (google maps)
2017-01-07 10:25:32 -06:00
elf Pavlik
bd1cd527d3
configurable google maps api key
2017-01-03 20:57:10 -06:00
Levent Ali
6ae1272281
Mark order cycle form as dirty when removing fees
...
Resolves an issue where removing coordinator/exchange fees
wasn't allowing users to save the OC.
Fixes #1165
2016-12-23 09:33:34 +11: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
Matt-Yorkley
bc5672b5eb
Added translation
2016-12-20 13:30:24 +00: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
38fe0afc03
Changed p widths
2016-12-17 22:59:29 +00:00
Matt-Yorkley
252f876827
Fixed orders closed display for mobile view
2016-12-17 22:54:59 +00:00
Matt-Yorkley
6d9bae8ef9
Checkout layout adjustments for mobile view
2016-12-17 20:39:13 +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
Matt-Yorkley
287e0b5b55
Enterprise switcher and navigation check
2016-12-09 15:15:42 +00:00
Matt-Yorkley
7d7197da58
Reordered enterprises submenu
2016-12-09 14:31:34 +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
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
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
Rob Harrington
d0509b54bf
Disabling override the adds coupon field to cart page
2016-11-30 18:30:20 +11:00
Matt-Yorkley
7981feefa1
Updated form to include help tip for clarity
2016-11-28 14:38:13 +00: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
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
f4f38b4183
Re-apply shop property filters - including performance regression
...
This reverts commit 7d149ed198
2016-11-25 14:14:42 +11:00
