raggedstaff/openfoodnetwork
1
0
Fork 0
mirror of https://github.com/openfoodfoundation/openfoodnetwork synced 2026-02-11 23:17:48 +00:00
Code Issues Packages Projects Releases Wiki Activity
22,571 Commits 19 Branches 453 Tags
b388196ce313c9573e1dc75fde7828c68474a69a
Commit Graph

22571 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Matt-Yorkley
b388196ce3 Merge pull request #8471 from jibees/7885-duplicate-product-in-order-cycle 
Use distinct to return unique product list for scope `visible_for`
 2021-11-15 10:05:11 +00:00
Matt-Yorkley
0a22a3baa6 Merge pull request #8478 from Matt-Yorkley/split-admin-system-tests 
Split admin system tests into two groups
 2021-11-12 10:20:46 +00:00
Jean-Baptiste Bellet
fff2c3ae74 Update spec to take into account the non-duplication of product in inventory 2021-11-12 10:55:47 +01:00
Maikel Linke
4c4691adbb Update translations 2021-11-12 14:48:30 +11:00
Maikel
28b8b9cc55 Merge pull request #8460 from openfoodfoundation/transifex 
Transifex
 2021-11-12 14:38:45 +11:00
Matt-Yorkley
f3d22ba777 Merge pull request #8439 from openfoodfoundation/dependabot/npm_and_yarn/mrujs-0.6.0 
Bump mrujs from 0.5.11 to 0.6.0
 2021-11-11 16:29:33 +00:00
Matt-Yorkley
6635b59250 Split admin system tests into two groups 2021-11-11 14:49:03 +00:00
Matt-Yorkley
b1c1284c18 Merge pull request #8450 from filipefurtad0/admin_into_system_3 
Moves/Updates admin into system (cont. III)
 2021-11-11 14:05:19 +00:00
Jean-Baptiste Bellet
d2dbe6c738 Use distinct to return unique product 
- Product were displayed twice (or more) in certain condition under order cycle incoming products admin interface
 2021-11-10 14:49:19 +01:00
Maikel
d799f446be Merge pull request #8466 from filipefurtad0/admin_into_system_v 
Moves/updates missing admin feature specs into system (cont.)
 2021-11-10 11:30:11 +11:00
Maikel
6cc194a10b Merge pull request #8464 from openfoodfoundation/dependabot/npm_and_yarn/karma-6.3.8 
Bump karma from 6.3.7 to 6.3.8
 2021-11-10 11:24:56 +11:00
jibees
7bbb68e0c2 Merge pull request #8462 from filipefurtad0/admin_into_features_iv 
Moves/updates subscriptions_spec into system
 2021-11-09 14:56:36 +01:00
filipefurtad0
901d1cbc44 Moves/updates variants_spec into system 2021-11-08 19:15:37 +00:00
filipefurtad0
42992e63a5 Moves/updates users_spec into system 2021-11-08 16:46:41 +00:00
filipefurtad0
05393351f6 Moves/updates unit_price_spec into system 2021-11-08 16:45:32 +00:00
filipefurtad0
7e0d24c784 Moves/updates tax_settings into system 2021-11-08 16:33:25 +00:00
Transifex-Openfoodnetwork
bb23be0909 Updating translations for config/locales/en_GB.yml 2021-11-08 22:02:14 +11:00
dependabot[bot]
de6ebc361a Bump karma from 6.3.7 to 6.3.8 
Bumps [karma](https://github.com/karma-runner/karma) from 6.3.7 to 6.3.8.
- [Release notes](https://github.com/karma-runner/karma/releases)
- [Changelog](https://github.com/karma-runner/karma/blob/master/CHANGELOG.md)
- [Commits](https://github.com/karma-runner/karma/compare/v6.3.7...v6.3.8)

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

Signed-off-by: dependabot[bot] <support@github.com>
 2021-11-08 09:07:47 +00:00
filipefurtad0
d646b29573 Comments out drag_to block - not implemented in Cuprite 2021-11-06 19:23:36 +00:00
filipefurtad0
fa4a2dbab4 Moves/updates tag_rules into system 2021-11-06 19:18:42 +00:00
filipefurtad0
151ff59d1b Moves/updates subscriptions_spec into system 2021-11-06 17:11:14 +00:00
filipefurtad0
6a33ad44f0 Fixes failing example on enterprises spec 2021-11-06 12:33:04 +00:00
filipefurtad0
a946b93fb9 Deletes obsolete example 2021-11-06 12:13:07 +00:00
filipefurtad0
182ef9eb3e Changes deletion action 2021-11-06 11:54:39 +00:00
filipefurtad0
9b3db4e667 Updates/moves shipping_methods into system 2021-11-06 11:53:02 +00:00
filipefurtad0
5fae9e2b30 Updates/moves schedules_spec into system 2021-11-06 11:50:20 +00:00
Matt-Yorkley
8cb2a2cc96 Merge pull request #8451 from Matt-Yorkley/variant-search-debounce 
Fix debounce on variant search dropdown
v4.1.7 		2021-11-05 18:59:44 +00:00
jibees
a737ee4d1b Merge pull request #8446 from filipefurtad0/admin_into_system_2 
Moves/Updates admin into system (cont.)
 2021-11-05 17:02:56 +01:00
Transifex-Openfoodnetwork
42b00abf3e Updating translations for config/locales/fr.yml 2021-11-06 02:29:34 +11:00
Transifex-Openfoodnetwork
70634dc0c1 Updating translations for config/locales/en_FR.yml 2021-11-06 00:12:34 +11:00
Matt-Yorkley
4dfbdc3bfa Merge pull request #8456 from openfoodfoundation/dependabot/npm_and_yarn/dns-packet-1.3.4 
Bump dns-packet from 1.3.1 to 1.3.4
 2021-11-05 11:26:14 +00:00
Matt-Yorkley
40e4e6427e Merge pull request #8454 from openfoodfoundation/dependabot/npm_and_yarn/url-parse-1.5.3 
Bump url-parse from 1.5.1 to 1.5.3
 2021-11-05 11:26:04 +00:00
dependabot[bot]
f0d0f8620f Bump dns-packet from 1.3.1 to 1.3.4 
Bumps [dns-packet](https://github.com/mafintosh/dns-packet) from 1.3.1 to 1.3.4.
- [Release notes](https://github.com/mafintosh/dns-packet/releases)
- [Changelog](https://github.com/mafintosh/dns-packet/blob/master/CHANGELOG.md)
- [Commits](https://github.com/mafintosh/dns-packet/compare/v1.3.1...v1.3.4)

---
updated-dependencies:
- dependency-name: dns-packet
  dependency-type: indirect
...

Signed-off-by: dependabot[bot] <support@github.com>
 2021-11-05 10:51:13 +00:00
Matt-Yorkley
22ec427951 Merge pull request #8452 from openfoodfoundation/dependabot/npm_and_yarn/postcss-7.0.39 
Bump postcss from 7.0.35 to 7.0.39
 2021-11-05 10:50:33 +00:00
Matt-Yorkley
e626e86015 Update all locales with the latest Transifex translations# 2021-11-05 10:46:03 +00:00
Matt-Yorkley
c1b2af006e Merge pull request #8435 from openfoodfoundation/transifex 
Transifex
 2021-11-05 10:39:14 +00:00
Matt-Yorkley
e31470d640 Merge pull request #8453 from openfoodfoundation/dependabot/npm_and_yarn/ws-6.2.2 
Bump ws from 6.2.1 to 6.2.2
 2021-11-05 10:23:17 +00:00
dependabot[bot]
fd3a20cfc6 Bump url-parse from 1.5.1 to 1.5.3 
Bumps [url-parse](https://github.com/unshiftio/url-parse) from 1.5.1 to 1.5.3.
- [Release notes](https://github.com/unshiftio/url-parse/releases)
- [Commits](https://github.com/unshiftio/url-parse/compare/1.5.1...1.5.3)

---
updated-dependencies:
- dependency-name: url-parse
  dependency-type: indirect
...

Signed-off-by: dependabot[bot] <support@github.com>
 2021-11-05 10:07:49 +00:00
dependabot[bot]
bf14ddb187 Bump postcss from 7.0.35 to 7.0.39 
Bumps [postcss](https://github.com/postcss/postcss) from 7.0.35 to 7.0.39.
- [Release notes](https://github.com/postcss/postcss/releases)
- [Changelog](https://github.com/postcss/postcss/blob/7.0.39/CHANGELOG.md)
- [Commits](https://github.com/postcss/postcss/compare/7.0.35...7.0.39)

---
updated-dependencies:
- dependency-name: postcss
  dependency-type: indirect
...

Signed-off-by: dependabot[bot] <support@github.com>
 2021-11-05 10:07:45 +00:00
dependabot[bot]
46aa4b6733 Bump ws from 6.2.1 to 6.2.2 
Bumps [ws](https://github.com/websockets/ws) from 6.2.1 to 6.2.2.
- [Release notes](https://github.com/websockets/ws/releases)
- [Commits](https://github.com/websockets/ws/compare/6.2.1...6.2.2)

---
updated-dependencies:
- dependency-name: ws
  dependency-type: indirect
...

Signed-off-by: dependabot[bot] <support@github.com>
 2021-11-05 10:07:45 +00:00
Matt-Yorkley
47dbfa7d17 Merge pull request #8145 from Matt-Yorkley/reports-query-interface 
Reports Query Interface
 2021-11-05 10:06:52 +00:00
Transifex-Openfoodnetwork
a000d9f984 Updating translations for config/locales/de_DE.yml 2021-11-05 12:29:48 +11:00
Transifex-Openfoodnetwork
13c9100ab7 Updating translations for config/locales/it.yml 2021-11-05 12:26:44 +11:00
Transifex-Openfoodnetwork
11477becdf Updating translations for config/locales/ru.yml 2021-11-05 12:26:42 +11:00
Maikel
a29330884c Merge pull request #8289 from jibees/7409-add-signup-matomo-event 
Track event via matomo when submitting signup form
 2021-11-05 11:05:45 +11:00
Maikel
3f571d178f Merge pull request #8418 from KombiCode/7706-add-close-button-to-flatpickr 
7706 add close button to flatpickr
 2021-11-05 11:04:50 +11:00
Matt-Yorkley
0d7bb2ff90 Update sorting by name in supplier report 2021-11-04 22:08:27 +00:00
Matt-Yorkley
c6ef14e9ee Update masking in supplier report 2021-11-04 22:08:10 +00:00
Matt-Yorkley
ce61b5088e Fix debounce on variant search dropdown 
This wasn't applied correctly so there was zero debounce, leading to a big excess of pointless requests whilst typing in the variant search dropdown
 2021-11-04 20:44:09 +00:00
Matt-Yorkley
373fc2e22e Update show_customer_names_to_suppliers check 2021-11-04 14:55:23 +00:00