raggedstaff/openfoodnetwork
1
0
Fork 0
mirror of https://github.com/openfoodfoundation/openfoodnetwork synced 2026-01-24 20:36:49 +00:00
Code Issues Packages Projects Releases Wiki Activity
24,312 Commits 21 Branches 450 Tags
fbf4513e96e52fe89ca4e7de421fabfc2e8e15c9
Commit Graph

24312 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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]
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
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
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
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
Maikel
553046addb Merge pull request #9255 from jibees/fix-admin-taxonomies-interface 
Fix admin taxonomies interface
 2022-06-21 09:41:55 +10:00
Maikel
d5bec7e538 Merge pull request #9269 from jibees/fix-@order-distributor-website-in-/order/ORDER_ID-page 
As a customer, on an order page, distributor website should link to the order that is actually showing
 2022-06-21 09:39:46 +10:00
Jean-Baptiste Bellet
bc43028cb1 On User confirmation, link all already placed orders to this new user 
if user.email == customer.email

Co-Authored-By: Maikel <maikel@email.org.au>
 2022-06-20 15:39:22 +02:00
Diego de Araújo Martinez Camarinha
a4fa4a4803 Remove aws sdk patch 
This was introduced because an old version of the aws sdk was used. Now
with a newer version installed, this should not be need anymore
 2022-06-20 07:10:53 -03:00
Diego de Araújo Martinez Camarinha
c4bd37413d Remove old aws-sdk dependency 
It is on version 1.67.0 and has an old json dependency that makes
bundler unable to solve conflicts. That means it's not possible to
install other gems because of it
 2022-06-20 07:10:53 -03:00
Maikel Linke
d78cbce4f3 Remove accidental modification of the db schema 
fa74dae99c changed the schema file even
though the migration doesn't touch the database structure. A previous
development version of the migration did this but the finally merged
version didn't. So this schema is not valid. Let's hope that nobody set
up a new instance with the changed schema and we just fix it to what it
was before.
 2022-06-20 14:47:29 +10:00
Rachel Arnould
40f3d4df4f Merge pull request #9312 from filipefurtad0/revert_9268_supplier_totals 
Splits results per supplier on OC Distributor Totals by Supplier report
v4.2.1 		2022-06-17 10:53:19 +02:00
Jean-Baptiste Bellet
049620add7 Update all locales with the latest Transifex translations 2022-06-17 09:33:01 +02:00
jibees
d7073c03d0 Merge pull request #9294 from openfoodfoundation/transifex 
Transifex
 2022-06-17 09:31:17 +02:00
jibees
19b57aa74e Merge pull request #9246 from jibees/9228-do-not-include-shipping-method-in-the-summary-row-for-Order-Cycle-Distributer-Totals-by-Supplier-report 
Do not include shipping method in the summary row for the Order Cycle Distributer Totals by Supplier report
 2022-06-17 09:30:31 +02:00
jibees
06685fb1c1 Merge pull request #9308 from jibees/update-yarn-lock 
Update yarn.lock
 2022-06-17 09:30:12 +02:00
neilnaveen
5c1bdc7698 chore: Set permissions for GitHub actions 
Restrict the GitHub token permissions only to the required ones; this way, even if the attackers will succeed in compromising your workflow, they won’t be able to do much.

- Included permissions for the action. https://github.com/ossf/scorecard/blob/main/docs/checks.md#token-permissions

https://docs.github.com/en/actions/using-workflows/workflow-syntax-for-github-actions#permissions

https://docs.github.com/en/actions/using-jobs/assigning-permissions-to-jobs

[Keeping your GitHub Actions and workflows secure Part 1: Preventing pwn requests](https://securitylab.github.com/research/github-actions-preventing-pwn-requests/)

Signed-off-by: neilnaveen <42328488+neilnaveen@users.noreply.github.com>
 2022-06-16 01:08:27 +00:00
filipefurtad0
0a70e091cd Reverts #9268 for supplier totals 2022-06-15 13:50:22 +01:00
Jean-Baptiste Bellet
7f52789dcf Update yarn.lock 2022-06-15 10:26:26 +02:00
jibees
df6e107dd3 Merge pull request #9305 from openfoodfoundation/dependabot/npm_and_yarn/storybook/addon-docs-6.5.9 
Bump @storybook/addon-docs from 6.5.7 to 6.5.9
 2022-06-15 09:09:38 +02:00
jibees
64cc6d21f1 Merge pull request #9307 from openfoodfoundation/dependabot/npm_and_yarn/storybook/addon-controls-6.5.9 
Bump @storybook/addon-controls from 6.5.7 to 6.5.9
 2022-06-15 09:09:26 +02:00
dependabot[bot]
f04c5bace1 Bump @storybook/addon-controls from 6.5.7 to 6.5.9 
Bumps [@storybook/addon-controls](https://github.com/storybookjs/storybook/tree/HEAD/addons/controls) from 6.5.7 to 6.5.9.
- [Release notes](https://github.com/storybookjs/storybook/releases)
- [Changelog](https://github.com/storybookjs/storybook/blob/v6.5.9/CHANGELOG.md)
- [Commits](https://github.com/storybookjs/storybook/commits/v6.5.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>
 2022-06-15 06:41:36 +00:00
dependabot[bot]
55f4f54e18 Bump @storybook/addon-docs from 6.5.7 to 6.5.9 
Bumps [@storybook/addon-docs](https://github.com/storybookjs/storybook/tree/HEAD/addons/docs) from 6.5.7 to 6.5.9.
- [Release notes](https://github.com/storybookjs/storybook/releases)
- [Changelog](https://github.com/storybookjs/storybook/blob/v6.5.9/CHANGELOG.md)
- [Commits](https://github.com/storybookjs/storybook/commits/v6.5.9/addons/docs)

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

Signed-off-by: dependabot[bot] <support@github.com>
 2022-06-15 06:41:29 +00:00
jibees
95586a0e38 Merge pull request #9306 from openfoodfoundation/dependabot/npm_and_yarn/storybook/server-6.5.9 
Bump @storybook/server from 6.5.7 to 6.5.9
 2022-06-15 08:40:47 +02:00
Jean-Baptiste Bellet
8ba8a95eb7 Convert key to sym, as it could be a string (in case of dynamic header) 
ie. the tax rate

Update specs to check this case when feature toggle is activated or not
 2022-06-14 15:39:06 +02:00
dependabot[bot]
d9f82ff619 Bump @storybook/server from 6.5.7 to 6.5.9 
Bumps [@storybook/server](https://github.com/storybookjs/storybook/tree/HEAD/app/server) from 6.5.7 to 6.5.9.
- [Release notes](https://github.com/storybookjs/storybook/releases)
- [Changelog](https://github.com/storybookjs/storybook/blob/v6.5.9/CHANGELOG.md)
- [Commits](https://github.com/storybookjs/storybook/commits/v6.5.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>
 2022-06-14 09:04:50 +00:00
Maikel
e733e9a5f8 Merge pull request #9300 from filipefurtad0/enterprise_factory_logo_promo 
Adds optional promo and logo images as traits to the enterprise factory
 2022-06-14 09:19:43 +10:00
filipefurtad0
464496befa Adds traits to enterprise_factory and spec 2022-06-13 16:40:55 +01:00
filipefurtad0
9c8756bf42 Makes the spec red: deletes file attachement from assertion 2022-06-13 16:26:09 +01:00
Filipe
ef0a346076 Merge pull request #9212 from jibees/9140-assign-a-customer-to-an-order-in-admin-section 
When creating an order, and assigning a customer, fill all the customer inputs in the shipping/billing address form
 2022-06-13 14:57:31 +01:00
Filipe
8b7d474f4c Merge pull request #9177 from jibees/9067-save-all-data-when-submitting-the-form 
Admin, Create a new product: re-fill the form with fields values if any validation errors occurs when submitting
 2022-06-13 14:54:02 +01:00
Jean-Baptiste Bellet
bf40e59bec Should link to order.distributor website 
- order: the order summary the customer is seeing on this page
 - current_order: the order is the customer is check-outing

+ add specs
 2022-06-13 14:52:20 +02:00
Jean-Baptiste Bellet
7920c1c4e8 Update Customers reports spec for feature report_inverse_columns_logic 2022-06-13 14:39:12 +02:00
Jean-Baptiste Bellet
16babf8250 Don't modify params object, but use an intermediate variable 
`@params_fields_to_show`
 2022-06-13 14:39:12 +02:00
Jean-Baptiste Bellet
214a470896 Remove the report Subtype selector in the Rendering Options section 
+ add all sub-reports in the index page
all of this is behind a feature toggle
 2022-06-13 14:39:12 +02:00
Transifex-Openfoodnetwork
8b1b9f1460 Updating translations for config/locales/en_GB.yml 2022-06-13 19:54:52 +10:00
Transifex-Openfoodnetwork
0335d8ac4f Updating translations for config/locales/fr_CH.yml 2022-06-11 00:52:56 +10:00
Transifex-Openfoodnetwork
91818a256b Updating translations for config/locales/de_CH.yml 2022-06-11 00:44:06 +10:00
Konrad
ba69a9fbeb Updated installation instructions 2022-06-10 15:36:43 +02:00