raggedstaff/openfoodnetwork
1
0
Fork 0
mirror of https://github.com/openfoodfoundation/openfoodnetwork synced 2026-02-05 22:26:07 +00:00
Code Issues Packages Projects Releases Wiki Activity
16,446 Commits 18 Branches 452 Tags
d4cfa0463fdef006f669c8684457938bd932c733
Commit Graph

16446 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Luis Ramos
d4cfa0463f Move select out of scope visible_for because it is breaking exchange_product queries and it's just not needed there. The only other use of this product's scope visible_for is the enterprise serializer so we add the select to it. 2020-07-22 15:57:49 +01:00
Luis Ramos
0fe9d2ac09 Make OC advanced settings work by permitting the extra parameter 2020-07-22 15:57:49 +01:00
Luis Ramos
3d94ce39dd Merge pull request #5793 from luisramos0/payment_fees 
Make charges update method update the first pending payment
v3.1.2 		2020-07-20 21:36:19 +01:00
Luis Ramos
21227d7482 Make charges update method update the first pending payment 
Updating the first overall payment could select a failed payment and ignore the pending payment that is about to be processed
 2020-07-20 18:23:06 +01:00
Luis Ramos
62a3b6b720 Merge pull request #5406 from kristinalim/fix/5300-optimistic_locking_in_stock_items 
5300 Avoid race conditions in Spree::StockItem
v3.1.1 		2020-07-17 22:24:59 +01:00
Luis Ramos
152e432f78 Merge pull request #5749 from mbudm/issue/1253 
Ensure the hero image doesn't pixelate on hamburger menu open
 2020-07-17 22:15:46 +01:00
Pau Pérez Fabregat
89906f581d Merge pull request #5778 from openfoodfoundation/transifex 
Transifex
 2020-07-17 18:37:22 +02:00
Maikel
ea1e23abab Merge pull request #5756 from mkllnk/broken-spec 
Make broken spec fail reliably and set it pending
 2020-07-17 09:56:56 +10:00
Maikel Linke
b0ac188430 Make broken spec fail reliably and set it pending 
This spec has been broken for a long time, at least eight months. But it
regularly passed because the search filter is applied with a delay and
in that time the content matches. And once the filter is applied, no
products are shown and the negative matchers pass.
 2020-07-17 09:28:17 +10:00
Transifex-Openfoodnetwork
f31a1ff59c Updating translations for config/locales/en_GB.yml 2020-07-17 04:10:57 +10:00
Luis Ramos
2fe37b5237 Update all locales with the latest Transifex translations 2020-07-16 18:07:40 +01:00
Luis Ramos
981f1c0932 Merge pull request #5754 from openfoodfoundation/transifex 
Transifex
 2020-07-16 18:06:17 +01:00
Maikel
4e3502cce7 Merge pull request #5766 from mkllnk/5764-fix-pin-payments 
5764 Provide credit card brand to Pin Payments
 2020-07-16 10:28:18 +10:00
Matt-Yorkley
19b3041e1d Merge pull request #5768 from Matt-Yorkley/pin-payments-params 
Update StrongParams for Pin Payments
 2020-07-16 00:01:34 +02:00
Pau Perez
4e00c45782 Doc defensive coding needed by pin payments 
[skip ci]
 2020-07-15 16:46:09 +02:00
Luis Ramos
31e072179b Make method a little simple by extracting method 2020-07-15 15:23:16 +01:00
Luis Ramos
57fd1bdee2 Merge pull request #5744 from openfoodfoundation/dependabot/bundler/i18n-js-3.7.1 
Bump i18n-js from 3.7.0 to 3.7.1
 2020-07-15 15:04:55 +01:00
Matt-Yorkley
c009fed6be Update StrongParams for Pin Payments 2020-07-15 14:00:19 +02:00
dependabot-preview[bot]
5fae2c08c8 Bump i18n-js from 3.7.0 to 3.7.1 
Bumps [i18n-js](https://github.com/fnando/i18n-js) from 3.7.0 to 3.7.1.
- [Release notes](https://github.com/fnando/i18n-js/releases)
- [Changelog](https://github.com/fnando/i18n-js/blob/master/CHANGELOG.md)
- [Commits](https://github.com/fnando/i18n-js/compare/v3.7.0...v3.7.1)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2020-07-15 08:13:42 +00:00
Pau Pérez Fabregat
d4fea5223d Merge pull request #5762 from openfoodfoundation/dependabot/bundler/oj-3.10.7 
Bump oj from 3.10.6 to 3.10.7
 2020-07-15 10:13:19 +02:00
Maikel Linke
25155cab18 Provide credit card brand to Pin Payments 
Spree replaced the Ruby code providing the credit card brand with a
jquery plugin providing it on the checkout screen.

I re-added Ruby code because it's easier and more robust than updating
the user interface with new Javascript.
 2020-07-15 17:13:46 +10:00
Steve Roberts
dbc7632c4e Add inline comment to explain two height properties 2020-07-15 09:52:04 +10:00
Steve Roberts
c4d7899a99 Use vh units for new browsers and align tagline bg to top. 2020-07-14 19:26:12 +10:00
Transifex-Openfoodnetwork
f79269e96b Updating translations for config/locales/ca.yml 2020-07-14 17:46:12 +10:00
Steve Roberts
60870a1215 Fix linting errors 2020-07-14 12:58:48 +10:00
Steve Roberts
63a080266e Merge branch 'master' of https://github.com/openfoodfoundation/openfoodnetwork into issue/1253 2020-07-14 12:45:14 +10:00
dependabot-preview[bot]
f4cb14ab1a Bump oj from 3.10.6 to 3.10.7 
Bumps [oj](https://github.com/ohler55/oj) from 3.10.6 to 3.10.7.
- [Release notes](https://github.com/ohler55/oj/releases)
- [Changelog](https://github.com/ohler55/oj/blob/develop/CHANGELOG.md)
- [Commits](https://github.com/ohler55/oj/compare/v3.10.6...v3.10.7)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2020-07-14 00:10:40 +00:00
Luis Ramos
9c8318d828 Merge pull request #5613 from luisramos0/calculators 
Move all Calculators from spree to OFN and out of the Spree namespace
 2020-07-13 15:16:15 +01:00
Luis Ramos
d536cc8108 Merge pull request #5755 from Matt-Yorkley/groups-images 
Fix StrongParameters for groups images
 2020-07-13 14:50:24 +01:00
Matt-Yorkley
f450c21308 Merge pull request #5759 from luisramos0/vo_spec 
Comment very flaky spec
 2020-07-10 21:44:03 +02:00
Luis Ramos
eb4d648a23 Comment this very flaky spec for now 2020-07-10 19:27:31 +01:00
Transifex-Openfoodnetwork
50427472c4 Updating translations for config/locales/en_NZ.yml 2020-07-10 20:25:20 +10:00
Maikel
c1d700196b Merge pull request #5739 from Matt-Yorkley/flaky-spec-complex-oc 
Flaky spec order_cycles/complex_updating_specific_time
 2020-07-10 14:59:59 +10:00
Luis Ramos
cc3361aaac Merge pull request #5659 from dmarcoux/issue-5555 
Filter orders on inclusive dates in admin/orders
 2020-07-09 20:40:45 +01:00
Luis Ramos
ed915006fa Merge pull request #5738 from openfoodfoundation/dependabot/bundler/wicked_pdf-2.1.0 
Bump wicked_pdf from 1.4.0 to 2.1.0
 2020-07-09 20:40:11 +01:00
Matt-Yorkley
1a132924d2 Fix StrongParameters for groups images 2020-07-09 10:00:02 +02:00
Transifex-Openfoodnetwork
e3980521ea Updating translations for config/locales/fr_CA.yml 2020-07-09 07:58:41 +10:00
Transifex-Openfoodnetwork
e6a2eb8af9 Updating translations for config/locales/en_CA.yml 2020-07-09 07:53:34 +10:00
Luis Ramos
fabddbd1c0 Merge pull request #5746 from coopdevs/remove-specs-dead-code 
Remove dead specs helper method
 2020-07-08 12:38:24 +01:00
Steve Roberts
2f562809c0 Ensure the hero image doesn't attempt to use the full height of all page content 
Not sure exactly why this happens, but when the mobile nav is opened the hero image at #tagline:before uses the height of the full window - often around 4000px. Adding max-height of 100% to the nearest safe parent prevents this behaviour.
 2020-07-08 21:31:52 +10:00
Matt-Yorkley
a763a5ee0b Update all locales with the latest Transifex translations v3.1.0 2020-07-08 12:49:20 +02:00
Matt-Yorkley
d718eb9a23 Merge pull request #5726 from openfoodfoundation/transifex 
Transifex
 2020-07-08 12:33:09 +02:00
Matt-Yorkley
d78db16abe Merge pull request #5718 from Matt-Yorkley/available-locales-bug 
Available locales bug
 2020-07-08 12:30:18 +02:00
Matt-Yorkley
e742069959 Refactor UI interactions for opening exchange product tabs in OC edit 2020-07-08 11:11:39 +02:00
Matt-Yorkley
c8254b8338 Adjust exchange_row assertion to use slightly more specific criteria 2020-07-08 11:11:39 +02:00
Matt-Yorkley
be1e39f0cb Ensure next page has loaded before interacting with form elements 2020-07-08 11:11:39 +02:00
Pau Perez
a1e8c8ad03 Remove dead specs helper method 
I found it while reviewing
https://github.com/openfoodfoundation/openfoodnetwork/pull/5718#discussion_r451390809.
 2020-07-08 10:59:13 +02:00
Luis Ramos
312e78ba61 Merge pull request #5742 from Matt-Yorkley/flaky-spec-shopping 
Fix flaky shopping_spec
 2020-07-07 18:11:00 +01:00
Luis Ramos
207c6bc205 Merge pull request #5741 from Matt-Yorkley/flaky-spec-exchange-renderer 
Re-enable and fix flaky exchange products renderer spec
 2020-07-07 18:09:02 +01:00
Luis Ramos
f8f7b30095 Merge pull request #5716 from openfoodfoundation/dependabot/bundler/database_cleaner-1.8.5 
Bump database_cleaner from 1.7.0 to 1.8.5
 2020-07-07 17:29:10 +01:00