raggedstaff/openfoodnetwork
1
0
Fork 0
mirror of https://github.com/openfoodfoundation/openfoodnetwork synced 2026-02-22 00:57:26 +00:00
Code Issues Packages Projects Releases Wiki Activity
25,213 Commits 19 Branches 454 Tags
167ce0e53ca92a368bf6d9b44c76e90f42bfd3ea
Commit Graph

25213 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Maikel Linke
167ce0e53c Expect report rows in random order 
It's not deterministic which variant is shown first and therefore this
spec would fail from time to time.
 2022-10-24 15:40:35 +11:00
Maikel
627b8af37b Merge pull request #9828 from mkllnk/authorize-api-key 
Prevent users from changing API keys for others
 2022-10-24 11:22:35 +11:00
Jean-Baptiste Bellet
5a1d9013c6 Update all locales with the latest Transifex translations v4.2.18 2022-10-20 23:12:32 +02:00
jibees
3a68e237de Merge pull request #9772 from mkllnk/revenue-report-for-au 
Add more fields to revenue report as used by Aus
 2022-10-20 23:10:17 +02:00
jibees
48e18b016a Merge pull request #9756 from vsmay98/8249-fix-snail-for-all-shipping-method-fee 
Fix snail issue for all shipping method fees
 2022-10-20 17:31:24 +02:00
jibees
da851079f4 Merge pull request #9776 from abdellani/product-creation-minor-improvements 
Product creation minor improvements
 2022-10-20 17:30:47 +02:00
jibees
1d265d19ce Merge pull request #8872 from Matt-Yorkley/bugsnag-data 
Update Bugsnag error data
 2022-10-20 17:30:14 +02:00
jibees
9e4bd23332 Merge pull request #9738 from AthiraKadampatta/9726-remove-unused-paperclip-columns 
Delete unused paperclip columns.
 2022-10-20 17:29:44 +02:00
jibees
fdc362cb44 Merge pull request #9806 from mkllnk/feature-constraint 
Generalise feature toggle constraint
 2022-10-20 17:27:46 +02:00
jibees
2455ecabde Merge pull request #9758 from openfoodfoundation/dependabot/bundler/activerecord-import-1.4.1 
Bump activerecord-import from 1.4.0 to 1.4.1
 2022-10-20 15:44:42 +02:00
Konrad
71037022ec Merge pull request #9816 from viniciusueharaweb/9703-product-description-should-have-a-pointer-cursor 
Add pointer cursor when hovering a clickable product description
 2022-10-20 10:38:46 +02:00
jibees
2b7b83ba37 Merge pull request #9826 from filipefurtad0/fix_flaky_spec_bom_9824 
Clarifies contexts, cleans-up spec DRY
 2022-10-20 09:55:33 +02:00
Maikel Linke
fc79612f26 Prevent users from changing API keys for others 
It was checking for the permission to create a user which everyone can
do. Now it's checking for updating that particular user and doesn't
allow generating new keys for other users any more.

This would have been an inconvenience but not a big security issue
because you can't view the key of another user.
 2022-10-20 17:56:46 +11:00
filipefurtad0
c4de247dd9 Clarifies contexts, cleans-up spec DRY 2022-10-19 16:56:04 +01:00
jibees
7b96a1fb5b Merge pull request #9815 from mkllnk/bulk-product-spec 
Stabilise spec by waiting for JS
 2022-10-19 09:50:55 +02:00
Matt-Yorkley
0ca86344d2 Update use of deprecated #add_tab method to #add_metadata 2022-10-19 17:36:53 +11:00
Matt-Yorkley
980f004b83 Update Bugsnag error data 2022-10-19 17:36:52 +11:00
Maikel
3d26b76d17 Merge pull request #9814 from filipefurtad0/fix_flaky_spec_bom_9809 
Replaces js select2 methods by find/click methods
 2022-10-19 14:41:55 +11:00
Vinicius Uehara
7772c01e16 Add pointer cursor when hovering a clickable product description 2022-10-18 23:11:56 -03:00
Maikel Linke
04921aeed4 Stabilise spec by waiting for JS 2022-10-19 09:59:51 +11:00
filipefurtad0
c71c5054e0 Replaces js select2 methods by find/click methods 2022-10-18 21:27:52 +01:00
Filipe
4015413d1d Merge pull request #9813 from filipefurtad0/fix_flaky_spec_bom 
Comments out and adds pending on flaky examples
 2022-10-18 11:32:50 +01:00
filipefurtad0
b3059bbdbc Comments out and adds pending on flaky examples 2022-10-18 10:28:44 +01:00
Maikel Linke
a35fab5e1f Speed up spec by skipping a page 2022-10-18 14:27:18 +11:00
Maikel Linke
c22f6cb805 Add more fields to revenue report as used by Aus 
We currently maintain our own CSV generation script which could be
replaced if we got all this information here.
 2022-10-18 12:51:13 +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
bf74612892 Merge pull request #9775 from openfoodfoundation/dependabot/npm_and_yarn/tom-select-2.2.2 
Bump tom-select from 2.2.1 to 2.2.2
 2022-10-14 09:27:06 +02:00
jibees
eae7d96b30 Merge pull request #9774 from openfoodfoundation/dependabot/npm_and_yarn/hotwired/turbo-7.2.2 
Bump @hotwired/turbo from 7.2.0 to 7.2.2
 2022-10-14 09:21:36 +02:00
Mohamed ABDELLANI
96c6f58ba2 fix test @/spec/system/admin/products_spec.rb:32 2022-10-14 03:26:40 +01:00
Mohamed ABDELLANI
6a8c7b15dc fix product category errors message in the form 2022-10-14 03:26:40 +01:00
Mohamed ABDELLANI
955492bfdd show the error message when the variant unit is not selected 2022-10-14 03:26:40 +01:00
Mohamed ABDELLANI
0000faab91 render the error message when the unit value is not set 2022-10-14 03:26:40 +01:00
Mohamed ABDELLANI
e3f157ebdd remove empty option from unit size 2022-10-14 03:26:40 +01:00
Mohamed ABDELLANI
f8af84d9d4 remove red start from tax category form 2022-10-14 03:26:40 +01:00
Mohamed ABDELLANI
bddbb36813 remove red star from supplier 2022-10-14 03:26:40 +01:00
dependabot[bot]
78b73c988e Bump tom-select from 2.2.1 to 2.2.2 
Bumps [tom-select](https://github.com/orchidjs/tom-select) from 2.2.1 to 2.2.2.
- [Release notes](https://github.com/orchidjs/tom-select/releases)
- [Commits](https://github.com/orchidjs/tom-select/compare/v2.2.1...v2.2.2)

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

Signed-off-by: dependabot[bot] <support@github.com>
 2022-10-13 09:41:37 +00: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
dependabot[bot]
50555a3fe9 Bump @hotwired/turbo from 7.2.0 to 7.2.2 
Bumps [@hotwired/turbo](https://github.com/hotwired/turbo) from 7.2.0 to 7.2.2.
- [Release notes](https://github.com/hotwired/turbo/releases)
- [Commits](https://github.com/hotwired/turbo/compare/v7.2.0...v7.2.2)

---
updated-dependencies:
- dependency-name: "@hotwired/turbo"
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
 2022-10-13 09:08:24 +00:00
jibees
7c6e220bf7 Merge pull request #9771 from mkllnk/rspec-slow 
Add convencience script to test flaky specs
 2022-10-13 10:44:00 +02:00
Maikel Linke
3496b57942 Add convencience script to test flaky specs 2022-10-13 16:28:09 +11:00
Maikel Linke
bc805d94d8 Update translations v4.2.17 2022-10-13 16:03:26 +11: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 Linke
81461684f3 Generalise feature toggle constraint 
Now we can re-use it for any feature.
 2022-10-13 10:42:20 +11: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
jibees
daaff2f7e8 Merge pull request #9764 from mkllnk/simple-oc-spec 
Stabilise spec by waiting for JS requests
 2022-10-12 10:17:51 +02:00
Jean-Baptiste Bellet
4de0b9ad11 Avoid warning on compilation 2022-10-12 09:28:50 +02: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
jibees
3b3f9a7513 Merge pull request #9766 from openfoodfoundation/dependabot/npm_and_yarn/babel/preset-env-7.19.4 
Bump @babel/preset-env from 7.19.3 to 7.19.4
 2022-10-12 09:07:53 +02:00
Maikel
3e1b66fd01 Remove extra blank line from Gemfile 2022-10-12 17:15:12 +11:00