Luis Ramos
a51645f316
Remove deleted file
2020-11-04 12:15:45 +00:00
Luis Ramos
6950d7717f
Add missing translation
2020-11-04 12:15:45 +00:00
Luis Ramos
66fb3a9cf3
Remove code related to spree promotions
2020-11-04 12:15:45 +00:00
Luis Ramos
0ca71ce0a9
Do not reload routes and make spree routes append instead of draw in
...
case thee routes are already defined elsewhere, for example, by the
paypal express gem
2020-11-04 12:15:45 +00:00
Luis Ramos
bfeebccbc5
Load Spree engine before configuring it
2020-11-04 12:15:45 +00:00
Luis Ramos
4b21667974
Move initializers from Spree engine to the OFN application
2020-11-04 12:15:45 +00:00
Luis Ramos
451d8488d9
Run rubocop -a
2020-11-04 12:15:45 +00:00
Luis Ramos
bcca2eee9d
Bring user and ability related files from spree_core
2020-11-04 12:15:45 +00:00
Luis Ramos
b68c5ee0f9
Remove dead code (prototypes) and fix specs
2020-11-04 12:15:23 +00:00
Pau Pérez Fabregat
201c9c109d
Merge pull request #6281 from Matt-Yorkley/missing-translation-ordering
...
Add missing translation key for enterprise taxon ordering
2020-11-02 22:15:43 +01:00
Luis Ramos
1bb7fd9ec8
Merge pull request #6280 from Matt-Yorkley/eastern-slavic-plurals
...
Add missing translation keys for Eastern Slavic plurals
2020-10-31 23:13:54 +00:00
Matt-Yorkley
0af20e48b0
Add missing translation key for enterprise taxon ordering
2020-10-31 19:17:19 +00:00
Matt-Yorkley
bc40088eaf
Add missing translation keys for Eastern Slavic plurals
...
There are multiple forms of pluralisation here, with different translations for each.
перевод сложен !
2020-10-31 16:58:15 +00:00
Pau Perez
1abdd0112e
Update all locales with the latest Transifex translations
2020-10-31 10:46:12 +01:00
Pau Pérez Fabregat
03b0ce430d
Merge branch 'master' into transifex
2020-10-31 10:05:27 +01:00
Luis Ramos
bd4d0ba5d3
Make the warning message work for first upload and for changes
2020-10-30 15:09:13 +00:00
Luis Ramos
3b682bc47f
Add warning when uploading a file
2020-10-30 15:09:13 +00:00
Luis Ramos
be35f97622
Add tooltip icon to terms and conditions
2020-10-30 15:09:13 +00:00
Luis Ramos
2cf7b1b36c
Make label translatable
2020-10-30 15:09:13 +00:00
Luis Ramos
78a8f53d8d
Change default translations to what's been requested on the issue
2020-10-30 15:08:26 +00:00
Transifex-Openfoodnetwork
19b6cb13f1
Updating translations for config/locales/pt_BR.yml
2020-10-31 01:36:45 +11:00
Transifex-Openfoodnetwork
dd228cc750
Updating translations for config/locales/ar.yml
2020-10-30 22:39:44 +11:00
Transifex-Openfoodnetwork
35790b3cca
Updating translations for config/locales/en_FR.yml
2020-10-30 19:29:20 +11:00
Transifex-Openfoodnetwork
2ce05d48bf
Updating translations for config/locales/fr.yml
2020-10-30 19:29:05 +11:00
Luis Ramos
6b826423c1
Merge pull request #6145 from andrewpbrett/instance-unit-picker
...
Allow instances to choose available units for products/variants
2020-10-29 22:22:33 +00:00
Luis Ramos
412457bb19
Merge pull request #6122 from luisramos0/customer_total
...
Add Customer balance to customer list
2020-10-29 22:06:05 +00:00
Andy Brett
cb3ea133e9
add available units to instance prefs page
2020-10-29 09:17:31 -07:00
Luis Ramos
10490536e2
Merge pull request #6244 from cillian/configurable-geocoder-service
...
Allow Geocoder to be configured to use different APIs
2020-10-29 16:12:52 +00:00
Luis Ramos
e860e2ca57
Add label to customer balance so it's clear to the manager what's the balance status: credit owed or balance due
2020-10-29 13:38:36 +00:00
Luis Ramos
e4f3aae7c0
Add customer balance to customer list
2020-10-29 13:38:36 +00:00
Transifex-Openfoodnetwork
9c30c3c0ed
Updating translations for config/locales/ar.yml
2020-10-29 11:15:12 +11:00
Luis Ramos
200e9c5078
Merge pull request #6246 from tsara27/fix-shipping-method-translation
...
Add new translation for shipping method
2020-10-29 00:09:14 +00:00
Transifex-Openfoodnetwork
28c25cff2c
Updating translations for config/locales/en_IE.yml
2020-10-29 07:08:18 +11:00
Transifex-Openfoodnetwork
a1438d3b2e
Updating translations for config/locales/ru.yml
2020-10-29 02:23:55 +11:00
Transifex-Openfoodnetwork
21991515df
Updating translations for config/locales/ar.yml
2020-10-27 22:56:03 +11:00
Transifex-Openfoodnetwork
f1e80e92de
Updating translations for config/locales/it.yml
2020-10-27 07:18:57 +11:00
Transifex-Openfoodnetwork
49b8dcb880
Updating translations for config/locales/en_FR.yml
2020-10-27 01:24:49 +11:00
Transifex-Openfoodnetwork
479520bf97
Updating translations for config/locales/fr.yml
2020-10-27 01:24:35 +11:00
Luis Ramos
b66b50cd56
Merge pull request #6125 from tsara27/fix-translation
...
Fix translation for password reset instruction mailer subject
2020-10-26 12:01:47 +00:00
Matt-Yorkley
a296710f78
Update all locales *again* with the latest translations, before publishing
2020-10-26 10:55:17 +00:00
Transifex-Openfoodnetwork
7178a69a54
Updating translations for config/locales/pt_BR.yml
2020-10-26 10:10:47 +11:00
Transifex-Openfoodnetwork
494f0d8ff6
Updating translations for config/locales/ru.yml
2020-10-24 23:18:00 +11:00
Transifex-Openfoodnetwork
15715f9bb4
Updating translations for config/locales/it.yml
2020-10-24 22:28:59 +11:00
Tsara Sudrajat
4baf53a0a9
Add new translation for shipping method
2020-10-24 17:06:19 +07:00
Transifex-Openfoodnetwork
8041111886
Updating translations for config/locales/ar.yml
2020-10-24 07:34:19 +11:00
Transifex-Openfoodnetwork
8a51c5cb5d
Updating translations for config/locales/es.yml
2020-10-24 01:37:39 +11:00
Transifex-Openfoodnetwork
e114d58ff2
Updating translations for config/locales/ca.yml
2020-10-24 01:36:14 +11:00
Transifex-Openfoodnetwork
01fe12e72b
Updating translations for config/locales/fr_CA.yml
2020-10-23 23:15:02 +11:00
Cillian O'Ruanaidh
c5e125747f
Allow Geocoder to be configured to use different APIs.
...
This gives instances the option to use other geocoding services, for example MapBox because instances may not have a Google Maps API key if they are using Open Street Map for their map instead of Google.
2020-10-23 13:09:59 +01:00
Transifex-Openfoodnetwork
3baaa5cc40
Updating translations for config/locales/en_CA.yml
2020-10-23 23:06:57 +11:00
