raggedstaff/openfoodnetwork
1
0
Fork 0
mirror of https://github.com/openfoodfoundation/openfoodnetwork synced 2026-01-29 21:17:17 +00:00
Code Issues Packages Projects Releases Wiki Activity
11,910 Commits 20 Branches 451 Tags
94cbac00a579c9783be8cee54d653cd29686a8d2
Commit Graph

1582 Commits

Author SHA1 Message Date
kkoomin
f65ce82778 changed string into translation key & add 'infinity' key 2019-05-04 14:40:45 +01:00
Luis Ramos
6f0d155508 Merge pull request #3742 from openfoodfoundation/2-0-stable 
Merge 2-0-stable to master
 2019-05-04 00:06:27 +01:00
luisramos0
d7596b4066 Merge branch 'master' into fix_rebase_error 2019-05-03 12:10:57 +01:00
Luis Ramos
3b2e614c57 Merge pull request #3734 from luisramos0/2-0-validate-distribution 
Removing a variant from OC will prevent user with that variant in the cart from checking out
 2019-05-02 16:12:41 +01:00
luisramos0
85cf4fa3e6 Merge branch 'master' into 2-0-stable-May2 2019-05-02 11:27:53 +01:00
Luis Ramos
edaf2479dc Merge pull request #3741 from luisramos0/2-0-stable-Apr15 
[Spree Upgrade] Merging master into 2-0-stable (1st run in Apr2019)
 2019-05-02 11:26:54 +01:00
luisramos0
f0f08f7cd3 Update all locales with the latest Transifex translations 2019-05-02 11:22:37 +01:00
Pau Pérez Fabregat
5f47a37fac Merge pull request #3763 from coopdevs/allow-passing-s3-region 
Allow passing s3 region
 2019-05-02 12:17:58 +02:00
Syed Usama Amer
75a7745736 Closes translation bug for enterprise fee settings 2019-05-01 10:43:35 -05:00
Matt-Yorkley
732d0f7cf4 Don't use s3 for images unless images bucket has been provisioned. 
Sets the "use_s3" (for images) option based on presence of `s3_images_bucket` from ofn-install instead of presence of s3 keys, for instances that use s3 for backups but not for images.
 2019-04-30 17:06:42 +01:00
Pau Perez
d5b08c602a Allow passing a specific AWS region to S3 settings 
This solves the error showed below when executed `bundle exec rake
db2fog:backup RAILS_ENV=staging` on Katuma staging

```
Excon::Error::BadRequest: Expected(200) <=> Actual(400 Bad Request)
excon.error.response
  :body          => "<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n<Error><Code>AuthorizationHeaderMalformed</Code><Message>The authorization header is malformed; the region 'us-east-1' is wrong; expecting 'eu-central-1'</Message><Region>eu-central-1</Region><RequestId>3DE2763883FC601D</RequestId><HostId>1E6UapnblBqVZM0SeeLrdPNDd+VaQ0nxCWwrQ9mi8HjRo2xevAUwtSq5V3fxhsj4Cj9ynnDroco=</HostId></Error>"
```
 2019-04-30 13:31:36 +02:00
Pau Perez
f36646d0a3 Store S3 keys in Config before calling db2fog 
This ensures that Db2fog always picks up the latest value of the S3_*
env vars and not the one that was persisted last time. Now you can do
things like `S3_BUCKET=xxx bundle exec rake db2fog:backup` if you had
to.
 2019-04-30 13:31:36 +02:00
luisramos0
3d420d5727 Merge branch 'master' into 2-0-stable-Apr15 2019-04-16 21:14:11 +01:00
Transifex-Openfoodnetwork
e07ae3d931 Updating translations for config/locales/en_BE.yml 2019-04-17 02:20:37 +10:00
Luis Ramos
6b84edb6d9 Merge pull request #3736 from kristinalim/feature/enable_newrelic_test_mode 
Install and set up newrelic_rpm gem for development environment
 2019-04-16 15:35:36 +01:00
Luis Ramos
c5720bede5 Merge pull request #3697 from coopdevs/add-delayed-job-web 
Add delayed job web
 2019-04-16 15:33:59 +01:00
Luis Ramos
67a7e26757 Merge pull request #3695 from luisramos0/2-0-emails-transl 
[Spree Upgrade] Fix translation missing in order confirmation email subject and bring cancel email to ofn
 2019-04-16 13:44:24 +01:00
Pau Pérez Fabregat
ffbea7d3fd Merge pull request #3712 from openfoodfoundation/transifex 
Transifex
 2019-04-15 12:58:30 +02:00
luisramos0
8f39a18ca3 Merge branch 'master' into 2-0-stable-Apr15 2019-04-15 11:46:31 +01:00
Transifex-Openfoodnetwork
1b01c44ce4 Updating translations for config/locales/es.yml 2019-04-15 19:12:19 +10:00
Transifex-Openfoodnetwork
10c917a693 Updating translations for config/locales/ca.yml 2019-04-15 17:08:06 +10:00
Transifex-Openfoodnetwork
418d80bdc0 Updating translations for config/locales/ca.yml 2019-04-15 17:05:00 +10:00
luisramos0
fce3d69345 Add flash and warning to the cart page when item becomes unavailable 2019-04-13 21:39:41 +01:00
Kristina Lim
d983e400cd Add config/newrelic.yml.example for newrelic_rpm gem 2019-04-12 13:57:50 +08:00
Transifex-Openfoodnetwork
45ca63e751 Updating translations for config/locales/fr_BE.yml 2019-04-12 01:14:59 +10:00
Transifex-Openfoodnetwork
b6989c6d6e Updating translations for config/locales/nl_BE.yml 2019-04-12 01:05:30 +10:00
Luis Ramos
ddd3443a86 Merge pull request #3659 from mkllnk/missing-translation 
Fix "What's this?" on admin dashboard
 2019-04-10 22:05:19 +01:00
Matt-Yorkley
7373fff190 Define default s3_protocol as 'https' 2019-04-10 19:23:16 +01:00
Matt-Yorkley
4912a9e258 Ensure ENV vars in applications.yml actually update stored Spree::Config preferences 2019-04-10 19:10:31 +01:00
Matt-Yorkley
2ac981a9a3 Make db2fog tasks conditional 2019-04-10 17:17:43 +01:00
Matt-Yorkley
37cbfcb692 Use ENV var for backups bucket 2019-04-10 17:17:17 +01:00
Matt-Yorkley
e486a94fb4 Add missing translations in subscriptions 2019-04-10 12:16:31 +01:00
Luis Ramos
4478d51aee Merge pull request #3668 from luisramos0/2-0-stable-Mar29 
[Spree Upgrade] Merging master into 2-0-stable (4th run in Mar2019)
 2019-04-09 17:46:36 +01:00
Transifex-Openfoodnetwork
029e8eb848 Updating translations for config/locales/de_DE.yml 2019-04-09 20:50:31 +10:00
Transifex-Openfoodnetwork
fde3d72a66 Updating translations for config/locales/en_GB.yml 2019-04-09 00:18:48 +10:00
Transifex-Openfoodnetwork
5e672dc7d4 Updating translations for config/locales/pt.yml 2019-04-08 21:03:32 +10:00
Pau Perez
860414fa31 Update locales with latest Transifex translations 2019-04-08 12:27:19 +02:00
Pau Pérez Fabregat
fa31ca5a95 Merge pull request #3686 from openfoodfoundation/transifex 
Transifex
 2019-04-08 12:23:36 +02:00
Transifex-Openfoodnetwork
f5ab89eb03 Updating translations for config/locales/it.yml 2019-04-06 07:38:45 +11:00
luisramos0
ecc60f3b61 Merge branch 'master' into 2-0-stable-Mar29 2019-04-05 15:47:46 +01:00
Transifex-Openfoodnetwork
231fa28713 Updating translations for config/locales/en_US.yml 2019-04-06 00:24:05 +11:00
Pau Pérez Fabregat
67376a29a6 Merge pull request #3694 from Matt-Yorkley/db2fog 
Fix outdated db2fog initializer
 2019-04-05 12:26:07 +02:00
Transifex-Openfoodnetwork
74b7418f59 Updating translations for config/locales/fr.yml 2019-04-05 04:39:15 +11:00
Transifex-Openfoodnetwork
545f2fefa4 Updating translations for config/locales/fr.yml 2019-04-05 04:36:07 +11:00
Pau Perez
aa3f0ac577 Reuse #superadmin? in Delayed Job Web route 
This moves #superadmin? to the user decorator so it can be reused
outside FeatureFlags.
 2019-04-04 16:00:27 +02:00
Pau Perez
bf20376667 Add Delayed Job Web for superadmins only 
This adds https://github.com/ejschmitt/delayed_job_web to enable async
job management such as retries, removal of failed jobs, etc.

Only superadmins can access this web UI though. Therefore any sysadmin
that needs to use it should have access to the appropriate instance
superadmin credentials in Bitwarden.
 2019-04-04 16:00:27 +02:00
Transifex-Openfoodnetwork
8d69180c8c Updating translations for config/locales/es.yml 2019-04-04 23:23:06 +11:00
Transifex-Openfoodnetwork
4b60a75eae Updating translations for config/locales/ca.yml 2019-04-04 23:22:59 +11:00
Matt-Yorkley
9b45269cbb Fix name of Spree::Config preference 2019-04-04 13:06:05 +01:00
luisramos0
cf3b2308e1 Fix translation problem in the subject of order confirmation emails 2019-04-04 12:55:36 +01:00