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
25,182 Commits 21 Branches 450 Tags
f00aeb006eac23a63a680e004fef84127a93ff23
Commit Graph

13663 Commits

Author SHA1 Message Date
Maikel Linke
f00aeb006e Allow enterprise users to authorize via OIDC 2022-10-18 11:32:14 +11:00
Matt-Yorkley
66c3ba3bba Remove default omniauth link 2022-10-18 11:32:14 +11:00
Matt-Yorkley
b322df8515 Generate devise links view 2022-10-18 11:32:14 +11:00
Matt-Yorkley
617164684c Configure OIDC 2022-10-18 11:32:14 +11:00
Filipe
d5c3edc8fa Merge pull request #9749 from drummer83/master 
Fix layout of 'Create a new product' button in dashboard overview
 2022-10-17 13:45:37 +01:00
Maikel
c83eb5d5dc Merge pull request #9768 from ashwini-seshadri/admin_permissions_granting_permission_to_a_shop_displays_it_in_producers_list_as_if_it_was_a_supplier 
Fix for: [Admin][Permissions] Granting permission to a shop displays it in "Producers" list as if it was a supplier #9589
 2022-10-17 09:58:03 +11:00
jibees
cd641cc5d6 Merge pull request #9714 from openfoodfoundation/dependabot/npm_and_yarn/tom-select-2.2.1 
Bump tom-select from 2.1.0 to 2.2.1
 2022-10-13 11:30:13 +02:00
Ashwini Seshadri
1596649034 Merge branch 'master' into admin_permissions_granting_permission_to_a_shop_displays_it_in_producers_list_as_if_it_was_a_supplier 2022-10-13 06:48:40 +02:00
Maikel
d33cdd1327 Merge pull request #9706 from jibees/9625-create-a-component-to-display-hide-columns-for-report 
Create a component to display/hide columns for report
 2022-10-13 10:05:27 +11:00
Jean-Baptiste Bellet
14a258c661 Attempt: externalize ofn-drop-down-v2 selector 
+ add class `redesigned-checkbox` on `input`

Move `input.redesigned-input` definition outside dropdown definition

--> more generic
 2022-10-12 09:28:50 +02:00
Maikel Linke
46fde6bd40 Remove now unused scope 2022-10-12 16:48:32 +11:00
Ashwini Seshadri
590a09f069 Fixed the permissions relationship, so the shop displays only suppliers and does not display distributors in producers list 
and updated relevant tests
 2022-10-12 16:48:31 +11:00
Rachel Arnould
617a417dc2 Merge pull request #9506 from binarygit/remove-angular-from-payment-methods 
Remove angular from payment methods
 2022-10-11 13:13:26 +02:00
Jean-Baptiste Bellet
8a6874326a selected could be nil if no columns are selected 2022-10-11 10:05:06 +02:00
Jean-Baptiste Bellet
68de510c4e Redesign checkboxes 2022-10-11 10:05:06 +02:00
Jean-Baptiste Bellet
230afd5024 Update multiple_checked_select_component.html.haml 2022-10-11 10:05:06 +02:00
Jean-Baptiste Bellet
41e696282c Don't build inputs, but directly use input checkbox for each option 
way simpler this way.
 2022-10-11 10:05:06 +02:00
Jean-Baptiste Bellet
e655d5b188 Remove useless id attribute. Prefer to use data-value directly. 2022-10-11 10:05:06 +02:00
Jean-Baptiste Bellet
7d15baef9d Do not use a variable filter_placeholder but translate it in the view 2022-10-11 10:05:06 +02:00
Jean-Baptiste Bellet
312f2544dd Be sure that option key is a Symbol (it could be a String) 2022-10-11 10:05:06 +02:00
Jean-Baptiste Bellet
157bdd9f3d Add a vertical scrolling 2022-10-11 10:05:06 +02:00
Jean-Baptiste Bellet
b4e041c7e9 Implements the ofn-drop-down-v2 design 2022-10-11 10:05:06 +02:00
Jean-Baptiste Bellet
23e2d28488 Implements the filter options feature 2022-10-11 10:05:06 +02:00
Jean-Baptiste Bellet
0f9ebfe34a Use the MultipleCheckedSelectComponent 2022-10-11 10:05:06 +02:00
Jean-Baptiste Bellet
b7adc5f551 Create the MultipleCheckedComponent 
+ Associate the StimulusController to this component
 2022-10-11 10:05:06 +02:00
Maikel
4705d306b5 Merge pull request #9730 from AthiraKadampatta/9726-unused-paperclip-columns-ignored-list 
Ignore paperclip columns to prepare for deletion
 2022-10-11 11:44:42 +11:00
Jean-Baptiste Bellet
1f329e85bc Also include plugins 2022-10-10 17:15:46 +02:00
AthiraKadampatta
b2c778794d 9726 Remove safe navigation operator and simplify call to attachment file name 2022-10-10 16:52:02 +02:00
AthiraKadampatta
80eef9c302 9726 Add attachment_width and attachment_height to the list of ignored columns for spree images 2022-10-10 16:52:02 +02:00
AthiraKadampatta
f40b569a4a 9726 Use active storage filename instead of attachment_file_name of paperclip 2022-10-10 16:52:02 +02:00
AthiraKadampatta
1f161bee1f Add paperclip columns to ignored columns list for enterprise, enterprise group, terms_of_service_file, spree/image models 2022-10-10 16:52:02 +02:00
Jean-Baptiste Bellet
4140e3d153 Import tom-select file directly 
can't use "tom-select" anymore, due to a mis-configuration with babel I guess
 2022-10-10 16:10:33 +02:00
Manish Sharma
cd71233163 Fixed duplicates enterprises in order cycles 2022-10-10 14:30:58 +05:30
Maikel
82e38d7b91 Merge pull request #9526 from jibees/6730-use-a-date-range-picker 
Admin, List of Orders & Orders Bulk Management pages: use a date range picker
 2022-10-10 13:59:37 +11:00
Maikel
5894246474 Merge pull request #9682 from binarygit/picked_up_email 
Send picked up emails when orders are picked up
 2022-10-10 13:15:24 +11:00
Maikel
058a45f4e5 Merge pull request #9442 from jibees/8904-display-fees-name-instead-of-type-on-invoices 
Display fees name instead of type on invoices
 2022-10-10 13:15:01 +11:00
Maikel
e5ccee42cc Merge pull request #9725 from vsmay98/9468-hide-all-references-hub-from-producers-profile 
[Shopfront] Hide hub with "hide all references" setup in producers profiles
 2022-10-10 13:11:49 +11:00
Maikel
38f145549a Merge pull request #9741 from mkllnk/empty-variant-param 
Avoid error when sending empty variant attributes in bulk product edit
 2022-10-10 11:43:10 +11:00
Jean-Baptiste Bellet
f5ebc797c4 Send change event on flatpickr widget close 2022-10-08 16:36:26 +02:00
Jean-Baptiste Bellet
ea76615763 Forward focus event on calendar open 2022-10-08 16:36:26 +02:00
Jean-Baptiste Bellet
e076e23064 Do not use ng-change on endDate but instead watch both start and end date 2022-10-08 16:36:26 +02:00
Jean-Baptiste Bellet
6ec3e7ee0c Only send event change on valid range (ie. both start and end date) 
+ do not refresh data on start date change but only on end date change
 2022-10-08 16:36:26 +02:00
Jean-Baptiste Bellet
ec4d091c2e Remove the or label as it was unecessary 
and actually, untranslated
 2022-10-08 16:36:26 +02:00
Jean-Baptiste Bellet
eec117e769 Implements daterangepicker for /admin/orders/bulk_management 
+ update specs as well
 2022-10-08 16:36:26 +02:00
Jean-Baptiste Bellet
73f55ae776 Implements daterangepicker for /admin/orders 
+ update specs as well
 2022-10-08 16:36:26 +02:00
Jean-Baptiste Bellet
19584ce6e0 flatpickr controller is now ready to be used in range mode 2022-10-08 16:36:26 +02:00
Jean-Baptiste Bellet
8942d3d17b Clear date on custom event flatpickr_clear 2022-10-08 16:36:26 +02:00
Jean-Baptiste Bellet
ddfbcacd83 Include plugins 2022-10-08 16:36:26 +02:00
Jean-Baptiste Bellet
c3a7acf9ad import locale 2022-10-08 16:36:26 +02:00
Jean-Baptiste Bellet
fb0d922d73 Remove datetimepicker directive + default values 2022-10-08 16:36:26 +02:00