raggedstaff/openfoodnetwork
1
0
Fork 0
mirror of https://github.com/openfoodfoundation/openfoodnetwork synced 2026-02-06 22:36:07 +00:00
Code Issues Packages Projects Releases Wiki Activity
28,175 Commits 18 Branches 453 Tags
276b94de5bd7bb971c25b4f64e6acda0b5691391
Commit Graph

28175 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Jean-Baptiste Bellet
9cf5645478 Add a spec to handle imperial units 2022-01-07 10:32:46 +01:00
Jean-Baptiste Bellet
7b2a9df326 Handle unitsVariant when calling formattedValueWithUnitName 
- unitsVariant was unread but is necessary to compute the unit_name thanks to `VariantUnitManager.getUnitName()`
 2022-01-07 10:32:46 +01:00
Jean-Baptiste Bellet
3922ffa6a9 Handle imperial units for VariantUnitManager 2022-01-07 10:32:45 +01:00
Transifex-Openfoodnetwork
9c37cd68f8 Updating translations for config/locales/en_US.yml 2022-01-07 03:29:40 +11:00
Matt-Yorkley
14a62f5d49 Change paths helpers to urls 2022-01-06 13:10:48 +00:00
Matt-Yorkley
95464cf956 Update uses of (removed) jsuri interface 2022-01-06 13:10:48 +00:00
Matt-Yorkley
0721800f56 Remove jsuri.js 2022-01-06 13:10:48 +00:00
dependabot[bot]
60e793b899 Bump jest from 27.4.6 to 27.4.7 
Bumps [jest](https://github.com/facebook/jest) from 27.4.6 to 27.4.7.
- [Release notes](https://github.com/facebook/jest/releases)
- [Changelog](https://github.com/facebook/jest/blob/main/CHANGELOG.md)
- [Commits](https://github.com/facebook/jest/compare/v27.4.6...v27.4.7)

---
updated-dependencies:
- dependency-name: jest
  dependency-type: direct:development
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
 2022-01-06 12:31:36 +00:00
Filipe
6f47619c5a Merge pull request #8659 from openfoodfoundation/dependabot/npm_and_yarn/jquery-ui-1.13.0 
Bump jquery-ui from 1.10.4 to 1.13.0
 2022-01-06 12:28:34 +00:00
Filipe
f3ceffc4b6 Merge pull request #8662 from openfoodfoundation/dependabot/npm_and_yarn/select2-4.0.13 
Bump select2 from 3.4.5 to 4.0.13
 2022-01-06 12:22:44 +00:00
SarvarKhalimov
945969ba0c Add flash message translation for log out 2022-01-06 16:25:15 +05:00
Matt-Yorkley
f42abe8268 Remove configs which are already enabled in framework defaults 2022-01-05 15:36:16 +00:00
Matt-Yorkley
8a0646704a Bump framework defaults to 6.1 2022-01-05 15:35:22 +00:00
Matt-Yorkley
b51891f1ab ActionMailer::MailDeliveryJob is the new default class for mailer handling 
ActionMailer::DeliveryJob is deprecated in favour of ActionMailer::MailDeliveryJob, and will be removed in Rails 7
 2022-01-05 15:35:22 +00:00
Matt-Yorkley
037c647336 Bump framework defaults to 6.0 2022-01-05 15:35:22 +00:00
Matt-Yorkley
973c60babd Disable some incompatible defaults 
Using `config.load_defaults` applies a large number of recommended config options, but some of them introduce breaking changes. By selectively disabling the ones that don't work nicely with OFN we can still get the benefits of all the other enabled options.

These options currently don't play nicely with OFN, and break the CI build in various places.
 2022-01-05 15:35:22 +00:00
Matt-Yorkley
a19335d247 Enable framework defaults for Rails 5.2 2022-01-05 15:35:22 +00:00
Matt-Yorkley
49ab74e472 Remove unused JS 2022-01-05 15:25:55 +00:00
Matt-Yorkley
9aa6e79f2f Merge pull request #8661 from SuprajaRamesh/fixing-missing-translation 
Fixing missing translation for "Are you sure?" when deleting a product
 2022-01-05 15:08:45 +00:00
Matt-Yorkley
8dbaa491f1 Merge pull request #8674 from openfoodfoundation/dependabot/npm_and_yarn/jest-27.4.6 
Bump jest from 27.4.5 to 27.4.6
 2022-01-05 15:07:20 +00:00
Matt-Yorkley
0ac831658b Merge pull request #8660 from Matt-Yorkley/foreman-fix 
Fix Foreman/Procfile environment loading issue
 2022-01-05 15:06:53 +00:00
dependabot[bot]
8cb7755d08 Bump jest from 27.4.5 to 27.4.6 
Bumps [jest](https://github.com/facebook/jest) from 27.4.5 to 27.4.6.
- [Release notes](https://github.com/facebook/jest/releases)
- [Changelog](https://github.com/facebook/jest/blob/main/CHANGELOG.md)
- [Commits](https://github.com/facebook/jest/compare/v27.4.5...v27.4.6)

---
updated-dependencies:
- dependency-name: jest
  dependency-type: direct:development
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
 2022-01-05 09:07:12 +00:00
Matt-Yorkley
9956d627fa Use fixed theme 2022-01-04 19:41:42 +00:00
Matt-Yorkley
ae00d997b1 Remove broken image references 2022-01-04 19:41:42 +00:00
Matt-Yorkley
6ce25a0e57 Vendor jquery-ui-theme 2022-01-04 19:41:42 +00:00
Matt-Yorkley
d00992c26c Import additional jquery-ui files 2022-01-04 19:41:42 +00:00
Matt-Yorkley
3ad17aedd4 Merge pull request #8634 from Matt-Yorkley/order-tokens 
Clarify use of order tokens
 2022-01-04 13:05:41 +00:00
Matt-Yorkley
312cc3fc25 Update import of changed stylesheet filename 2022-01-04 12:47:17 +00:00
Filipe
13d04c367d Merge pull request #8636 from Matt-Yorkley/stripe-auth-emails 
Stripe auth email sending; quick tidy up
 2022-01-04 11:01:47 +00:00
dependabot[bot]
dbb2107584 Bump select2 from 3.4.5 to 4.0.13 
Bumps [select2](https://github.com/select2/select2) from 3.4.5 to 4.0.13.
- [Release notes](https://github.com/select2/select2/releases)
- [Changelog](https://github.com/select2/select2/blob/develop/CHANGELOG.md)
- [Commits](https://github.com/select2/select2/compare/3.4.5...4.0.13)

---
updated-dependencies:
- dependency-name: select2
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
 2022-01-04 10:50:59 +00:00
dependabot[bot]
02aaab4bcc Bump jquery-ui from 1.10.4 to 1.13.0 
Bumps [jquery-ui](https://github.com/jquery/jquery-ui) from 1.10.4 to 1.13.0.
- [Release notes](https://github.com/jquery/jquery-ui/releases)
- [Commits](https://github.com/jquery/jquery-ui/compare/1.10.4...1.13.0)

---
updated-dependencies:
- dependency-name: jquery-ui
  dependency-type: direct:production
...

Signed-off-by: dependabot[bot] <support@github.com>
 2022-01-04 10:48:37 +00:00
jibees
3f0ac6ba08 Merge pull request #8646 from openfoodfoundation/dependabot/npm_and_yarn/mrujs-0.7.4 
Bump mrujs from 0.7.2 to 0.7.4
 2022-01-04 11:47:52 +01:00
Matt-Yorkley
c655c3b04e Merge pull request #8664 from Matt-Yorkley/webpacker-admin-css 
Rename admin css pack
 2022-01-04 10:42:01 +00:00
Matt-Yorkley
39f0f56af7 Rename admin css pack 
It looks like Webpacker can get confused sometimes when packs with different formats have the same name (eg: admin.js and admin.scss)...
 2022-01-04 10:27:10 +00:00
SuprajaR
f9a1b17709 asserted the confirmation msg in test 2022-01-04 00:10:38 +05:30
Matt-Yorkley
82363b2c2a Fix Foreman/Procfile environment loading issue 2022-01-03 17:42:58 +00:00
SuprajaR
f3f7fba855 Replacing text with translation 2022-01-03 22:28:56 +05:30
dependabot[bot]
7717674e2a Bump mrujs from 0.7.2 to 0.7.4 
Bumps [mrujs](https://github.com/ParamagicDev/mrujs) from 0.7.2 to 0.7.4.
- [Release notes](https://github.com/ParamagicDev/mrujs/releases)
- [Changelog](https://github.com/ParamagicDev/mrujs/blob/main/CHANGELOG.md)
- [Commits](https://github.com/ParamagicDev/mrujs/compare/v0.7.2...v0.7.4)

---
updated-dependencies:
- dependency-name: mrujs
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
 2022-01-03 15:17:26 +00:00
Filipe
59661f3a27 Merge pull request #7784 from Matt-Yorkley/webpacker-assets 
Webpacker assets
 2022-01-03 15:12:15 +00:00
Matt-Yorkley
f4262421a8 Fix capture styles 2022-01-03 14:07:33 +00:00
Jean-Baptiste Bellet
35c58ca5c9 Update all locales with the latest Transifex translations v4.1.12 2022-01-03 14:30:05 +01:00
jibees
bb7c423de4 Merge pull request #8644 from openfoodfoundation/transifex 
Transifex
 2022-01-03 14:28:38 +01:00
Transifex-Openfoodnetwork
1a0843fad4 Updating translations for config/locales/fr_CM.yml 2022-01-03 21:30:28 +11:00
jibees
329aeeed50 Merge pull request #8655 from filipefurtad0/remove_js_true_specs 
Removes js: true setting from system specs
 2022-01-03 09:49:18 +01:00
filipefurtad0
3a4ce808e8 Removes js: true setting from system specs 2021-12-29 19:42:05 +00:00
Matt-Yorkley
f5ebd47751 Replace customisations with explicit patch in an initializer 
See previous commit.

This isn't nice, but it does the same job as the gem did. We can also update this code now as Rails changes (the gem was incompatible with Rails 7).
 2021-12-28 10:19:35 +00:00
Matt-Yorkley
f07bc042b5 Remove custom_error_message gem 2021-12-27 22:00:55 +00:00
Matt-Yorkley
01f25cbd13 Move more assets after rebase 2021-12-27 17:45:06 +00:00
Matt-Yorkley
7cff1e01a8 Tell Zeitwerk to ignore app/webpacker directory. 
The files here are not Ruby classes
 2021-12-27 17:45:06 +00:00
Matt-Yorkley
2586ddc5ac Fix a CSS compiling issue after rebase 2021-12-27 17:45:06 +00:00