Matt-Yorkley
0005a77115
Update all locales with the latest Transifex translations
2021-07-01 16:01:24 +01:00
Pau Pérez Fabregat
f6e0b9af0e
Merge pull request #7646 from apricot12/advanced_settings_button_OC_edits
...
Add advanced settings button to incoming and outgoing pages in OC cyc…
2021-07-01 15:37:16 +02:00
Matt-Yorkley
12f7e2d685
Set nicer Redis defaults for dev environment
...
In Staging and Production we have two Redis instances running on two different ports. In dev that probably won't be set up, and Redis will be on port 6379 by default. These defaults mean it will work nicely out of the box.
2021-07-01 12:59:11 +01:00
Matt-Yorkley
083f512aae
Refactor Sidekiq settings and set expiry in development
...
This means old cache entries will be automatically removed instead of perpetually filling up the local Redis instance in dev.
2021-07-01 12:59:11 +01:00
Nihal Mohammed
f7795ca21a
Fix failing specs
2021-06-30 09:50:38 -07:00
Nihal Mohammed
cd0b97bf0a
Update i18n configs
2021-06-30 09:50:38 -07:00
Andy Brett
63fcb40f6c
update config to address deprecation warning for missing translations config
2021-06-29 10:22:25 -07:00
Transifex-Openfoodnetwork
71609a6489
Updating translations for config/locales/en_IE.yml
2021-06-25 22:28:54 +10:00
Transifex-Openfoodnetwork
f707284c6c
Updating translations for config/locales/ru.yml
2021-06-24 23:38:03 +10:00
Transifex-Openfoodnetwork
2eb67cf61b
Updating translations for config/locales/de_DE.yml
2021-06-22 07:46:31 +10:00
Transifex-Openfoodnetwork
27c6a842bd
Updating translations for config/locales/es.yml
2021-06-21 18:41:34 +10:00
Transifex-Openfoodnetwork
3cb6f77cbb
Updating translations for config/locales/ca.yml
2021-06-21 18:41:21 +10:00
Transifex-Openfoodnetwork
030ad350b6
Updating translations for config/locales/en_GB.yml
2021-06-21 18:17:46 +10:00
Transifex-Openfoodnetwork
5ff13b6e3e
Updating translations for config/locales/en_FR.yml
2021-06-21 17:28:50 +10:00
Transifex-Openfoodnetwork
3e0ff968bd
Updating translations for config/locales/fr.yml
2021-06-21 17:26:28 +10:00
Matt-Yorkley
0acd4fc9a1
Change Webpacker default path name
...
In the current version of Webpacker all assets are kept under a new path called `app/javascript`. This is a really stupid name, as it can contain all kinds of assets that are *not* javascript at all, like SCSS. It's common practise to rename this to something sensible like `app/webpacker` or `app/frontend`...
2021-06-19 17:51:18 +01:00
Matt-Yorkley
a074f627b2
Add Webpacker
...
Most of this is automatically generated by the rake task: `bundle exec rake webpacker:install`
Docs: https://github.com/rails/webpacker/tree/5-x-stable
2021-06-19 17:51:18 +01:00
Transifex-Openfoodnetwork
d89a0e2cd9
Updating translations for config/locales/en_CA.yml
2021-06-19 02:05:04 +10:00
Pau Perez
198d4be18f
Update all locales with the latest Transifex translations
2021-06-18 18:05:03 +02:00
Transifex-Openfoodnetwork
ecad6c1982
Updating translations for config/locales/ru.yml
2021-06-19 01:41:57 +10:00
Pau Pérez Fabregat
42e26f3328
Merge pull request #7708 from andrewpbrett/payment-states
...
Add `requires_authorization` Payment state
2021-06-18 17:04:03 +02:00
Pau Perez
cb23cda9e9
Update all locales with the latest Transifex translations
2021-06-18 15:05:26 +02:00
Transifex-Openfoodnetwork
4255dd9141
Updating translations for config/locales/es.yml
2021-06-18 22:57:08 +10:00
Transifex-Openfoodnetwork
654bde6207
Updating translations for config/locales/ca.yml
2021-06-18 22:56:45 +10:00
Pau Pérez Fabregat
aa9a85159e
Merge pull request #7806 from mkllnk/feature-toggles
...
Remove custom feature toggles
2021-06-18 12:23:21 +02:00
Pau Pérez Fabregat
db993652c4
Merge branch 'master' into payment-states
2021-06-18 12:20:26 +02:00
Pau Pérez Fabregat
b500486f6b
Merge pull request #7211 from jibees/4207-add-query-params-in-url
...
Orders list : save filters params
2021-06-18 11:19:26 +02:00
Pau Pérez Fabregat
75ed148490
Merge pull request #7803 from openfoodfoundation/transifex
...
Transifex
2021-06-18 09:26:47 +02:00
Transifex-Openfoodnetwork
2f82afcb07
Updating translations for config/locales/en_FR.yml
2021-06-18 16:58:14 +10:00
Transifex-Openfoodnetwork
fcf6f1929b
Updating translations for config/locales/fr.yml
2021-06-18 16:58:00 +10:00
Transifex-Openfoodnetwork
36fa34a39e
Updating translations for config/locales/es.yml
2021-06-18 16:44:01 +10:00
Transifex-Openfoodnetwork
d516b1d885
Updating translations for config/locales/ca.yml
2021-06-18 16:43:55 +10:00
Maikel Linke
a712f254e0
Remove Australian custom homepage content
...
This was activated with a feature toggle. But when we re-implemented the
feature toggles, we accidentally broke this one and it hasn't been
active for two months. Nobody complained and it doesn't seem to be
needed while developers are keen to remove instance-specific
customisations anyway.
2021-06-18 10:46:50 +10:00
Andy Brett
3e32abe64f
add colors and translations for requires_authorization state
2021-06-17 14:23:59 -07:00
Andy Brett
24a60cd108
add translation key
2021-06-17 14:23:59 -07:00
Andy Brett
bcd0173ed0
Merge pull request #7305 from cillian/add-distributor-to-shipment-email
...
Add enterprise name to subject and body of shipment shipped email
2021-06-17 12:53:09 -07:00
Transifex-Openfoodnetwork
ba7b53051a
Updating translations for config/locales/es.yml
2021-06-17 20:30:36 +10:00
Transifex-Openfoodnetwork
5803c0fe50
Updating translations for config/locales/fr.yml
2021-06-17 20:27:31 +10:00
Transifex-Openfoodnetwork
2e701656d2
Updating translations for config/locales/en_US.yml
2021-06-17 20:27:29 +10:00
Pau Pérez Fabregat
a8efbffca6
Merge pull request #7429 from Matt-Yorkley/adjustments-taxrate
...
[Adjustments] TaxRate changes
2021-06-17 11:51:01 +02:00
Guido Oliveira
c5471fc25c
enable ordering shopfront by producer id
2021-06-16 15:02:27 -03:00
Matt-Yorkley
8753076dcd
Merge pull request #7737 from luisramos0/ruby273
...
Upgrade to ruby 2.7.3
2021-06-15 21:07:38 +02:00
Transifex-Openfoodnetwork
7f09fd4c19
Updating translations for config/locales/en_US.yml
2021-06-15 10:23:53 +10:00
Transifex-Openfoodnetwork
6701afcdce
Updating translations for config/locales/en_GB.yml
2021-06-14 18:10:03 +10:00
Transifex-Openfoodnetwork
3ef5953db2
Updating translations for config/locales/en_FR.yml
2021-06-11 18:38:36 +10:00
Transifex-Openfoodnetwork
586c97b22c
Updating translations for config/locales/fr.yml
2021-06-11 18:37:04 +10:00
Transifex-Openfoodnetwork
d54cb9182f
Updating translations for config/locales/ca.yml
2021-06-11 18:19:44 +10:00
Transifex-Openfoodnetwork
3257f16667
Updating translations for config/locales/es.yml
2021-06-11 18:17:41 +10:00
Maikel Linke
4faf76794d
Update translations from Transifex
2021-06-11 09:44:47 +10:00
Maikel
56570ec604
Merge pull request #7755 from openfoodfoundation/transifex
...
Transifex
2021-06-11 09:41:22 +10:00