raggedstaff/openfoodnetwork
1
0
Fork 0
mirror of https://github.com/openfoodfoundation/openfoodnetwork synced 2026-03-05 02:41:33 +00:00
Code Issues Packages Projects Releases Wiki Activity
25,833 Commits 20 Branches 455 Tags
5f4aed92d81114df87516be076b5162f9511e4e8
Commit Graph

25833 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Sinan Chaush
2de8ba5e8d make home page labels clickable 2021-10-04 21:11:12 +02:00
Andy Brett
407c4de406 Merge pull request #8272 from openfoodfoundation/dependabot/bundler/jwt-2.3.0 
Bump jwt from 2.2.3 to 2.3.0
 2021-10-04 11:37:43 -07:00
Andy Brett
ebb52510b5 Merge pull request #8275 from openfoodfoundation/dependabot/npm_and_yarn/storybook/addon-controls-6.3.9 
Bump @storybook/addon-controls from 6.3.8 to 6.3.9
 2021-10-04 11:22:05 -07:00
Andy Brett
291e2ca968 Merge pull request #8274 from openfoodfoundation/dependabot/npm_and_yarn/storybook/server-6.3.9 
Bump @storybook/server from 6.3.8 to 6.3.9
 2021-10-04 11:21:35 -07:00
Andy Brett
3b930fe6f7 Merge pull request #8273 from openfoodfoundation/dependabot/bundler/rubocop-1.22.1 
Bump rubocop from 1.22.0 to 1.22.1
 2021-10-04 11:21:01 -07:00
Matt-Yorkley
65f08ee8f4 Deal with edge cases where an adjustment is left referencing a deleted item 2021-10-04 17:55:27 +01:00
Sinan Chaush
7dc8500aa9 ask checkbox is removed from two pages 2021-10-04 17:08:32 +02:00
dependabot[bot]
3b55486172 Bump @storybook/addon-controls from 6.3.8 to 6.3.9 
Bumps [@storybook/addon-controls](https://github.com/storybookjs/storybook/tree/HEAD/addons/controls) from 6.3.8 to 6.3.9.
- [Release notes](https://github.com/storybookjs/storybook/releases)
- [Changelog](https://github.com/storybookjs/storybook/blob/next/CHANGELOG.md)
- [Commits](https://github.com/storybookjs/storybook/commits/v6.3.9/addons/controls)

---
updated-dependencies:
- dependency-name: "@storybook/addon-controls"
  dependency-type: direct:development
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
 2021-10-04 09:07:53 +00:00
dependabot[bot]
d88bceebef Bump @storybook/server from 6.3.8 to 6.3.9 
Bumps [@storybook/server](https://github.com/storybookjs/storybook/tree/HEAD/app/server) from 6.3.8 to 6.3.9.
- [Release notes](https://github.com/storybookjs/storybook/releases)
- [Changelog](https://github.com/storybookjs/storybook/blob/next/CHANGELOG.md)
- [Commits](https://github.com/storybookjs/storybook/commits/v6.3.9/app/server)

---
updated-dependencies:
- dependency-name: "@storybook/server"
  dependency-type: direct:development
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
 2021-10-04 09:07:17 +00:00
dependabot[bot]
12f367f47f Bump rubocop from 1.22.0 to 1.22.1 
Bumps [rubocop](https://github.com/rubocop/rubocop) from 1.22.0 to 1.22.1.
- [Release notes](https://github.com/rubocop/rubocop/releases)
- [Changelog](https://github.com/rubocop/rubocop/blob/master/CHANGELOG.md)
- [Commits](https://github.com/rubocop/rubocop/compare/v1.22.0...v1.22.1)

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

Signed-off-by: dependabot[bot] <support@github.com>
 2021-10-04 09:03:48 +00:00
dependabot[bot]
fc1efe4d05 Bump jwt from 2.2.3 to 2.3.0 
Bumps [jwt](https://github.com/jwt/ruby-jwt) from 2.2.3 to 2.3.0.
- [Release notes](https://github.com/jwt/ruby-jwt/releases)
- [Changelog](https://github.com/jwt/ruby-jwt/blob/master/CHANGELOG.md)
- [Commits](https://github.com/jwt/ruby-jwt/compare/v2.2.3...v2.3.0)

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

Signed-off-by: dependabot[bot] <support@github.com>
 2021-10-04 09:03:11 +00:00
Sinan Chaush
70000db52c when creating a product, preselect the supplier if there is only one 2021-10-03 11:51:41 +02:00
Adrien Chauve
45eefb627d Fix sorting orders by total in admin/ via api/v0/orders 2021-10-01 18:32:59 +02:00
Adrien Chauve
f256bb7d28 Add new failing test on sorting orders by total (api/v0/orders) 2021-10-01 18:32:59 +02:00
Yasuhiro Yoshida
768acc4166 Add scope to only allow visible enterprises in group 2021-10-01 15:22:00 +03:00
Yasuhiro Yoshida
ace8c8768f Remove ng-if to filter out invisible enterprises from group 2021-10-01 15:21:13 +03:00
Matt-Yorkley
43f28d94b9 Update all locales with the latest Transifex translations 2021-09-30 18:22:16 +01:00
Matt-Yorkley
61fa251f6a Merge pull request #8252 from openfoodfoundation/transifex 
Transifex
 2021-09-30 19:00:49 +02:00
Matt-Yorkley
cb65c7c2ef Fix deprecation warning in Paperclip 
Fixes deprecation warnings in Paperclip::UrlGenerator#escape_url

On a side note: we shouldn't be using Paperclip at all, and should migrate to ActiveStorage.
 2021-09-30 17:29:54 +01:00
filipefurtad0
6aed6f186d Adds assertion on filtering by completion date 2021-09-30 17:29:43 +01:00
filipefurtad0
258f797680 Adds assertion on filtering by distributors 2021-09-30 17:01:25 +01:00
filipefurtad0
07e92d343c Adds assertion on displaying complete but empty orders 2021-09-30 16:22:42 +01:00
filipefurtad0
4ba69850be Adds assertion on en/dis-abling the Print Invoices button 2021-09-30 15:45:03 +01:00
filipefurtad0
3ee1cc9578 Adds assertion on en/dis-abling the Print Invoices button 2021-09-30 15:43:01 +01:00
Matt-Yorkley
76c9f38fb6 Fix display of "inventory only" radio buttons 
Previously the two radio buttons were not showing which option was set; both options were blank even if one had been selected.
 2021-09-30 13:30:23 +01:00
Matt-Yorkley
88a92381aa Bump aws-sdk to 2.2.0 2021-09-29 22:03:59 +01:00
Matt-Yorkley
0170351597 Merge pull request #8254 from openfoodfoundation/dependabot/npm_and_yarn/mrujs-0.5.3 
Bump mrujs from 0.4.13 to 0.5.3
 2021-09-29 13:54:09 +02:00
Matt-Yorkley
df7bad2cb2 Merge pull request #8241 from openfoodfoundation/dependabot/npm_and_yarn/hotwired/turbo-7.0.1 
Bump @hotwired/turbo from 7.0.0-rc.5 to 7.0.1
 2021-09-29 13:30:51 +02:00
Matt-Yorkley
802d637b34 Merge pull request #8259 from openfoodfoundation/dependabot/npm_and_yarn/jest-27.2.3 
Bump jest from 27.2.2 to 27.2.3
 2021-09-29 12:38:56 +02:00
Matt-Yorkley
868bb78bae Merge pull request #8258 from openfoodfoundation/dependabot/bundler/rubocop-1.22.0 
Bump rubocop from 1.21.0 to 1.22.0
 2021-09-29 12:38:37 +02:00
Transifex-Openfoodnetwork
e26e6e8d8b Updating translations for config/locales/ru.yml 2021-09-29 20:29:57 +10:00
dependabot[bot]
a9c02a3fce Bump jest from 27.2.2 to 27.2.3 
Bumps [jest](https://github.com/facebook/jest) from 27.2.2 to 27.2.3.
- [Release notes](https://github.com/facebook/jest/releases)
- [Changelog](https://github.com/facebook/jest/blob/main/CHANGELOG.md)
- [Commits](https://github.com/facebook/jest/compare/v27.2.2...v27.2.3)

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

Signed-off-by: dependabot[bot] <support@github.com>
 2021-09-29 09:06:46 +00:00
dependabot[bot]
ac4d3a91da Bump rubocop from 1.21.0 to 1.22.0 
Bumps [rubocop](https://github.com/rubocop/rubocop) from 1.21.0 to 1.22.0.
- [Release notes](https://github.com/rubocop/rubocop/releases)
- [Changelog](https://github.com/rubocop/rubocop/blob/master/CHANGELOG.md)
- [Commits](https://github.com/rubocop/rubocop/compare/v1.21.0...v1.22.0)

---
updated-dependencies:
- dependency-name: rubocop
  dependency-type: direct:development
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
 2021-09-29 09:03:06 +00:00
Andy Brett
5e658eb9dd Update all locales with the latest Transifex translations v4.1.3 2021-09-28 09:21:09 -07:00
filipefurtad0
81890a4e21 Replaces 'background' with 'before' (squashing) 
Replaces 'background' with 'before'

Replaces 'background' with 'before' in other files

Fixes typo on products_spec.rb
 2021-09-28 11:22:35 +01:00
dependabot[bot]
f7884d4929 Bump mrujs from 0.4.13 to 0.5.3 
Bumps [mrujs](https://github.com/ParamagicDev/mrujs) from 0.4.13 to 0.5.3.
- [Release notes](https://github.com/ParamagicDev/mrujs/releases)
- [Changelog](https://github.com/ParamagicDev/mrujs/blob/main/CHANGELOG.md)
- [Commits](https://github.com/ParamagicDev/mrujs/compare/v0.4.13...v0.5.3)

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

Signed-off-by: dependabot[bot] <support@github.com>
 2021-09-28 09:07:07 +00:00
Transifex-Openfoodnetwork
2079bf549d Updating translations for config/locales/nb.yml 2021-09-28 11:28:18 +10:00
Transifex-Openfoodnetwork
1abca497b7 Updating translations for config/locales/en_IE.yml 2021-09-28 11:25:12 +10:00
Maikel
c9d36e6f5c Merge pull request #8204 from meronokbay/6942-fix-payment-method-fee-bug-all 
Fix payment method fee bug for all calculator types
 2021-09-28 08:39:05 +10:00
filipefurtad0
6f694e2cab Standardise spec block naming 
The `feature` and `scenario` names are aliases only available in feature
specs and not needed. It's confusing to have different names and we can
easily move feature specs to system specs when using standard names.
 2021-09-28 08:24:05 +10:00
Matt-Yorkley
0f4c8d8ecc Merge pull request #8251 from openfoodfoundation/dependabot/bundler/nokogiri-1.12.5 
Bump nokogiri from 1.12.4 to 1.12.5
 2021-09-27 23:13:06 +02:00
dependabot[bot]
6553136d2d Bump nokogiri from 1.12.4 to 1.12.5 
Bumps [nokogiri](https://github.com/sparklemotion/nokogiri) from 1.12.4 to 1.12.5.
- [Release notes](https://github.com/sparklemotion/nokogiri/releases)
- [Changelog](https://github.com/sparklemotion/nokogiri/blob/main/CHANGELOG.md)
- [Commits](https://github.com/sparklemotion/nokogiri/compare/v1.12.4...v1.12.5)

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

Signed-off-by: dependabot[bot] <support@github.com>
 2021-09-27 20:40:40 +00:00
Matt-Yorkley
9cbdc8293d Merge pull request #8244 from openfoodfoundation/dependabot/npm_and_yarn/jest-27.2.2 
Bump jest from 27.2.1 to 27.2.2
 2021-09-27 21:36:15 +02:00
Nihal
2ad234d5aa Migrate Migs to Check 2021-09-27 21:10:57 +05:30
Matt-Yorkley
c0f7d2638b Pin webpack packages to respective major versions 
Hopefully Dependabot will respect these pins...

Syntax reference: https://github.com/npm/node-semver#advanced-range-syntax
 2021-09-27 15:13:21 +01:00
Matt-Yorkley
6d1d688b1d Merge pull request #8215 from openfoodfoundation/transifex 
Transifex
 2021-09-27 15:04:24 +02:00
dependabot[bot]
af1e26e9e1 Bump jest from 27.2.1 to 27.2.2 
Bumps [jest](https://github.com/facebook/jest) from 27.2.1 to 27.2.2.
- [Release notes](https://github.com/facebook/jest/releases)
- [Changelog](https://github.com/facebook/jest/blob/main/CHANGELOG.md)
- [Commits](https://github.com/facebook/jest/compare/v27.2.1...v27.2.2)

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

Signed-off-by: dependabot[bot] <support@github.com>
 2021-09-27 09:07:54 +00:00
dependabot[bot]
692a21dcaf Bump @hotwired/turbo from 7.0.0-rc.5 to 7.0.1 
Bumps [@hotwired/turbo](https://github.com/hotwired/turbo) from 7.0.0-rc.5 to 7.0.1.
- [Release notes](https://github.com/hotwired/turbo/releases)
- [Commits](https://github.com/hotwired/turbo/compare/v7.0.0-rc.5...v7.0.1)

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

Signed-off-by: dependabot[bot] <support@github.com>
 2021-09-27 09:06:32 +00:00
Maikel Linke
f17cf1f1f4 Load referenced lib class for independent spec run 
This spec file tried to access a class without loading the code. That
worked in usual spec runs when other specs were run first which
loaded the whole lib directory.
 2021-09-27 17:21:35 +10:00
Maikel Linke
cb2c6835c4 Standardise default country and state 
The OFN software was first written in Melbourne and a lot of spec code
relies on the state Victoria being in the database. When we imported
Spree code, it came with its default state Alabame in the USA. Having
two different defaults is confusing and caused specs to fail in rare
circumstances. Let's standardise it here which will also open the path
to removing the seeding of test data and the exclusion of states and
countries in the database cleaner.
 2021-09-27 16:37:50 +10:00