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

19029 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Transifex-Openfoodnetwork
d86b879972 Updating translations for config/locales/nb.yml 2020-09-15 20:46:33 +10:00
Transifex-Openfoodnetwork
fd339488e6 Updating translations for config/locales/es.yml 2020-09-15 20:38:08 +10:00
Transifex-Openfoodnetwork
b6f5eab6e1 Updating translations for config/locales/ca.yml 2020-09-15 20:37:51 +10:00
dependabot-preview[bot]
ced29c1f3d Bump webmock from 3.8.3 to 3.9.1 
Bumps [webmock](https://github.com/bblimke/webmock) from 3.8.3 to 3.9.1.
- [Release notes](https://github.com/bblimke/webmock/releases)
- [Changelog](https://github.com/bblimke/webmock/blob/master/CHANGELOG.md)
- [Commits](https://github.com/bblimke/webmock/compare/v3.8.3...v3.9.1)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2020-09-15 09:49:14 +00:00
Pau Pérez Fabregat
27ffe9edb2 Merge pull request #5971 from luisramos0/testing 
Remove some old spree test helpers that are not needed
 2020-09-15 09:13:20 +02:00
Luis Ramos
0d7b5cd32c Merge pull request #5868 from luisramos0/taxonomies 
[Bye bye Spree] Bring models taxon and taxonomy from spree_core
 2020-09-14 20:45:04 +01:00
Matt-Yorkley
276fea6942 Fix rubocop offenses 2020-09-14 15:14:16 +01:00
Matt-Yorkley
c45dcad975 Move concern to concerns directory 2020-09-14 13:23:21 +01:00
Andy Brett
246934d8ba update preference name in factor and specs 2020-09-12 14:49:42 -07:00
Andy Brett
37cfe65688 migrate existing weight calculators 2020-09-12 12:32:06 -07:00
Andy Brett
4123eb7c10 update specs; add specs to validate weight calculator preference is kg or lb 2020-09-12 11:53:45 -07:00
Transifex-Openfoodnetwork
f32d8e2678 Updating translations for config/locales/en_GB.yml 2020-09-13 04:29:16 +10:00
Andy Brett
d32ed6b48f improve styling on calculators UI 2020-09-12 10:43:14 -07:00
Transifex-Openfoodnetwork
a9a05debba Updating translations for config/locales/en_CA.yml 2020-09-13 02:30:11 +10:00
Matt-Yorkley
9481876595 Fix line_item tax sum in OrderTaxAdjustmentsFetcher 2020-09-12 15:41:29 +01:00
Matt-Yorkley
cdf4e88e21 Add failing spec for OrderTaxAdjustmentsFetcher with multiple line items 2020-09-12 15:40:06 +01:00
Matt-Yorkley
7ddc53bb5b Remove temporary debugging helpers added during the Rails 4 upgrade. 2020-09-12 12:25:43 +01:00
Transifex-Openfoodnetwork
b9f6dc6de5 Updating translations for config/locales/en_FR.yml 2020-09-12 00:25:49 +10:00
Transifex-Openfoodnetwork
811985cf0f Updating translations for config/locales/fr.yml 2020-09-12 00:25:36 +10:00
Luis Ramos
175b78b51f Merge pull request #5827 from jeduardo824/bug/remove-environment-column-when-user-is-not-super-admin 
Bug/4592 - Hide Environment column on Payment Methods page when user is not admin
 2020-09-11 10:47:10 +01:00
Maikel Linke
e82aa0c89a Update translations 2020-09-11 15:25:52 +10:00
Maikel Linke
8be05e94bd Update release issue template 2020-09-11 15:25:24 +10:00
Maikel
7317347fd6 Merge pull request #6012 from openfoodfoundation/transifex 
Transifex
 2020-09-11 15:25:04 +10:00
Maikel
c5c542069f Merge pull request #5951 from mkllnk/5785-js-error-reporting 
5785 Notify Bugsnag when sending card to Stripe fails during checkout
 2020-09-11 15:12:47 +10:00
Maikel
dc9e3aa1a0 Merge pull request #6010 from mkllnk/fix-module-declaration 
Fix module declaration
 2020-09-11 09:12:08 +10:00
Luis Ramos
a48b57f7a7 Merge pull request #5883 from luisramos0/taxs 
[Bye bye Spree] Bring models tax_rate, tax_categories, adjustments and calculator from spree_core
 2020-09-10 23:10:26 +01:00
Luis Ramos
6f59158153 Remove useless TODOs 2020-09-10 17:36:25 +01:00
Transifex-Openfoodnetwork
f501d48caa Updating translations for config/locales/fr.yml 2020-09-11 01:54:06 +10:00
Pau Pérez Fabregat
2429b186ce Merge pull request #6008 from openfoodfoundation/dependabot/bundler/ddtrace-0.40.0 
Bump ddtrace from 0.39.0 to 0.40.0
 2020-09-10 17:10:56 +02:00
Pau Pérez Fabregat
7df2759475 Merge pull request #5907 from Matt-Yorkley/data-cleanup 
Data cleanup
 2020-09-10 17:06:20 +02:00
Pau Pérez Fabregat
681cb34c48 Merge pull request #6009 from openfoodfoundation/transifex 
Transifex
 2020-09-10 14:01:49 +02:00
Maikel Linke
94b903179e Fix module declaration 
Running script/prepare_imported_db.rb failed because
Spree::PaymentMethodDistributors couldn't be found. This problem is
described in the Rubocop docs:
https://rubystyle.guide/#namespace-definition
 2020-09-10 16:12:17 +10:00
Maikel Linke
59070712d9 Update rubocop todo list 2020-09-10 16:08:18 +10:00
Transifex-Openfoodnetwork
76aebf329e Updating translations for config/locales/ar.yml 2020-09-10 02:13:08 +10:00
dependabot-preview[bot]
b2b5606f2e Bump ddtrace from 0.39.0 to 0.40.0 
Bumps [ddtrace](https://github.com/DataDog/dd-trace-rb) from 0.39.0 to 0.40.0.
- [Release notes](https://github.com/DataDog/dd-trace-rb/releases)
- [Changelog](https://github.com/DataDog/dd-trace-rb/blob/master/CHANGELOG.md)
- [Commits](https://github.com/DataDog/dd-trace-rb/compare/v0.39.0...v0.40.0)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2020-09-09 15:32:14 +00:00
Pau Perez
f890c4a31d Fix LogEntry spec 2020-09-08 14:12:17 +02:00
Pau Pérez Fabregat
b087f8da19 Merge pull request #6001 from openfoodfoundation/transifex 
Transifex
 2020-09-08 13:19:28 +02:00
Pau Perez
e3c1159c17 Start with 6 months data retention 
As discussed in code review.
 2020-09-08 12:49:58 +02:00
Pau Perez
14054f0e70 Move retention period to constant 
There's no need to reevaluate the date 3 times, potentially leading to
edge cases.
 2020-09-08 12:48:30 +02:00
Pau Perez
d525ddfe14 Move missing statements to where + delete_all 
And fix the specs
 2020-09-08 12:47:42 +02:00
Pau Pérez Fabregat
df0b997258 Use where + delete_all to increase readability 
Co-authored-by: Maikel <maikel@email.org.au>
 2020-09-08 12:26:47 +02:00
Pau Pérez Fabregat
ffbb0d26a4 Unhardcode class name 2020-09-08 12:26:21 +02:00
dependabot-preview[bot]
5eb64f431a Bump unicorn from 5.6.0 to 5.7.0 
Bumps [unicorn](https://yhbt.net/unicorn/) from 5.6.0 to 5.7.0.

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2020-09-08 09:20:12 +00:00
Andy Brett
c618ba3b2c style fixes 2020-09-07 13:44:42 -07:00
Andy Brett
5a5cbbd318 add drop down list for unit preference 2020-09-07 13:26:09 -07:00
Transifex-Openfoodnetwork
3da14233bf Updating translations for config/locales/en_US.yml 2020-09-08 02:55:31 +10:00
Pau Pérez Fabregat
940c067b60 Merge pull request #5992 from openfoodfoundation/transifex 
Transifex
 2020-09-07 18:46:48 +02:00
Andy Brett
adb29a9c8f add preferred_unit to weight shipping calculator 2020-09-07 08:41:48 -07:00
Andy Brett
5793f0103d Revert "Add a per-pound calculator and a spec for it" 
This reverts commit e8eadcbf39.
 2020-09-07 07:50:59 -07:00
Andy Brett
e8eadcbf39 Add a per-pound calculator and a spec for it 2020-09-06 09:03:06 -07:00