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
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
Continuous Integration
ade73f66c8
Merge remote-tracking branch 'origin/master' into HEAD
2017-01-13 10:50:32 +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
6ec7276cfc
Merge remote-tracking branch 'origin/master' into HEAD
2017-01-11 16:30:37 +11:00
Continuous Integration
2444d3b547
Merge remote-tracking branch 'origin/master' into HEAD
2017-01-11 15:54:08 +11:00
Maikel Linke
e899633aff
Merge duplicate locale entry admin.enterprises.index
2017-01-11 14:48:05 +11:00
Maikel Linke
a9f01c0f0d
Fix typos in en.yml
2017-01-11 11:15:44 +11:00
François Turbelin
88dea0f2b8
Adding i18n keys on Admin side (Rails views)
2017-01-11 10:00:06 +11: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
Lynne
6cabba4cd8
Merge pull request #1354 from openfoodfoundation/uk/translation
...
Uk/translation
2017-01-06 10:00:23 +00:00
elf Pavlik
bd1cd527d3
configurable google maps api key
2017-01-03 20:57:10 -06:00
Lynne Davis
d17f9dc504
update
2017-01-03 16:35:01 +00:00
Lynne Davis
f62c583130
uk translation updates
2017-01-03 16:12:41 +00:00
Maikel
b1e27e0dad
Auto-merged master into uk/translation on deployment.
2017-01-04 02:24:40 +11: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
Lynne
e0cb6ed60a
Merge pull request #1349 from openfoodfoundation/tos
...
Adding UK ToS to repo
2016-12-22 18:31:30 +00:00
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
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
Rafael Braz
eef308c4f6
create a pr-br translate file ( #1266 )
2016-12-15 08:39:37 +11:00
Matt-Yorkley
0a67876815
Update angular-file-uploader-rails to v1.1.6
2016-12-09 18:47:16 +00: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
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
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
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
