raggedstaff/openfoodnetwork
1
0
Fork 0
mirror of https://github.com/openfoodfoundation/openfoodnetwork synced 2026-02-13 23:37:47 +00:00
Code Issues Packages Projects Releases Wiki Activity
29,411 Commits 19 Branches 453 Tags
e6e2f27ed4eecab2358aefca1ee4d7578954503a
Commit Graph

29411 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Maikel
e6e2f27ed4 Merge pull request #11736 from dacook/registration-noindex 
Print robots tag for registration layout
 2023-11-01 13:53:07 +11:00
Maikel
fb732e55bc Merge pull request #11734 from openfoodfoundation/dependabot/bundler/angular-rails-templates-1.2.1 
chore(deps): bump angular-rails-templates from 1.2.0 to 1.2.1
 2023-11-01 13:46:32 +11:00
Maikel
8f4f691cb2 Merge pull request #11735 from openfoodfoundation/dependabot/bundler/rubocop-rails-2.22.1 
chore(deps-dev): bump rubocop-rails from 2.21.2 to 2.22.1
 2023-11-01 13:40:52 +11:00
Maikel
25a3149f48 Merge pull request #11702 from dacook/buu-editing-part5b-11059 
[BUU] Mark changed fields, when error
 2023-11-01 13:01:08 +11:00
Maikel
ddd410ceb5 Merge pull request #11729 from openfoodfoundation/dependabot/npm_and_yarn/browserify-sign-4.2.2 
chore(deps): bump browserify-sign from 4.2.1 to 4.2.2
 2023-11-01 12:50:20 +11:00
Maikel
e85a1cef7e Merge pull request #11708 from abdellani/test-redis-5 
replace hiredis gem with hiredis-client
 2023-11-01 10:02:25 +11:00
David Cook
18b79668a5 Merge pull request #11727 from openfoodfoundation/dependabot/bundler/valid_email2-5.1.1 
chore(deps): bump valid_email2 from 5.1.0 to 5.1.1
 2023-10-31 14:32:44 +11:00
David Cook
d79c5c39cf Merge pull request #11723 from openfoodfoundation/dependabot/bundler/rubocop-1.57.2 
chore(deps-dev): bump rubocop from 1.57.1 to 1.57.2
 2023-10-31 14:31:01 +11:00
David Cook
1d96747570 Merge pull request #11716 from openfoodfoundation/dependabot/bundler/active_storage_validations-1.1.1 
chore(deps): bump active_storage_validations from 1.0.4 to 1.1.1
 2023-10-31 14:29:42 +11:00
David Cook
435bf6e6b0 Print robots tag for registration layout 
This is copied from the darkswarm layout.
 2023-10-31 14:03:32 +11:00
dependabot[bot]
c27f616ac0 chore(deps-dev): bump rubocop-rails from 2.21.2 to 2.22.1 
Bumps [rubocop-rails](https://github.com/rubocop/rubocop-rails) from 2.21.2 to 2.22.1.
- [Release notes](https://github.com/rubocop/rubocop-rails/releases)
- [Changelog](https://github.com/rubocop/rubocop-rails/blob/master/CHANGELOG.md)
- [Commits](https://github.com/rubocop/rubocop-rails/compare/v2.21.2...v2.22.1)

---
updated-dependencies:
- dependency-name: rubocop-rails
  dependency-type: direct:development
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
 2023-10-30 09:10:27 +00:00
dependabot[bot]
16ff608e33 chore(deps): bump angular-rails-templates from 1.2.0 to 1.2.1 
Bumps [angular-rails-templates](https://github.com/pitr/angular-rails-templates) from 1.2.0 to 1.2.1.
- [Release notes](https://github.com/pitr/angular-rails-templates/releases)
- [Changelog](https://github.com/pitr/angular-rails-templates/blob/master/CHANGELOG.md)
- [Commits](https://github.com/pitr/angular-rails-templates/compare/v1.2.0...v1.2.1)

---
updated-dependencies:
- dependency-name: angular-rails-templates
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
 2023-10-30 09:08:50 +00:00
Maikel Linke
7f7f6f5c96 Remove unneeded require of hiredis-client 2023-10-30 16:28:18 +11:00
dependabot[bot]
743a5e1a3c chore(deps): bump browserify-sign from 4.2.1 to 4.2.2 
Bumps [browserify-sign](https://github.com/crypto-browserify/browserify-sign) from 4.2.1 to 4.2.2.
- [Changelog](https://github.com/browserify/browserify-sign/blob/main/CHANGELOG.md)
- [Commits](https://github.com/crypto-browserify/browserify-sign/compare/v4.2.1...v4.2.2)

---
updated-dependencies:
- dependency-name: browserify-sign
  dependency-type: indirect
...

Signed-off-by: dependabot[bot] <support@github.com>
 2023-10-27 16:23:32 +00:00
dependabot[bot]
255872ebe3 chore(deps): bump valid_email2 from 5.1.0 to 5.1.1 
Bumps [valid_email2](https://github.com/micke/valid_email2) from 5.1.0 to 5.1.1.
- [Changelog](https://github.com/micke/valid_email2/blob/master/CHANGELOG.md)
- [Commits](https://github.com/micke/valid_email2/compare/v5.1.0...v5.1.1)

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

Signed-off-by: dependabot[bot] <support@github.com>
 2023-10-27 09:45:13 +00:00
Gaetan Craig-Riou
4f961098c4 Update all locales with the latest Transifex translations v4.4.17 2023-10-27 11:36:13 +11:00
Filipe
f1d4ec9fe7 Merge pull request #11684 from ccozkan/issue-11609 
Fix content aligning in subscriptions table
 2023-10-26 16:20:33 +01:00
Filipe
aa9cacada8 Merge pull request #11676 from openfoodfoundation/dependabot/bundler/stripe-10.0.0 
chore(deps): bump stripe from 9.4.0 to 10.0.0
 2023-10-26 15:41:49 +01:00
dependabot[bot]
0919b2bc6c chore(deps-dev): bump rubocop from 1.57.1 to 1.57.2 
Bumps [rubocop](https://github.com/rubocop/rubocop) from 1.57.1 to 1.57.2.
- [Release notes](https://github.com/rubocop/rubocop/releases)
- [Changelog](https://github.com/rubocop/rubocop/blob/master/CHANGELOG.md)
- [Commits](https://github.com/rubocop/rubocop/compare/v1.57.1...v1.57.2)

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

Signed-off-by: dependabot[bot] <support@github.com>
 2023-10-26 12:57:54 +00:00
Filipe
a54de4b522 Merge pull request #11691 from openfoodfoundation/dependabot/bundler/combine_pdf-1.0.24 
chore(deps): bump combine_pdf from 1.0.23 to 1.0.24
 2023-10-26 13:56:44 +01:00
Filipe
b67acaae21 Merge pull request #11694 from prateek0411999/bugfix/11666-warning_forfeit_remaining_amount 
add condition on warning_forfeit_remaining_amount note
 2023-10-26 13:44:22 +01:00
Filipe
3da8341946 Merge pull request #11695 from ccozkan/issue-8943 
Make update button on enterprises primary details form clickable upon input to name field
 2023-10-26 13:12:27 +01:00
Filipe
7b3c6e9f58 Merge pull request #11688 from mkllnk/enterprise-fee-report 
Avoid error when generating Enterprise fees w/ Tax Report by Producer
 2023-10-26 12:43:19 +01:00
Mohamed ABDELLANI
d6890e9828 check key class before call Rails.cache.delete 2023-10-26 10:27:00 +01:00
dependabot[bot]
38485a8010 chore(deps): bump active_storage_validations from 1.0.4 to 1.1.1 
Bumps [active_storage_validations](https://github.com/igorkasyanchuk/active_storage_validations) from 1.0.4 to 1.1.1.
- [Release notes](https://github.com/igorkasyanchuk/active_storage_validations/releases)
- [Changelog](https://github.com/igorkasyanchuk/active_storage_validations/blob/master/CHANGES.md)
- [Commits](https://github.com/igorkasyanchuk/active_storage_validations/compare/1.0.4...1.1.1)

---
updated-dependencies:
- dependency-name: active_storage_validations
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
 2023-10-26 09:25:54 +00:00
Mohamed ABDELLANI
5360df6cee replace hiredis gem with hiredis-client 2023-10-26 10:10:51 +01:00
David Cook
ed520ea679 Merge pull request #11703 from abdellani/remove-mini-portile2 
removes mini_portile2
 2023-10-26 09:40:38 +11:00
David Cook
7195314dc6 Merge pull request #11697 from openfoodfoundation/dependabot/bundler/mini_portile2-2.8.5 
chore(deps): bump mini_portile2 from 2.8.4 to 2.8.5
 2023-10-26 09:23:06 +11:00
Çağrı Özkan
924cee0876 Trigger build (empty commit) 2023-10-25 18:21:39 +03:00
Çağrı Özkan
7b21126a9c Use both onchange and oninput on ng_form.html.haml 2023-10-25 17:32:25 +03:00
Filipe
6280bfcebe Merge pull request #11706 from yasirazgar/11318_flaky_packing_report_spec 
11318 - Fix flaky packing_report_spec.rb
 2023-10-25 15:22:04 +01:00
Çağrı Özkan
38d1de896c Use oninput on ng_form.html.haml instead of onchange 2023-10-25 17:11:30 +03:00
dependabot[bot]
8fc4d6cd4d chore(deps): bump mini_portile2 from 2.8.4 to 2.8.5 
Bumps [mini_portile2](https://github.com/flavorjones/mini_portile) from 2.8.4 to 2.8.5.
- [Release notes](https://github.com/flavorjones/mini_portile/releases)
- [Changelog](https://github.com/flavorjones/mini_portile/blob/main/CHANGELOG.md)
- [Commits](https://github.com/flavorjones/mini_portile/compare/v2.8.4...v2.8.5)

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

Signed-off-by: dependabot[bot] <support@github.com>
 2023-10-25 08:20:25 +00:00
Mohamed ABDELLANI
d77a94d377 add comment about mini_protile2 gem 2023-10-25 09:17:21 +01:00
David Cook
fac354e678 Merge pull request #11700 from macanudo527/fix_stylehash_12 
Fix Style/HashSyntax 13/13
 2023-10-25 10:40:52 +11:00
yasir azgar
3ba208e3d3 11318 - fix flaky packing_report_spec 
fix rubocop DurationArithmetic
 2023-10-24 22:21:42 +05:30
David Cook
08ac46fd91 Refactor spec: Only create necessary records 
This was creating a lot of records for every single test. Now it's much more efficient and spec conditions are clearer.
 2023-10-24 16:44:34 +11:00
David Cook
671dc570ec Refactor: with form builder 2023-10-24 15:21:14 +11:00
David Cook
aa4630d74c Mark fields as changed if they contain unsaved values. 
This can happen when there's a validation error. The field with error will also be marked changed, but the error style will override it.

I'd like to move this into a FormBuilder. Existing formbuilder gems don't seem to support it (though I didn't look very hard).
 2023-10-24 15:21:14 +11:00
David Cook
04032e61e2 Prettier 2023-10-24 15:21:13 +11:00
David Cook
fdad45bb46 Rename 'modified' state to 'changed' 
This conveniently matches the terminology used in both JavaScript and ActiveModel::Dirty.
 2023-10-24 15:21:13 +11:00
David Cook
ceb9d9af92 Add comment 
I decided to look into why this is so complicated, in case some of the complexity can be removed. It can't :(
 2023-10-24 15:21:13 +11:00
David Cook
1534908895 Move generic method to base class 
Because rubocop complained about the size of ProductSet.
 2023-10-24 15:21:13 +11:00
David Cook
89e53c88f3 Move context up a level 
Best viewed with whitespace ignored.
 2023-10-24 15:21:13 +11:00
David Cook
8293f24ed3 Remove redundant context 
Best viewed with whitespace ignored.
 2023-10-24 15:21:13 +11:00
David Cook
224b6f514b Remove concept of master variant 
from old bulk product screen. Hmm I just realised we're deleting that screen soon anyway.

But this helps clean up the spec before I refactor it further.
 2023-10-24 15:21:13 +11:00
David Cook
be6481dac3 Refactor spec: combine expectations 
These expectations have the same conditions, so why set it up three times?
 2023-10-24 15:21:13 +11:00
David Cook
3710aa2149 Refactor spec 
Better to explicitly test for the change, and specify expected values.
 2023-10-24 15:21:13 +11:00
Neal Chambers
cf072fb56f Update .rubocop_todo.yml 2023-10-24 08:49:48 +09:00
Neal Chambers
dc607b654d Fix Style/HashSyntax 2023-10-24 08:49:34 +09:00