raggedstaff/openfoodnetwork
1
0
Fork 0
mirror of https://github.com/openfoodfoundation/openfoodnetwork synced 2026-03-18 04:39:14 +00:00
Code Issues Packages Projects Releases Wiki Activity
25,508 Commits 15 Branches 457 Tags
ccfb83d2cd0a78f4bbd2cb2e9423948246eaa950
Commit Graph

25508 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
filipefurtad0
b0d29c6dbc Updates spec settings to address timeout error 2022-06-23 10:24:20 +01:00
filipefurtad0
54bcd75f3f Corrects namespace; adds pending on failing examples - payment_r 2022-06-23 10:24:20 +01:00
filipefurtad0
32e247bf75 Removes spree namespace; adds pending on failing examples - packing_r 2022-06-23 10:24:20 +01:00
filipefurtad0
5892eab4e3 Removes spree namespace; adds pending on failing examples - enterprise_fee_r 2022-06-23 10:24:20 +01:00
dependabot[bot]
9da7bcb134 Bump view_component from 2.41.0 to 2.57.1 
Bumps [view_component](https://github.com/github/view_component) from 2.41.0 to 2.57.1.
- [Release notes](https://github.com/github/view_component/releases)
- [Changelog](https://github.com/github/view_component/blob/main/docs/CHANGELOG.md)
- [Commits](https://github.com/github/view_component/compare/v2.41.0...v2.57.1)

---
updated-dependencies:
- dependency-name: view_component
  dependency-type: direct:production
...

Signed-off-by: dependabot[bot] <support@github.com>
 2022-06-23 04:11:33 +00:00
Maikel
0ce5718b2b Merge pull request #9329 from openfoodfoundation/dependabot/bundler/web-console-4.2.0 
Bump web-console from 4.1.0 to 4.2.0
 2022-06-23 14:10:25 +10:00
dependabot[bot]
d12754fe83 Bump roadie-rails from 2.2.0 to 3.0.0 
Bumps [roadie-rails](https://github.com/Mange/roadie-rails) from 2.2.0 to 3.0.0.
- [Release notes](https://github.com/Mange/roadie-rails/releases)
- [Changelog](https://github.com/Mange/roadie-rails/blob/master/Changelog.md)
- [Commits](https://github.com/Mange/roadie-rails/compare/v2.2.0...v3.0.0)

---
updated-dependencies:
- dependency-name: roadie-rails
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
 2022-06-23 03:58:49 +00:00
Maikel
c268999ec6 Merge pull request #9346 from openfoodfoundation/dependabot/bundler/puma-5.6.4 
Bump puma from 5.6.2 to 5.6.4
v4.2.3 		2022-06-23 13:56:49 +10:00
dependabot[bot]
b81ce0ad1c Bump puma from 5.6.2 to 5.6.4 
Bumps [puma](https://github.com/puma/puma) from 5.6.2 to 5.6.4.
- [Release notes](https://github.com/puma/puma/releases)
- [Changelog](https://github.com/puma/puma/blob/master/History.md)
- [Commits](https://github.com/puma/puma/compare/v5.6.2...v5.6.4)

---
updated-dependencies:
- dependency-name: puma
  dependency-type: direct:production
...

Signed-off-by: dependabot[bot] <support@github.com>
 2022-06-23 03:30:12 +00:00
Maikel Linke
49166dd503 Update translations 2022-06-23 13:30:09 +10:00
dependabot[bot]
00f3a698f4 Bump test-prof from 1.0.7 to 1.0.9 
Bumps [test-prof](https://github.com/test-prof/test-prof) from 1.0.7 to 1.0.9.
- [Release notes](https://github.com/test-prof/test-prof/releases)
- [Changelog](https://github.com/test-prof/test-prof/blob/master/CHANGELOG.md)
- [Commits](https://github.com/test-prof/test-prof/compare/v1.0.7...v1.0.9)

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

Signed-off-by: dependabot[bot] <support@github.com>
 2022-06-23 03:30:07 +00:00
Maikel
45e4b00891 Merge pull request #9328 from openfoodfoundation/dependabot/bundler/good_migrations-0.2.1 
Bump good_migrations from 0.1.0 to 0.2.1
 2022-06-23 13:29:01 +10:00
Maikel
d71073e0ed Merge pull request #9339 from openfoodfoundation/transifex 
Transifex
 2022-06-23 12:20:51 +10:00
Maikel
165456b8c8 Merge pull request #9229 from mkllnk/report-currency-formatting 
Format money amounts in report spreadsheets as numbers
 2022-06-23 12:18:02 +10:00
saunmanoj888
12eff626f4 Add translation for statuses in order_controller.js.coffee 2022-06-23 01:33:51 +05:30
dependabot[bot]
eee7075d9d Bump arel-helpers from 2.12.1 to 2.14.0 
Bumps [arel-helpers](https://github.com/camertron/arel-helpers) from 2.12.1 to 2.14.0.
- [Release notes](https://github.com/camertron/arel-helpers/releases)
- [Changelog](https://github.com/camertron/arel-helpers/blob/master/CHANGELOG.md)
- [Commits](https://github.com/camertron/arel-helpers/commits)

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

Signed-off-by: dependabot[bot] <support@github.com>
 2022-06-22 13:55:57 +00:00
jibees
5642e4835c Merge pull request #9335 from openfoodfoundation/dependabot/bundler/i18n-js-3.9.2 
Bump i18n-js from 3.9.0 to 3.9.2
 2022-06-22 15:55:44 +02:00
dependabot[bot]
f12d62604b Bump view_component_storybook from 0.10.1 to 0.11.1 
Bumps [view_component_storybook](https://github.com/jonspalmer/view_component_storybook) from 0.10.1 to 0.11.1.
- [Release notes](https://github.com/jonspalmer/view_component_storybook/releases)
- [Changelog](https://github.com/jonspalmer/view_component_storybook/blob/main/docs/CHANGELOG.md)
- [Commits](https://github.com/jonspalmer/view_component_storybook/commits)

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

Signed-off-by: dependabot[bot] <support@github.com>
 2022-06-22 13:55:25 +00:00
Transifex-Openfoodnetwork
db51b7dcf4 Updating translations for config/locales/de_DE.yml 2022-06-22 23:54:59 +10:00
jibees
d328e098ce Merge pull request #9327 from openfoodfoundation/dependabot/bundler/ffaker-2.21.0 
Bump ffaker from 2.20.0 to 2.21.0
 2022-06-22 15:53:44 +02:00
Jean-Baptiste Bellet
4007b17b1e Redirect to login path also if user is disabled 
+ update spec as well
 2022-06-22 15:51:11 +02:00
dependabot[bot]
d77c693829 Bump wicked_pdf from 2.1.0 to 2.6.3 
Bumps [wicked_pdf](https://github.com/mileszs/wicked_pdf) from 2.1.0 to 2.6.3.
- [Release notes](https://github.com/mileszs/wicked_pdf/releases)
- [Changelog](https://github.com/mileszs/wicked_pdf/blob/master/CHANGELOG.md)
- [Commits](https://github.com/mileszs/wicked_pdf/compare/2.1.0...2.6.3)

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

Signed-off-by: dependabot[bot] <support@github.com>
 2022-06-22 09:02:28 +00:00
Transifex-Openfoodnetwork
213aa03c8b Updating translations for config/locales/en_FR.yml 2022-06-22 18:14:49 +10:00
Transifex-Openfoodnetwork
cc48a3396b Updating translations for config/locales/fr.yml 2022-06-22 18:14:15 +10:00
Maikel
fbf4513e96 Merge pull request #9314 from turrisxyz/Pinned-Dependencies-GitHub 
chore: Set permissions for GitHub actions
 2022-06-22 12:07:07 +10:00
Maikel
5ecf678257 Merge pull request #9293 from openfoodfoundation/master-1 
Updated Docker installation instructions
 2022-06-22 11:54:14 +10:00
dependabot[bot]
5e5ade9681 Bump bullet from 6.1.5 to 7.0.2 
Bumps [bullet](https://github.com/flyerhzm/bullet) from 6.1.5 to 7.0.2.
- [Release notes](https://github.com/flyerhzm/bullet/releases)
- [Changelog](https://github.com/flyerhzm/bullet/blob/master/CHANGELOG.md)
- [Commits](https://github.com/flyerhzm/bullet/compare/6.1.5...7.0.2)

---
updated-dependencies:
- dependency-name: bullet
  dependency-type: direct:development
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
 2022-06-22 01:27:27 +00:00
Maikel
6a22650fee Merge pull request #9333 from openfoodfoundation/dependabot/bundler/bugsnag-6.24.2 
Bump bugsnag from 6.24.1 to 6.24.2
 2022-06-22 11:25:43 +10:00
Maikel
8d1e1e6e04 Merge pull request #9322 from mkllnk/fix-schema 
Remove accidental modification of the db schema
 2022-06-22 11:23:54 +10:00
Filipe
b977bc77c8 Merge pull request #9272 from jibees/7905-retrieve-order-already-placed-on-user-confirmation-with-customer-email 
On user confirmation, retrieve and link all orders to the new user that were already placed with the same email
 2022-06-21 18:12:58 +01:00
dependabot[bot]
421cbcc745 Bump i18n-js from 3.9.0 to 3.9.2 
Bumps [i18n-js](https://github.com/fnando/i18n-js) from 3.9.0 to 3.9.2.
- [Release notes](https://github.com/fnando/i18n-js/releases)
- [Changelog](https://github.com/fnando/i18n-js/blob/v3.9.2/CHANGELOG.md)
- [Commits](https://github.com/fnando/i18n-js/compare/v3.9.0...v3.9.2)

---
updated-dependencies:
- dependency-name: i18n-js
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
 2022-06-21 16:37:08 +00:00
dependabot[bot]
9455341908 Bump bugsnag from 6.24.1 to 6.24.2 
Bumps [bugsnag](https://github.com/bugsnag/bugsnag-ruby) from 6.24.1 to 6.24.2.
- [Release notes](https://github.com/bugsnag/bugsnag-ruby/releases)
- [Changelog](https://github.com/bugsnag/bugsnag-ruby/blob/master/CHANGELOG.md)
- [Commits](https://github.com/bugsnag/bugsnag-ruby/compare/v6.24.1...v6.24.2)

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

Signed-off-by: dependabot[bot] <support@github.com>
 2022-06-21 16:35:44 +00:00
dependabot[bot]
4c0d7c039f Bump geocoder from 1.7.0 to 1.8.0 
Bumps [geocoder](https://github.com/alexreisner/geocoder) from 1.7.0 to 1.8.0.
- [Release notes](https://github.com/alexreisner/geocoder/releases)
- [Changelog](https://github.com/alexreisner/geocoder/blob/master/CHANGELOG.md)
- [Commits](https://github.com/alexreisner/geocoder/compare/v1.7.0...v1.8.0)

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

Signed-off-by: dependabot[bot] <support@github.com>
 2022-06-21 16:35:04 +00:00
Filipe
6b00319e4a Merge pull request #9191 from jibees/9186-inverse-hide-columns-UX-by-a-columns-to-show 
Admin, Reports: Inverting logic from "Columns to hide" to "Columns to show"
 2022-06-21 17:34:31 +01:00
dependabot[bot]
5da9ec7dc2 Bump devise-i18n from 1.10.0 to 1.10.2 
Bumps [devise-i18n](https://github.com/tigrish/devise-i18n) from 1.10.0 to 1.10.2.
- [Release notes](https://github.com/tigrish/devise-i18n/releases)
- [Changelog](https://github.com/tigrish/devise-i18n/blob/master/CHANGELOG.md)
- [Commits](https://github.com/tigrish/devise-i18n/compare/v1.10.0...v1.10.2)

---
updated-dependencies:
- dependency-name: devise-i18n
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
 2022-06-21 16:34:22 +00:00
dependabot[bot]
edf1dd52eb Bump web-console from 4.1.0 to 4.2.0 
Bumps [web-console](https://github.com/rails/web-console) from 4.1.0 to 4.2.0.
- [Release notes](https://github.com/rails/web-console/releases)
- [Changelog](https://github.com/rails/web-console/blob/master/CHANGELOG.markdown)
- [Commits](https://github.com/rails/web-console/compare/v4.1.0...v4.2.0)

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

Signed-off-by: dependabot[bot] <support@github.com>
 2022-06-21 16:33:16 +00:00
dependabot[bot]
024c9b5473 Bump good_migrations from 0.1.0 to 0.2.1 
Bumps [good_migrations](https://github.com/testdouble/good-migrations) from 0.1.0 to 0.2.1.
- [Release notes](https://github.com/testdouble/good-migrations/releases)
- [Changelog](https://github.com/testdouble/good-migrations/blob/main/CHANGELOG.md)
- [Commits](https://github.com/testdouble/good-migrations/compare/v0.1.0...v0.2.1)

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

Signed-off-by: dependabot[bot] <support@github.com>
 2022-06-21 16:32:37 +00:00
dependabot[bot]
55e65a713b Bump ffaker from 2.20.0 to 2.21.0 
Bumps [ffaker](https://github.com/ffaker/ffaker) from 2.20.0 to 2.21.0.
- [Release notes](https://github.com/ffaker/ffaker/releases)
- [Changelog](https://github.com/ffaker/ffaker/blob/main/Changelog.md)
- [Commits](https://github.com/ffaker/ffaker/compare/v2.20.0...v2.21.0)

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

Signed-off-by: dependabot[bot] <support@github.com>
 2022-06-21 16:31:48 +00:00
Filipe
4b33593a8a Merge pull request #9271 from AgriculturaFamiliar/9256-update-aws-sdk 
Remove old aws-sdk gem
 2022-06-21 17:26:52 +01:00
Filipe
dd079c4dce Merge pull request #9154 from openfoodfoundation/ability-to-desactivate-users 
Add disabled_at logic on spree users
 2022-06-21 16:57:35 +01:00
Jean-Baptiste Bellet
400a490ec5 Display fee name instead of fee type 
+ update specs as well
 2022-06-21 16:08:45 +02:00
Jean-Baptiste Bellet
3c05fc3c80 Add fees name for a variant to its serializer 2022-06-21 14:42:22 +02:00
Jean-Baptiste Bellet
976e326bbd Add method fees_name_by_type_for that returns fees name for a variant 2022-06-21 14:20:59 +02:00
François Turbelin
606a56a64d Improve specs 2022-06-21 10:08:12 +02:00
François Turbelin
31f8864b4a Add system spec for Admin user disable feature 2022-06-21 10:08:12 +02:00
François Turbelin
76ea7089d9 Implement suggestions 2022-06-21 10:08:12 +02:00
François Turbelin
bc9dcc7cbc Block disabled users from logging in 2022-06-21 10:08:12 +02:00
François Turbelin
39a6b5d20f Add disabled_at logic on spree users 2022-06-21 10:08:12 +02:00
Maikel
f6e2cb52e0 Merge pull request #9323 from mkllnk/mime 
Restore dependency to mime-types
 2022-06-21 11:19:56 +10:00
Maikel Linke
5406978e2d Restore dependency to mime-types 
Our db2fog backups require the mime-types gem but it was removed with
paperclip. Luckily, backups have still been working because the gem was
still available.
 2022-06-21 10:52:57 +10:00