jibees
31b60ca069
Merge pull request #8949 from openfoodfoundation/transifex
...
Transifex
2022-03-11 09:15:24 +01:00
jibees
d4a4a36b14
Merge pull request #8766 from jibees/8477-cancel-order-and-send-confirmation-email-on-last-item-deletion
...
Edit order: on last item deletion, cancel the order and conditionally send cancellation email to consumer
2022-03-11 08:56:41 +01:00
Filipe
6ce29f81d8
Merge pull request #8920 from apricot12/Remove_checkout_only_option_from_payment_methods_display
...
Remove checkout only option from payment methods edit form.
2022-03-10 14:38:45 +00:00
Nihal Mohammed
e0e800a53f
Remove translations for checkout only from edit form and index for payment methods
2022-03-07 17:33:09 +05:30
Transifex-Openfoodnetwork
8982b34342
Updating translations for config/locales/en_GB.yml
2022-03-07 22:34:59 +11:00
Transifex-Openfoodnetwork
0b6288d97f
Updating translations for config/locales/hu.yml
2022-03-04 01:27:19 +11:00
Transifex-Openfoodnetwork
9724b07062
Updating translations for config/locales/de_DE.yml
2022-03-03 03:48:11 +11:00
Transifex-Openfoodnetwork
87723217ec
Updating translations for config/locales/ru.yml
2022-03-02 20:04:35 +11:00
Transifex-Openfoodnetwork
bd031f4870
Updating translations for config/locales/en_FR.yml
2022-03-02 06:50:01 +11:00
Transifex-Openfoodnetwork
078309d4e7
Updating translations for config/locales/fr.yml
2022-03-02 06:12:32 +11:00
Filipe
d052c4f8a4
Merge pull request #8869 from filipefurtad0/remove_signup_string
...
Removes signup string from private shop login screen
2022-03-01 08:20:06 +00:00
Matt-Yorkley
0b616aa9ce
Update all locales with the latest Transifex translations
2022-02-24 23:34:16 +00:00
filipefurtad0
cefd5db6eb
Renames require_login_3_html key
2022-02-18 11:07:37 +00:00
filipefurtad0
27bc5805ae
Removes signup string from private shop login screen
2022-02-17 13:19:31 +00:00
François Turbelin
6d986deb2d
Remove translation changes from locale file
2022-02-16 10:23:23 +11:00
François Turbelin
eefd9891d6
Add en translations
2022-02-16 10:23:22 +11:00
Adrien Chauve
ca46359224
More fixes
2022-02-16 10:23:22 +11:00
Matt-Yorkley
46c0baee4f
Merge pull request #8885 from jibees/8882-handle-webpacker-error-for-email
...
Modify assets builder to get CSS inside emails when running in development mode
2022-02-15 11:23:42 +00:00
Maikel Linke
1d5ebe42a9
Update translations
2022-02-15 10:50:01 +11:00
Jean-Baptiste Bellet
74ed878a0c
Specify the asset host for the action mailer to get the assets
...
when running in development with webpacker running as well.
2022-02-14 14:54:09 +01:00
Transifex-Openfoodnetwork
5519b8b455
Updating translations for config/locales/cy.yml
2022-02-11 21:02:57 +11:00
Jean-Baptiste Bellet
c9b19811ad
Add missing i18n key
2022-02-10 14:39:00 +01:00
Jean-Baptiste Bellet
8624fa2a85
On last item deletion, prevent user on order canceling and cancellation email
...
... with a modal.
User can cancel the modal or confirm the last item deletion & order cancelation with or without sending a cancellation email to the consumer.
2022-02-10 14:39:00 +01:00
Maikel Linke
9c786ff39e
Update translations
2022-02-10 10:08:28 +11:00
Maikel
570f9f2dc0
Merge pull request #8837 from openfoodfoundation/transifex
...
Transifex
2022-02-10 10:04:20 +11:00
Transifex-Openfoodnetwork
61a4a72b97
Updating translations for config/locales/ru.yml
2022-02-09 23:30:55 +11:00
Matt-Yorkley
9d67606490
Generate rswag routes and helper
2022-02-08 11:43:49 +11:00
Matt-Yorkley
ae2726fc6b
Generate rswag initializers
...
Done via rswag rake tasks and tidied up a bit.
2022-02-08 11:43:49 +11:00
Transifex-Openfoodnetwork
f7de43e8b7
Updating translations for config/locales/en_IE.yml
2022-02-05 03:16:24 +11:00
Matt-Yorkley
8a1fcf8a62
Update all locales with the latest Transifex translations
2022-02-04 15:50:32 +00:00
Matt-Yorkley
08d7a4de92
Merge pull request #8799 from openfoodfoundation/transifex
...
Transifex
2022-02-04 15:46:52 +00:00
Maikel Linke
2e6d8c1216
Provide aws-sdk with working URI.encode method
...
The S3 class is calling URI.encode which is removed in Ruby 3. By
providing a URI module within the S3 class makes the S3 code call that
module instead.
2022-02-03 15:20:51 +11:00
Transifex-Openfoodnetwork
8e1272b1e8
Updating translations for config/locales/en_GB.yml
2022-01-31 20:47:33 +11:00
Transifex-Openfoodnetwork
22d5a63a5b
Updating translations for config/locales/ar.yml
2022-01-30 03:59:54 +11:00
Transifex-Openfoodnetwork
a6bf6470f7
Updating translations for config/locales/de_DE.yml
2022-01-29 12:14:24 +11:00
Transifex-Openfoodnetwork
6856f21e7e
Updating translations for config/locales/it.yml
2022-01-28 19:05:08 +11:00
Transifex-Openfoodnetwork
aae40c74a9
Updating translations for config/locales/en_US.yml
2022-01-28 10:15:26 +11:00
Transifex-Openfoodnetwork
0397a68072
Updating translations for config/locales/fr_CA.yml
2022-01-28 09:31:49 +11:00
Transifex-Openfoodnetwork
ccb9df708b
Updating translations for config/locales/en_CA.yml
2022-01-28 09:24:03 +11:00
Matt-Yorkley
8c33dc16e8
Update all locales with the latest Transifex translations
2022-01-27 18:24:01 +00:00
Matt-Yorkley
b588ab78b7
Merge pull request #8777 from openfoodfoundation/transifex
...
Transifex
2022-01-27 18:17:06 +00:00
Transifex-Openfoodnetwork
2eed23d14b
Updating translations for config/locales/fr.yml
2022-01-28 00:24:38 +11:00
Transifex-Openfoodnetwork
2e3bc758e3
Updating translations for config/locales/en_FR.yml
2022-01-28 00:24:36 +11:00
Matt-Yorkley
0bec693655
Merge pull request #8791 from Matt-Yorkley/split-checkout-terms
...
[Split Checkout] Update terms of service handling
2022-01-27 13:07:04 +00:00
Transifex-Openfoodnetwork
9a46eaffba
Updating translations for config/locales/en_FR.yml
2022-01-27 19:18:10 +11:00
Transifex-Openfoodnetwork
135b629134
Updating translations for config/locales/fr.yml
2022-01-27 19:17:46 +11:00
Filipe
75395f6f29
Merge pull request #8648 from Matt-Yorkley/csp
...
Configure CSP
2022-01-26 19:55:11 +00:00
Filipe
404fb4cb7f
Merge pull request #8771 from tsara27/8458-missing-translation
...
Missing translation: table headers in product import validation table #8458
2022-01-26 17:22:44 +00:00
Filipe
53b96896a9
Merge pull request #8779 from mkllnk/7872-remove-stripe-connect
...
Upgrade old Stripe Connect payment methods to Stripe SCA and remove Stripe Connect
2022-01-26 11:57:26 +00:00
Matt-Yorkley
6e8bb777e6
Show platform and distributor terms and conditions
2022-01-25 15:16:43 +00:00
