raggedstaff/openfoodnetwork
1
0
Fork 0
mirror of https://github.com/openfoodfoundation/openfoodnetwork synced 2026-01-30 21:27:17 +00:00
Code Issues Packages Projects Releases Wiki Activity
11,868 Commits 18 Branches 452 Tags
85cf4fa3e6e8ffdb3df5cefcdd3201e9ca38961a
Commit Graph

11868 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Pau Pérez Fabregat
2d77605e59 Merge pull request #3764 from Matt-Yorkley/s3_backups_without_images 
Don't use s3 for images unless images bucket has been provisioned.
 2019-05-01 17:55:01 +02:00
Pau Pérez Fabregat
88cbf5bd36 Merge pull request #3753 from openfoodfoundation/dependabot/bundler/whenever-0.11.0 
Bump whenever from 0.10.0 to 0.11.0
 2019-04-30 18:38:52 +02: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
Pau Pérez Fabregat
010f058618 Merge pull request #3744 from openfoodfoundation/dependabot/bundler/oj-3.7.12 
Bump oj from 3.7.11 to 3.7.12
 2019-04-30 11:53:44 +02:00
Pau Pérez Fabregat
6c9101dffa Merge pull request #3745 from openfoodfoundation/transifex 
Transifex
 2019-04-30 11:46:17 +02:00
dependabot[bot]
2c536c29c5 Bump whenever from 0.10.0 to 0.11.0 
Bumps [whenever](https://github.com/javan/whenever) from 0.10.0 to 0.11.0.
- [Release notes](https://github.com/javan/whenever/releases)
- [Changelog](https://github.com/javan/whenever/blob/master/CHANGELOG.md)
- [Commits](https://github.com/javan/whenever/compare/v0.10.0...v0.11.0)

Signed-off-by: dependabot[bot] <support@dependabot.com>
 2019-04-23 19:18:23 +00:00
Pau Pérez Fabregat
380a9c561e Merge pull request #3725 from coopdevs/add-specs-for-cache-variant-deletion 
Add specs for the cache refresh on variant removal
 2019-04-19 19:02:04 +02:00
Maikel
99a4878bdf Merge pull request #3653 from mkllnk/2520-spree2-order-subscription 
2520 Remove `process_payments!` override
 2019-04-19 07:34:30 +10:00
Maikel
736ac49581 Merge pull request #3701 from luisramos0/2-0-fix-order-edit-issues 
[Spree Upgrade] Fix two issues in admin orders edit page
 2019-04-19 07:33:26 +10:00
luisramos0
3d420d5727 Merge branch 'master' into 2-0-stable-Apr15 2019-04-16 21:14:11 +01:00
Transifex-Openfoodnetwork
225b159b9b Updating translations for config/locales/en_BE.yml 2019-04-17 02:23:46 +10: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
eeac75ade1 Merge pull request #3689 from luisramos0/2-0-fix-split-button-bug 
[Spree Upgrade] Fix split button reappearing when editing line item quantity
 2019-04-16 15:28:43 +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
Luis Ramos
29000ebe0d Merge pull request #3651 from luisramos0/2-0-enterprise-fee-report 
[Spree Upgrade] Fix Enterprise fee report specs
 2019-04-16 12:36:53 +01:00
Maikel Linke
278190a25c Update specs for Spree v2 payment requirement 
This pull request removed the override of `process_payments!` which was based on v1. Spree v2 has an additional check: An order in payment state requires a payment. Some specs didn't care and didn't create payments before transitioning to `complete`.
 2019-04-16 10:30:14 +10:00
Maikel Linke
8b9a814131 Remove obsolete Spree 2 backport on Order 2019-04-16 10:30:14 +10:00
Maikel Linke
6f12eee8ae Reduce the override of Order for subscriptions 
Orders belonging to subscriptions get completed without payment. That
requires overriding Spree's functionality.

In Spree 2, an order in payment state without pending orders is invalid.
Instead we skip the payment state by not requiring a payment for
automatically generated orders until the order cycle is closed.
 2019-04-16 10:30:14 +10:00
dependabot[bot]
2a025be032 Bump oj from 3.7.11 to 3.7.12 
Bumps [oj](https://github.com/ohler55/oj) from 3.7.11 to 3.7.12.
- [Release notes](https://github.com/ohler55/oj/releases)
- [Changelog](https://github.com/ohler55/oj/blob/master/CHANGELOG.md)
- [Commits](https://github.com/ohler55/oj/compare/v3.7.11...v3.7.12)

Signed-off-by: dependabot[bot] <support@dependabot.com>
 2019-04-15 19:14:59 +00:00
Pau Pérez Fabregat
ffbea7d3fd Merge pull request #3712 from openfoodfoundation/transifex 
Transifex
 2019-04-15 12:58:30 +02:00
Pau Pérez Fabregat
6d0ecdc4a6 Merge pull request #3721 from Matt-Yorkley/subs_styles 
Subs styles
 2019-04-15 12:53:27 +02:00
luisramos0
8f39a18ca3 Merge branch 'master' into 2-0-stable-Apr15 2019-04-15 11:46:31 +01:00
Transifex-Openfoodnetwork
f76fada066 Updating translations for config/locales/es.yml 2019-04-15 19:15:24 +10: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
Luis Ramos
1e85bf6a68 Merge pull request #3641 from luisramos0/2-0-update-spree-2-0-4-revision 
[Spree Upgrade] Update spree revision to include last package_factory fix
 2019-04-12 22:16:15 +01:00
Pau Pérez Fabregat
e0fd2fbaa9 Merge pull request #3726 from Matt-Yorkley/db2fog_patch 
Db2fog patch
v1.30.0 		2019-04-12 14:26:46 +02:00
Kristina Lim
53bd421389 Add newrelic.yml to .gitignore 2019-04-12 13:57:50 +08:00
Kristina Lim
6f5a024be2 Update script/setup to create default newrelic.yml 2019-04-12 13:57:50 +08:00
Kristina Lim
d983e400cd Add config/newrelic.yml.example for newrelic_rpm gem 2019-04-12 13:57:50 +08:00
Kristina Lim
c5e4b283f1 Install latest newrelic_rpm gem with test mode 2019-04-12 13:57:47 +08:00
Luis Ramos
0f00f48f13 Merge pull request #3634 from luisramos0/2-0-fix-sample-data 
[Spree Upgrade] Fix new sample data in v2
 2019-04-11 23:07:15 +01: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
luisramos0
46278e3edd Set distributor in order and shipping methods so that refreshing shipment rates suceeds 2019-04-10 22:16:09 +01:00
luisramos0
5791eba9bd Enhance orders edit page spec to verify that shipping method can be edited and that shipping methods of other distributors are not listed 2019-04-10 22:16:09 +01:00
luisramos0
c852c616d5 Update spree revision to include last package_factory fix and update spree dependencies 2019-04-10 22:16:09 +01: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
Luis Ramos
4bf9320be8 Merge pull request #3666 from mkllnk/1830-v2-edit-shipping-fees 
Close adjustments so that updates are effective
 2019-04-10 21:58:22 +01:00
Luis Ramos
83a4771cdd Merge pull request #3720 from Matt-Yorkley/spree2/translations 
Subs: missing translations
 2019-04-10 21:47:47 +01:00
Luis Ramos
984155013c Merge pull request #3648 from luisramos0/2-0-fix-ui-issue 
[Spree Upgrade] Fix "back to list" button overlap and remove configurations menu from payments methods list
 2019-04-10 21:46:40 +01:00