Matt-Yorkley
9284dd9b63
Enable save after deleting enterprise manager
2017-02-08 15:59:11 +11:00
Continuous Integration
92981e4fcd
Merge remote-tracking branch 'origin/master' into HEAD
2017-02-08 10:38:47 +11:00
Matt-Yorkley
9235727d45
Merge pull request #5 from mkllnk/pr-1329-enterprise-switcher
...
Re-use NavigationCheck logic
2017-02-02 15:26:01 +00:00
Matt-Yorkley
fc4ead9b05
Ensure on_demand set properly on new products
2017-02-02 01:06:20 +00:00
Maikel Linke
b8622e95b7
Re-use NavigationCheck logic
...
The enterprise switcher now uses the same code as NavigationCheck to
confirm leaving a changed form. This makes FormState obsolete.
Conflicts:
app/assets/javascripts/admin/enterprises/controllers/enterprise_controller.js.coffee
2017-02-02 10:58:32 +11:00
Continuous Integration
f8341dccd4
Merge remote-tracking branch 'origin/master' into HEAD
2017-02-01 10:35:53 +11:00
Lynne
b8ed7789f0
Merge pull request #1427 from openfoodfoundation/revert-1424-master
...
Revert "translate ABN and ACN to company number, charity number"
2017-01-30 13:18:16 +00:00
Lynne
6d19613ecc
Revert "translate ABN and ACN to company number, charity number"
2017-01-30 12:53:01 +00:00
Lynne
0d56cbf169
Merge pull request #1424 from OliverUK/master
...
translate ABN and ACN to company number, charity number
2017-01-30 12:04:54 +00:00
Lynne
67730e82c3
Update en-GB.yml
2017-01-30 12:04:24 +00:00
OliverUK
940ca7ade1
translate ABN and ACN to company number, charity number
2017-01-27 15:02:38 +00:00
Continuous Integration
05f9747f15
Merge remote-tracking branch 'origin/master' into HEAD
2017-01-25 12:41:02 +11:00
Matt-Yorkley
27903ab744
Merge branch 'master' into uk/switcher
2017-01-22 18:57:25 +00:00
Matt-Yorkley
931e528e14
Code review changes
2017-01-22 18:55:28 +00:00
Matt-Yorkley
6bed94a09b
Include E2E permissions
2017-01-22 18:42:23 +00:00
Paul Mackay
165b437f31
#1226 : fix OSM URL to use HTTPS
2017-01-20 15:59:22 +00:00
Continuous Integration
b526307ad1
Merge remote-tracking branch 'origin/master' into HEAD
2017-01-18 18:14:10 +11:00
Continuous Integration
a7bfddfcb5
Merge remote-tracking branch 'origin/master' into HEAD
2017-01-18 17:22:21 +11:00
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
Paul Mackay
651626eb4f
#1365 : Remove /test dir as it is not used
2017-01-14 11:47:21 +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
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
Matt-Yorkley
e021afdd8a
Updated spec
2017-01-10 23:53:13 +00: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
Transifex-Openfoodnetwork
64f6a794fc
Updating translations for config/locales/nb.yml [skip ci]
2017-01-08 23:36:57 +11: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
