Commit Graph

1091 Commits

Author SHA1 Message Date
Matt-Yorkley
598677be3f Disable guest checkout for registered users 2018-05-11 12:05:26 +10:00
Maikel Linke
de5124f90c Remove Heroku references since nobody is using it 2018-05-01 10:20:21 +10:00
Matt-Yorkley
1f23402912 Disable password reset for unconfirmed users 2018-04-27 12:37:42 +10:00
Pau Pérez Fabregat
b1fc15f242 Merge pull request #2223 from openfoodfoundation/transifex
Transifex
2018-04-16 13:43:40 +02:00
Transifex-Openfoodnetwork
ce2a7a510f Updating translations for config/locales/en_US.yml 2018-04-11 00:06:55 +10:00
Transifex-Openfoodnetwork
15945fa1e0 Updating translations for config/locales/fr.yml 2018-04-05 04:48:54 +10:00
Transifex-Openfoodnetwork
ad898848f8 Updating translations for config/locales/pt.yml 2018-04-05 04:29:49 +10:00
Rob Harrington
b17d8c2fe3 Add validation of open and close dates for order cycles 2018-04-04 17:18:32 +10:00
Rob Harrington
b14f27f956 Return an error if no order_cycle_set params are submitted to #bulk_update action 2018-04-04 17:17:36 +10:00
Maikel Linke
a2e4c33922 Remove old and useless sentence from welcome email
The sentence made assumptions of the availability of FAQs and support
forums without linking to them. So it didn't really help. It also
promised that someone would monitor the support page in the forum which
nobody seems to do.
2018-04-04 16:21:39 +10:00
Matt-Yorkley
101269a487 Adjust wording on manager invite email 2018-04-04 15:49:04 +10:00
Rob Harrington
a83bdf16c9 Add error message for case when schedule cannot be deleted 2018-04-04 09:21:52 +10:00
Hugo Daniel
6731dd0b64 Overwrites spree_i18n translations for entreprise fees calculator's options 2018-04-03 08:38:00 +10:00
Pau Pérez Fabregat
0b9881b9d3 Merge pull request #2168 from openfoodfoundation/transifex
Update translations with current Transifex version
2018-03-27 17:16:10 +02:00
Transifex-Openfoodnetwork
348364814d Updating translations for config/locales/es.yml 2018-03-28 02:11:09 +11:00
Hugo Daniel
ef2b0b8383 Added tooltips and locale 2018-03-27 15:21:12 +11:00
duende13
f75b865be8 Made changes requested by reviewer, in labels and tests. 2018-03-27 15:21:11 +11:00
duende13
7670d01c6d Changing SEO tab to 'Search' tab 2018-03-27 15:21:11 +11:00
duende13
61300a62c2 Added 'meta_keywords' to search of products in shop page. Changed labels
on SEO tab and SEO form (edit product Screen) and added in en.yml file.
2018-03-27 15:21:11 +11:00
Transifex-Openfoodnetwork
a3fa6db5a9 Updating translations for config/locales/de_DE.yml 2018-03-26 21:38:21 +11:00
Transifex-Openfoodnetwork
a257febc79 Updating translations for config/locales/fr.yml 2018-03-26 20:06:24 +11:00
Pau Pérez Fabregat
bbd2427493 Merge pull request #2075 from mjal/2001translations-missing-in-order-management-pages
i18n for admin/orders
2018-03-23 15:27:55 +01:00
Pau Pérez Fabregat
82457d2b63 Merge pull request #2138 from Matt-Yorkley/email/manager_invite
Email/manager invite
2018-03-23 15:27:14 +01:00
Pau Pérez Fabregat
d422283b76 Merge pull request #2128 from mkllnk/2113-i18n-config
2113 Display only selected languages in switcher
2018-03-23 15:06:47 +01:00
Pau Pérez Fabregat
13115d4a2d Merge branch 'master' into email/manager_invite 2018-03-23 12:56:10 +01:00
Pau Pérez Fabregat
1005c299a2 Merge pull request #1464 from Matt-Yorkley/uk/bep_images
Uk/bep_images
2018-03-23 12:40:16 +01:00
Maikel Linke
94cc8bb980 Update translations with current Transifex version
Since our Transifex integration has a few flaws, there are many
translations that are not in the code yet. This imports everything, even
translation files that are not at 100%.
2018-03-23 12:55:29 +11:00
Pau Pérez Fabregat
91f30d5427 Merge pull request #2148 from coopdevs/sample-mail-method
Setup mail method automatically
2018-03-21 15:10:56 +01:00
Pau Pérez Fabregat
e23d714e83 Merge pull request #2154 from openfoodfoundation/transifex
Transifex
2018-03-19 10:29:48 +01:00
Transifex-Openfoodnetwork
ec01e55707 Updating translations for config/locales/es.yml 2018-03-19 19:56:02 +11:00
Matt-Yorkley
5f0075f8b7 Refactor to use new REST resource 2018-03-16 17:32:38 +00:00
Pau Perez
716e952117 Add mail setting's env vars for development 2018-03-16 13:33:55 +01:00
Matt-Yorkley
f3f18d8338 Cleaner routes.rb entry 2018-03-15 18:48:47 +00:00
Matt-Yorkley
b64327fbb3 Invite enterprise manager functionality 2018-03-15 18:48:47 +00:00
Maikel Linke
ada0fa50fc Replace Rohan's email address by optional config
Rohan's email address is hard-coded, but he doesn't want to receive
these emails any more.
2018-03-14 15:30:53 +11:00
Matt-Yorkley
ea9b0eca48 Adjust wording on validation modal message 2018-03-14 12:13:45 +11:00
Matt-Yorkley
595bc5d1a5 Show confirmation message in modal 2018-03-14 12:13:45 +11:00
Enrico Stano
341604be8a Merge pull request #2094 from openfoodfoundation/transifex
Transifex
2018-03-13 08:39:11 +01:00
Maikel Linke
3743cf1bc3 Use I18nConfig for application defaults 2018-03-09 17:45:03 +11:00
Rob Harrington
b98afc00ba Show message about resumable orders when unpausing a subscription 2018-03-07 14:24:59 +11:00
Rob Harrington
05e6c3daa6 Add message to indicate missing orders_close_at date 2018-03-02 13:28:34 +11:00
Transifex-Openfoodnetwork
7a411b0452 Updating translations for config/locales/de_DE.yml 2018-03-02 03:48:06 +11:00
Transifex-Openfoodnetwork
ecbd1fe93d Updating translations for config/locales/pt.yml 2018-03-02 02:15:53 +11:00
Enrico Stano
6e9efe79b7 Merge pull request #2053 from Matt-Yorkley/uk/enterprise_limit
Increase default enterprise limit
2018-03-01 14:40:24 +01:00
Rob Harrington
6bf4ed1ac5 Add new review view to subscription wizard 2018-02-22 16:13:29 +11:00
Rob Harrington
cec5fddf6a Add missing translation 2018-02-22 14:33:25 +11:00
Rob Harrington
c4a81bdc48 Translate subscriptions loading flash 2018-02-22 14:33:25 +11:00
Maikel Linke
de8df4b3e9 Manual update from transifex 2018-02-21 14:25:19 +11:00
Maikel Linke
70bb64d58d Manual update from transifex 2018-02-21 14:24:45 +11:00
Maikel Linke
a529525a63 Manual update from transifex 2018-02-21 14:24:28 +11:00