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
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
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
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
Matt-Yorkley
690cbe3ad3
Merge pull request #7468 from mkllnk/6328-tos-tracking
...
6328 tos tracking
2021-06-10 19:48:13 +02:00
Transifex-Openfoodnetwork
a232722f64
Updating translations for config/locales/ru.yml
2021-06-10 05:18:45 +10:00
Transifex-Openfoodnetwork
0e19232f45
Updating translations for config/locales/ca.yml
2021-06-09 17:22:50 +10:00
Transifex-Openfoodnetwork
f4d9e8e520
Updating translations for config/locales/es.yml
2021-06-09 17:22:39 +10:00
Transifex-Openfoodnetwork
d0041334fa
Updating translations for config/locales/en_FR.yml
2021-06-09 16:42:33 +10:00
Transifex-Openfoodnetwork
3b68d8a94e
Updating translations for config/locales/fr.yml
2021-06-09 16:41:46 +10:00
Maikel Linke
17a3d23d68
Handle user clicking upload button early
2021-06-09 14:06:54 +10:00
Maikel Linke
e3be519b25
Style TOS page to be usable
...
It's not pretty but only used by instance managers, very rarely.
2021-06-09 14:06:54 +10:00
Maikel Linke
51ad8f8065
Remove old UI to edit Terms of service
...
It's now completely replaced by file uploads on a separate page.
2021-06-09 14:06:54 +10:00
Maikel Linke
23999c96bf
Unify all links to platform Terms of service
...
DRY code and have more consistency. We always use "Terms of service" now
and not "Terms of Service" or "Terms and conditions". The latter is used
for the shop's terms, not the platform terms.
2021-06-09 14:06:54 +10:00
Maikel Linke
3b3ba70670
Safeguard deletion of ToS with alert
2021-06-09 14:06:54 +10:00
Maikel Linke
690118c2bd
Add delete method to terms of service files
2021-06-09 14:06:54 +10:00
Maikel Linke
abe76ccf0f
Add upload of Terms of Service files
...
Admins can upload files and view the most recent (current) one.
2021-06-09 14:06:54 +10:00
Maikel Linke
007b8cd888
Add new admin page for TOS files
...
Just the basic Rails setup without any functionality yet.
2021-06-09 14:06:53 +10:00
Maikel Linke
a0835eae54
Avoid false alarms due to delayed HeartbeatJob
...
When Sidekiq was restarted, the scheduler's time was reset and jobs were
executed later. Now we trigger the HeartbeatJob straight after a Sidekiq
boot and we shouldn't see any false alarms in our monitoring.
2021-06-09 12:05:18 +10:00
Andy Brett
82ec04552c
Merge pull request #7693 from andrewpbrett/add-password-translation
...
Add translation keys for password messages
2021-06-08 10:35:41 -07:00
Andy Brett
74d93e324c
Merge pull request #7661 from romale/products_import_date_translation
...
Missed import_date translation key
2021-06-08 10:26:13 -07:00
Transifex-Openfoodnetwork
225edbf745
Updating translations for config/locales/fr_CA.yml
2021-06-08 07:13:36 +10:00
Transifex-Openfoodnetwork
e8fb5d39a1
Updating translations for config/locales/en_CA.yml
2021-06-08 06:39:23 +10:00
Matt-Yorkley
8e0a84a502
Merge pull request #7729 from Matt-Yorkley/delayed-cleanup
...
Delayed::Cleanup
2021-06-07 19:11:37 +02:00
Matt-Yorkley
f20cf509d3
Add missing Spree translation
2021-06-06 20:17:03 +01:00
Luis Ramos
21b80db0ee
Fix json v1.8.6 common.rb warning
...
Using this patch https://github.com/flori/json/issues/399#issuecomment-734863279
We can upgrade to json v2 but to do that we need to switch from aws-sdk-v1 to aws-sdk-s3 first
2021-06-04 22:42:27 +01:00
Andy Brett
b23530be4c
Merge pull request #7736 from Matt-Yorkley/ssl-in-dev
...
Remove Spree::Config[:allow_ssl_in_development_and_test]
2021-06-04 07:21:05 -07:00
Maikel
0c92a594f4
Merge pull request #7717 from coopdevs/fix-docker-jemalloc-sidekiq
...
Fix docker Jemalloc + Sidekiq setup
2021-06-04 13:16:53 +10:00
Andy Brett
c1ad4243bb
Update all locales with the latest Transifex translations
2021-06-03 18:21:21 -07:00
Matt-Yorkley
7d38bec26d
Remove Spree::Config[:allow_ssl_in_development_and_test]
...
Unconditionally disables forced https-redirects in dev and test
2021-06-03 20:52:09 +01:00
Matt-Yorkley
67d7d225cc
Add bootsnap gem
2021-06-03 19:03:18 +01:00
Andy Brett
6d56a0791f
Merge pull request #7728 from Matt-Yorkley/papertrail-deprecation
...
Remove papertrail initializer
2021-06-03 09:52:56 -07:00
