Pau Pérez Fabregat
|
3c71b7f6be
|
Merge pull request #6428 from coopdevs/upgrade-brakeman-dependencies
Upgrade Ruby and Ubuntu to latest in GH action
|
2020-11-30 21:13:25 +01:00 |
|
Pau Perez
|
259e139c47
|
Update all locales with the latest Transifex translations
v3.4.3
|
2020-11-30 09:21:13 +01:00 |
|
Pau Perez
|
8c1e222788
|
Upgrade Ruby and Ubuntu to latest in GH action
It was asked for in
https://github.com/openfoodfoundation/openfoodnetwork/pull/6163/ to use
the latest stable Ruby version. It's also better to use Ubuntu's latest
as well.
|
2020-11-30 09:11:41 +01:00 |
|
Pau Pérez Fabregat
|
4ca930bdad
|
Merge pull request #6163 from openfoodfoundation/luisramos0-patch-2
Add brakeman config
|
2020-11-30 09:08:32 +01:00 |
|
Pau Pérez Fabregat
|
f0a052b65b
|
Merge pull request #6357 from Matt-Yorkley/secret-key-base
Update secret key base
|
2020-11-27 17:32:14 +01:00 |
|
Pau Pérez Fabregat
|
07a72eccd4
|
Merge pull request #6391 from Matt-Yorkley/paypal-stock-clashes
Paypal stock clashes
|
2020-11-27 17:08:15 +01:00 |
|
Matt-Yorkley
|
27586d072d
|
Merge pull request #6423 from openfoodfoundation/revert-6277-controllers
Revert "Move Spree::Admin::BaseController to Admin::BaseController"
|
2020-11-27 14:29:15 +01:00 |
|
Matt-Yorkley
|
3bfa903912
|
Revert "Move Spree::Admin::BaseController to Admin::BaseController"
|
2020-11-27 14:11:57 +01:00 |
|
Matt-Yorkley
|
0ba670b180
|
Ensure order is cleanly reset to cart state when redirecting to cart
|
2020-11-27 11:42:46 +00:00 |
|
Matt-Yorkley
|
c4cfc1dc05
|
Improve order test in paypal controller spec
|
2020-11-27 11:42:06 +00:00 |
|
Pau Pérez Fabregat
|
17957ed6c0
|
Merge pull request #6408 from openfoodfoundation/transifex
Transifex
|
2020-11-27 10:31:56 +01:00 |
|
Pau Pérez Fabregat
|
8b6a08457a
|
Merge pull request #6293 from luisramos0/subs_debug
Add task to print Subscriptions debug info
|
2020-11-27 10:17:57 +01:00 |
|
Maikel
|
9e2a3d6973
|
Merge pull request #6277 from luisramos0/controllers
Move Spree::Admin::BaseController to Admin::BaseController
|
2020-11-27 16:13:55 +11:00 |
|
Icker
|
55b21310e4
|
Added introductory information for testing.
|
2020-11-25 09:44:02 -08:00 |
|
Transifex-Openfoodnetwork
|
1266a37ac5
|
Updating translations for config/locales/en_NZ.yml
|
2020-11-25 05:39:17 +11:00 |
|
Transifex-Openfoodnetwork
|
54feb2f57d
|
Updating translations for config/locales/en_AU.yml
|
2020-11-24 07:31:32 +11:00 |
|
Transifex-Openfoodnetwork
|
e9eb90507e
|
Updating translations for config/locales/ca.yml
|
2020-11-24 07:22:28 +11:00 |
|
Transifex-Openfoodnetwork
|
ee44159c83
|
Updating translations for config/locales/es.yml
|
2020-11-24 07:19:47 +11:00 |
|
Transifex-Openfoodnetwork
|
8861f5c6aa
|
Updating translations for config/locales/ca.yml
|
2020-11-24 07:19:18 +11:00 |
|
Matt-Yorkley
|
b089404891
|
Merge pull request #6362 from coopdevs/remove-unused-truncate-html-gem
Remove unused truncate_html gem
|
2020-11-23 00:49:34 +01:00 |
|
Matt-Yorkley
|
2fa2a30c67
|
Add spec coverage, refactor, avoid double-render errors
👍
|
2020-11-22 18:37:31 +00:00 |
|
Matt-Yorkley
|
cabec7e73f
|
Fix Rubocop warnings and tidy up
|
2020-11-22 18:02:54 +00:00 |
|
Matt-Yorkley
|
87df44764f
|
Extract stock-check logic to controller concern and inject prior to final Paypal payment confirmation.
|
2020-11-22 18:02:52 +00:00 |
|
Andy Brett
|
8f25568530
|
Merge pull request #6390 from jhsu802701/qtest
SIMPLE: added scripts for running test suite in quiet mode
|
2020-11-20 12:15:04 -08:00 |
|
Andy Brett
|
b1b422b90e
|
fix/silence rubocop styles
|
2020-11-20 10:41:31 -08:00 |
|
Andy Brett
|
85d99f3bf2
|
Merge branch 'master' into controllers
|
2020-11-20 08:12:03 -08:00 |
|
Andy Brett
|
c6b3a615f1
|
Merge pull request #6385 from jhsu802701/update_db_schema
SIMPLE: updated db/schema.rb with 'bundle exec rake db:migrate'
|
2020-11-20 08:03:27 -08:00 |
|
Matt-Yorkley
|
5429bd8d7a
|
Update all locales with the latest Transifex translations
|
2020-11-19 23:13:09 +00:00 |
|
Matt-Yorkley
|
300e87648b
|
Merge pull request #6394 from openfoodfoundation/transifex
Transifex
|
2020-11-20 00:11:03 +01:00 |
|
Matt-Yorkley
|
4a9ac62d91
|
Merge branch 'master' into transifex
|
2020-11-20 00:10:48 +01:00 |
|
Luis Ramos
|
d7a1d7769c
|
Merge pull request #6258 from luisramos0/s3_with_region
Upgrade aws-sdk and switch to S3 virtual host style URLs
|
2020-11-19 22:59:57 +00:00 |
|
Transifex-Openfoodnetwork
|
cd20d2612d
|
Updating translations for config/locales/cy.yml
|
2020-11-19 22:09:04 +11:00 |
|
Transifex-Openfoodnetwork
|
446007e283
|
Updating translations for config/locales/cy.yml
|
2020-11-19 22:05:56 +11:00 |
|
Transifex-Openfoodnetwork
|
7bc59512fd
|
Updating translations for config/locales/cy.yml
|
2020-11-19 22:02:49 +11:00 |
|
Pau Pérez Fabregat
|
8c9960854f
|
Merge pull request #6343 from Matt-Yorkley/api-controllers
API controllers: strong paramaters
|
2020-11-19 09:04:16 +01:00 |
|
Matt-Yorkley
|
242c1a2715
|
Add new Paypal feature spec
|
2020-11-19 01:44:53 +00:00 |
|
Matt-Yorkley
|
21d67a0723
|
Extract some more paypal-specific test code to new helper
|
2020-11-19 01:44:38 +00:00 |
|
Jason Hsu
|
59b3bfa161
|
Added scripts for running test suite in quiet mode and updated docker/README.md
|
2020-11-18 16:25:03 -06:00 |
|
Transifex-Openfoodnetwork
|
9fc3ff0250
|
Updating translations for config/locales/en_GB.yml
|
2020-11-19 05:14:36 +11:00 |
|
Transifex-Openfoodnetwork
|
7ddbc10c19
|
Updating translations for config/locales/en_GB.yml
|
2020-11-19 05:11:27 +11:00 |
|
Matt-Yorkley
|
41a5787830
|
Extract paypal response stubbing to helper
|
2020-11-18 15:39:01 +00:00 |
|
Matt-Yorkley
|
010c1c799d
|
Add some notes on paypal checkout flow
|
2020-11-18 14:55:29 +00:00 |
|
Matt-Yorkley
|
2faea65f82
|
Bring in Spree::PaypalController#confirm method
Original method from the gem. This handles the post-payment response from paypal.
|
2020-11-18 14:51:23 +00:00 |
|
Matt-Yorkley
|
dd8f139c1b
|
Memoize Spree::PaypalController#payment_method
This gets called 4 or 5 times in a single request just to read basic attributes from the object. The query doesn't need to be repeated each time
|
2020-11-18 13:45:14 +00:00 |
|
Matt-Yorkley
|
6d0d4b5096
|
Bring in Spree::PaypalController#payment_method
Original method from the gem. Modified in preceding commit.
|
2020-11-18 13:45:13 +00:00 |
|
Matt-Yorkley
|
b0a70f0ba3
|
Improve TaxonController strong params handling
|
2020-11-17 19:48:27 +00:00 |
|
Matt-Yorkley
|
0b18b0dc0a
|
Include Calculator attributes in PaymentMethod nested attributes and DRY repeated code
|
2020-11-17 19:04:26 +00:00 |
|
Matt-Yorkley
|
d225294b6b
|
Extract to PermittedAttributes::Calculator
|
2020-11-17 18:51:48 +00:00 |
|
Matt-Yorkley
|
3547b9fe56
|
Add missing calculator params
|
2020-11-17 18:51:48 +00:00 |
|
Matt-Yorkley
|
1766f33d46
|
Use ActionController::Metal and include StrongParameters
|
2020-11-17 18:51:48 +00:00 |
|