raggedstaff/openfoodnetwork
1
0
Fork 0
mirror of https://github.com/openfoodfoundation/openfoodnetwork synced 2026-04-04 07:09:14 +00:00
Code Issues Packages Projects Releases Wiki Activity
28,810 Commits 19 Branches 460 Tags
2e6e083667a5beaa532961dc20a6e94f51dd1ffd
Commit Graph

28810 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
David Cook
2e6e083667 [fixup] Fix Update button sizing 
By disabling line wrap we can consistently predict how it will appear. The longest translation we currently have is 14 characters so this should be fine.
 2023-09-14 09:37:10 +10:00
David Cook
99da60921f Fix Update button sizing 
This was broken when upgrading [Foundation](https://github.com/openfoodfoundation/openfoodnetwork/pull/11349). For some reason the button.expand class now sets larger font size and padding, which overrides the button.small class. It's probably a bug but we'll have to work around it.
 2023-09-08 10:20:26 +10:00
Maikel
1991970185 Merge pull request #11377 from mkllnk/dfc-update-request 
[DFC API] Import known units when creating new products
 2023-09-08 09:05:26 +10:00
Filipe
b64c1c2675 Merge pull request #11349 from dacook/foundation-sites-5.5.3 
chore(deps): bump foundation-sites from 5.5.2 to 5.5.3
 2023-09-07 18:33:43 +01:00
Filipe
ccabf5936d Merge pull request #11505 from drummer83/master 
[Super admin] Highlight 'Configuration' tab on 'Terms of Service' page
 2023-09-07 18:00:18 +01:00
Konrad
ea622cd2d7 Merge pull request #11487 from pedrocarmona/feature/invitation-email-locale 
Send translated email when creating users via super admin interface
 2023-09-07 16:41:59 +02:00
David Cook
ab5e16effb chore(deps): bump foundation-sites from 5.5.2 to 5.5.3 
Better 7 years late than never...

This resolves CWE-79: https://security.snyk.io/vuln/npm:foundation-sites:20150619
 2023-09-07 11:45:37 +10:00
drummer83
a7ddf99ee4 Fix typo 2023-09-06 23:20:12 +02:00
drummer83
13d5b954e6 Add 'Terms of Service' to the tabs 2023-09-06 23:18:00 +02:00
Konrad
3b9ebf4e07 Merge pull request #11396 from abdellani/fix-if-tos-is-not-set 
fix If ToS file is not set, customer needs to accept Terms on each checkout
 2023-09-06 16:56:21 +02:00
jibees
d8f4f58c77 Merge pull request #11499 from openfoodfoundation/dependabot/bundler/web-console-4.2.1 
chore(deps-dev): bump web-console from 4.2.0 to 4.2.1
 2023-09-06 08:52:58 +02:00
dependabot[bot]
954e080cbf chore(deps-dev): bump web-console from 4.2.0 to 4.2.1 
Bumps [web-console](https://github.com/rails/web-console) from 4.2.0 to 4.2.1.
- [Release notes](https://github.com/rails/web-console/releases)
- [Changelog](https://github.com/rails/web-console/blob/main/CHANGELOG.markdown)
- [Commits](https://github.com/rails/web-console/compare/v4.2.0...v4.2.1)

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

Signed-off-by: dependabot[bot] <support@github.com>
 2023-09-06 01:44:08 +00:00
David Cook
aaa3bebb93 Merge pull request #11495 from openfoodfoundation/dependabot/bundler/valid_email2-5.0.0 
chore(deps): bump valid_email2 from 4.0.6 to 5.0.0
 2023-09-06 11:39:26 +10:00
dependabot[bot]
3405865c0f chore(deps): bump valid_email2 from 4.0.6 to 5.0.0 
Bumps [valid_email2](https://github.com/micke/valid_email2) from 4.0.6 to 5.0.0.
- [Changelog](https://github.com/micke/valid_email2/blob/master/CHANGELOG.md)
- [Commits](https://github.com/micke/valid_email2/compare/v4.0.6...v5.0.0)

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

Signed-off-by: dependabot[bot] <support@github.com>
 2023-09-05 09:48:34 +00:00
David Cook
a096c56658 Merge pull request #11484 from openfoodfoundation/mkllnk-patch-1 
Add release note category "API changes"
 2023-09-05 13:29:55 +10:00
Maikel Linke
997c8a49ca Combine system specs for efficiency 2023-09-05 10:51:38 +10:00
Pedro Carmona
51050036d4 Use instance default locale as the default locale for a new user 2023-09-05 01:00:35 +01:00
Pedro Carmona
c4830e3baa Send localized email when creating users via admin interface 
Based on the current user locale
 2023-09-05 01:00:35 +01:00
David Cook
0874c7ddb8 Merge pull request #11309 from filipefurtad0/legal_invoices_spec_comparator 
[Invoices] Adds unit level test coverage order model attributes
 2023-09-05 09:45:00 +10:00
Maikel
b1a88ab7a9 Merge pull request #11490 from mkllnk/sample-data-validation 
Skip online validation of sample emails
 2023-09-05 09:28:16 +10:00
Konrad
c50a3b4f86 Merge pull request #11489 from mkllnk/order_cycle_schedule 
Require associations on join model
 2023-09-04 21:37:30 +02:00
Konrad
fd6f2338e5 Merge pull request #11450 from mkllnk/feature-toggle-enterprise 
Activate vouchers feature per user or enterprise
 2023-09-04 21:30:41 +02:00
filipefurtad0
82ca115931 Removes unnecessary && operator 
reloads instead of saving order again
 2023-09-04 19:35:28 +01:00
filipefurtad0
4e54279b05 Rearranges relevant and non-relevant test cases 2023-09-04 19:32:06 +01:00
Konrad
406577ed2a Merge pull request #11140 from jibees/11129-add-trix-editor-to-product-description-editor 
Admin, add trix editor to product description editor (both new and edit)
 2023-09-04 20:22:14 +02:00
Gaetan Craig-Riou
08c131680d Merge pull request #11471 from mkllnk/variant-supplier 
[DFC API] Replace service class with simple AR association
 2023-09-04 23:59:37 +10:00
Jean-Baptiste Bellet
b6b64e9439 Add trix editor to new product form 2023-09-04 15:46:54 +02:00
Jean-Baptiste Bellet
1d5d1c5405 Include trix-styles mixin in where content from trix is displayed 2023-09-04 15:46:54 +02:00
Jean-Baptiste Bellet
34dab4003d Create a mixin that include list of styles for trix editor + content 
Will be used elsewhere (in shopfront in particular)
 2023-09-04 15:46:54 +02:00
Jean-Baptiste Bellet
c402093081 Special case for unordered list in trix editor: should be overwritten 2023-09-04 15:46:54 +02:00
Jean-Baptiste Bellet
ca6d12e8ed Actually, used in the shopfront context, links are orange 2023-09-04 15:46:54 +02:00
Jean-Baptiste Bellet
3225c52898 Actually, this should not be sanitize before going through trix editor 2023-09-04 15:46:54 +02:00
Jean-Baptiste Bellet
a8a35318f5 Add horizontal rule to trix editor 2023-09-04 15:46:54 +02:00
Jean-Baptiste Bellet
4c27e79519 Sanitize content when display it on shop 
Use the TrixSanitizer | TrixScrubber
 2023-09-04 15:46:54 +02:00
Jean-Baptiste Bellet
f9bc00e5cd We used to use <p> to seperate block between them. now use <div> 
trix doesn't allow the use of `<p>` as block separator since it can not contain `<figure>`: use `<div>` and _emulate_ as `<p>` with margin bottom
 2023-09-04 15:46:54 +02:00
Jean-Baptiste Bellet
b6e047086a Update trixEditor rendering <a /> element: should be green 2023-09-04 15:46:54 +02:00
Jean-Baptiste Bellet
e200eccc42 Replace angular editor by trix editor 2023-09-04 15:46:54 +02:00
Gaetan Craig-Riou
50693dd5d2 Merge pull request #11468 from dacook/buu-editing-part2-11059 
[BUU] Editing - part 2 (product and variant text fields) 🚧
 2023-09-04 23:41:44 +10:00
Gaetan Craig-Riou
db52b29b8f Merge pull request #11476 from macanudo527/fix_rails_helperinstancevariable 
Fix Rails/HelperInstanceVariable in injection_helper.rb
 2023-09-04 22:30:14 +10:00
Maikel Linke
ae63a50719 Skip online validation of sample emails 2023-09-04 17:15:52 +10:00
Maikel Linke
38869cba2f Require associations on join model 
It's actually required in the database already. This just simplifies the
code.
 2023-09-04 17:07:07 +10:00
Maikel
8b9425a206 Merge pull request #11486 from openfoodfoundation/dependabot/bundler/activerecord-session_store-2.1.0 
chore(deps): bump activerecord-session_store from 2.0.0 to 2.1.0
 2023-09-04 13:16:11 +10:00
Maikel
2d090042a3 Merge pull request #11485 from openfoodfoundation/dependabot/bundler/stripe-9.1.0 
chore(deps): bump stripe from 9.0.0 to 9.1.0
 2023-09-04 12:49:26 +10:00
Maikel
4f981417a9 Merge pull request #11477 from mkllnk/flaky-enterprise-fee 
Stabilise flaky enterprise fee spec
 2023-09-04 12:45:46 +10:00
dependabot[bot]
8bd749301e chore(deps): bump activerecord-session_store from 2.0.0 to 2.1.0 
Bumps [activerecord-session_store](https://github.com/rails/activerecord-session_store) from 2.0.0 to 2.1.0.
- [Release notes](https://github.com/rails/activerecord-session_store/releases)
- [Commits](https://github.com/rails/activerecord-session_store/compare/v2.0.0...v2.1.0)

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

Signed-off-by: dependabot[bot] <support@github.com>
 2023-09-01 09:28:13 +00:00
dependabot[bot]
34fa41dac2 chore(deps): bump stripe from 9.0.0 to 9.1.0 
Bumps [stripe](https://github.com/stripe/stripe-ruby) from 9.0.0 to 9.1.0.
- [Release notes](https://github.com/stripe/stripe-ruby/releases)
- [Changelog](https://github.com/stripe/stripe-ruby/blob/master/CHANGELOG.md)
- [Commits](https://github.com/stripe/stripe-ruby/compare/v9.0.0...v9.1.0)

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

Signed-off-by: dependabot[bot] <support@github.com>
 2023-09-01 09:26:36 +00:00
Maikel
f27ecb6bcd Add release note category "API changes" 
[skip ci]
 2023-09-01 14:14:47 +10:00
Maikel
bcfc15f102 Enable copy of translation update commands 
The added `code` tag makes Github add the copy button.
 2023-09-01 13:53:20 +10:00
Maikel Linke
ee3fe08378 Update all locales with the latest Transifex translations v4.4.10 2023-09-01 13:51:29 +10:00
David Cook
441b9febc8 Merge pull request #11454 from macanudo527/fix_rubocop_8 
Fix Rubocop Style Errors
 2023-09-01 13:22:38 +10:00