raggedstaff/openfoodnetwork
1
0
Fork 0
mirror of https://github.com/openfoodfoundation/openfoodnetwork synced 2026-01-25 20:46:48 +00:00
Code Issues Packages Projects Releases Wiki Activity
23,027 Commits 21 Branches 450 Tags
d66dac4ccbce075fc02cb01eb4aec79c25fe4288
Commit Graph

23027 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Filipe
d66dac4ccb Merge pull request #8621 from apricot12/Unit-value-shop-front 
Update units when variant unit name is edited
 2022-01-11 17:41:20 +00:00
Filipe
4978c95e75 Merge pull request #8467 from SarvarKh/validate-social-links 
Fix the issue with 'at' in enterprise twitter and instagram
 2022-01-11 12:53:11 +00:00
Filipe
f2b14beea9 Merge pull request #8541 from jibees/8506-improve-shiped-email 
Improve shipped email design
 2022-01-11 11:36:32 +00:00
Filipe
da703b2d95 Merge pull request #8615 from jibees/8559-enable-sort-orders-by-order-full-name 
Enable sorting orders by order full name
 2022-01-11 11:27:36 +00:00
Maikel
3480c5d931 Merge pull request #8654 from Matt-Yorkley/rails-defaults 
Apply recommended framework defaults
 2022-01-11 16:12:27 +11:00
jibees
cc1e3912ad Merge pull request #8685 from openfoodfoundation/dependabot/npm_and_yarn/karma-6.3.10 
Bump karma from 6.3.9 to 6.3.10
 2022-01-10 15:23:29 +01:00
dependabot[bot]
346ec9ef1d Bump karma from 6.3.9 to 6.3.10 
Bumps [karma](https://github.com/karma-runner/karma) from 6.3.9 to 6.3.10.
- [Release notes](https://github.com/karma-runner/karma/releases)
- [Changelog](https://github.com/karma-runner/karma/blob/master/CHANGELOG.md)
- [Commits](https://github.com/karma-runner/karma/compare/v6.3.9...v6.3.10)

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

Signed-off-by: dependabot[bot] <support@github.com>
 2022-01-10 12:14:59 +00:00
Matt-Yorkley
fd4a18a838 Merge pull request #8680 from openfoodfoundation/dependabot/npm_and_yarn/jest-27.4.7 
Bump jest from 27.4.6 to 27.4.7
 2022-01-10 12:11:12 +00:00
Filipe
54c61f459e Merge pull request #8677 from filipefurtad0/add_specs_split_checkout_1 
Migrates some test scenarios from checkout_spec.rb
 2022-01-09 16:20:41 +00:00
filipefurtad0
0af025d948 Re-writes test structure, descrive vs. context 2022-01-08 17:59:04 +00:00
Matt-Yorkley
f23a12020c Merge pull request #8675 from Matt-Yorkley/dead-code-spree-js 
Remove unused JS
 2022-01-07 14:29:24 +00:00
filipefurtad0
4276be1132 Simplifies/re-writes 'before do' block 2022-01-07 13:11:27 +00:00
filipefurtad0
e2c5c08c1e Updates the spec to reflect the changes in the helper 2022-01-07 13:06:28 +00:00
filipefurtad0
2df841f637 Renames module - removes 'request' naming 2022-01-07 13:03:44 +00:00
filipefurtad0
ebbc028dda Removes split_ prefix from helper 2022-01-07 12:56:15 +00:00
filipefurtad0
9149306fc1 Moves(up)/renames SplitCheckoutHelper 2022-01-07 12:55:09 +00:00
filipefurtad0
12d1e45e06 Fixes rubocop issues 2022-01-07 12:13:15 +00:00
filipefurtad0
9685bb6ae9 Adds tests for logged-in user scenarios 2022-01-07 12:13:15 +00:00
filipefurtad0
93478d4079 Adds split-checkout helper 2022-01-07 12:13:15 +00:00
filipefurtad0
447d146365 Adds test out of stock product redirect 2022-01-07 12:13:15 +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
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