raggedstaff/openfoodnetwork
1
0
Fork 0
mirror of https://github.com/openfoodfoundation/openfoodnetwork synced 2026-03-11 03:40:20 +00:00
Code Issues Packages Projects Releases Wiki Activity
28,936 Commits 16 Branches 456 Tags
5df211137e8583fc47ebcce3e643b86be164f389
Commit Graph

15240 Commits

Author SHA1 Message Date
Jean-Baptiste Bellet
5df211137e Tweak stimulus pagination (used on orders) to be up to date 2023-09-15 10:47:43 +02:00
Jean-Baptiste Bellet
f2941f9275 form legend are red 2023-09-15 10:47:43 +02:00
Jean-Baptiste Bellet
1b9a7aa81e Adjust height, border and background colors for inputs 2023-09-15 10:47:43 +02:00
Jean-Baptiste Bellet
98f9303c99 Tweak colors, size, ... for select2 to looks like tom-select 
One day, we'll remplace select2 by tom-select
 2023-09-15 10:47:43 +02:00
Jean-Baptiste Bellet
e5086ce057 Adjust colors for select2 and remove useless ones 2023-09-15 10:47:43 +02:00
Jean-Baptiste Bellet
3a67f5c9d7 Integrate select2 to admin_v3 2023-09-15 10:47:43 +02:00
Jean-Baptiste Bellet
b8406be4b9 Add trix editor to admin_v3 css 
That was an omission when installing trix
 2023-09-15 10:47:43 +02:00
Jean-Baptiste Bellet
03d5f8acc4 No need to specify padding when having a line height 2023-09-15 10:47:43 +02:00
Jean-Baptiste Bellet
48f1c65a91 Include dashboard_item into admin_v3 2023-09-15 10:47:43 +02:00
Neal Chambers
bf9db13bb3 Fix Style/HashSyntax 2023-09-14 16:25:49 +09:00
David Cook
0966864589 Merge pull request #11511 from dacook/fix-update-button-11349 
Fix Update button sizing
 2023-09-14 13:37:19 +10:00
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
Maikel
758c6e033f Merge pull request #11533 from macanudo527/fix_stylehash_2 
Fix Style/HashSyntax 3/13
 2023-09-14 09:04:03 +10:00
Konrad
c36c5be2c9 Merge pull request #11497 from Matt-Yorkley/import-tax-category 
Fix error when importing entries with a tax category
 2023-09-13 23:28:16 +02:00
Mohamed ABDELLANI
ee7668e713 implement enterprise fee report filters 
squash Reformat/Refactor spec
 2023-09-13 19:09:55 +02:00
Filipe
0f47ec0094 Merge pull request #11525 from jibees/11524-enlarged-unit-price-tooltip-image-on-variant-edit-page 
BUU: Fix question mark icon for tooltip
 2023-09-13 16:52:15 +01:00
Filipe
dae05e31ab Merge pull request #11501 from jibees/9146-improve-user-feedback-in-oc-edit-page-for-hidden-inventory 
Improve user feedback in oc edit page for hidden inventory
 2023-09-13 16:26:39 +01:00
Neal Chambers
ed06edda3f Fix Style/HashSyntax 2023-09-13 16:45:00 +09:00
Neal Chambers
4ffd3759cc Fix Style/HashSyntax 2023-09-12 23:19:05 +09:00
Jean-Baptiste Bellet
ff8b9465c7 Display info on outgoing products panel when some variants hidden 2023-09-12 10:20:26 +02:00
Jean-Baptiste Bellet
ff7629ba2c Display information on outgoing product when variant aren't available 
Update en.yml
 2023-09-12 10:20:26 +02:00
Jean-Baptiste Bellet
edc6ac801d Use the right colors for the question mark icon tooltip in admin style v3 2023-09-11 15:44:08 +02:00
Jean-Baptiste Bellet
75751f07b8 Move question-mark-icon into admin_style_v3 context 2023-09-11 15:31:30 +02:00
Jean-Baptiste Bellet
99ea4a63e0 No need to have a button: not conflicting with button styles 2023-09-11 15:29:09 +02:00
Neal Chambers
416d6e538a Fix Style/HashSyntax 2023-09-09 09:00:38 +09:00
Matt-Yorkley
839e580878 Fix error when importing entries with a tax category 2023-09-08 19:24:50 +01:00
Gaetan Craig-Riou
8face3d182 Merge pull request #11488 from macanudo527/fix_helperinstancevariable_2 
Fix Rails/HelperInstanceVariable 2
 2023-09-08 19:51:39 +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
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
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
Neal Chambers
2da9ffd3cb Delete Unused Helper Functions 2023-09-06 22:36:51 +09:00
Neal Chambers
b1e40ed605 Fix Rails/HelperInstanceVariable 2023-09-06 22:36:46 +09: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
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
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