raggedstaff/openfoodnetwork
1
0
Fork 0
mirror of https://github.com/openfoodfoundation/openfoodnetwork synced 2026-01-26 20:56:48 +00:00
Code Issues Packages Projects Releases Wiki Activity
22,453 Commits 18 Branches 451 Tags
a11cd901af6fa2fb3cbdc1907e700a0a0160c4fb
Commit Graph

22453 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
filipefurtad0
a11cd901af Moves/updates enteprise_user into system 2021-10-29 14:28:16 +01:00
filipefurtad0
222817d317 Moves/updates enteprise_roles into system 2021-10-29 14:28:16 +01:00
filipefurtad0
56888dd6b0 Moves/updates enteprise_relationships into system 2021-10-29 14:28:16 +01:00
filipefurtad0
6c24708aec Moves/updates enteprise_groups_spec into system 2021-10-29 14:28:16 +01:00
Matt-Yorkley
1942af4bb6 Update all locales with the latest Transifex translations v4.1.6 2021-10-29 14:23:11 +01:00
Matt-Yorkley
649380a99d Merge pull request #8393 from openfoodfoundation/transifex 
Transifex
 2021-10-29 14:15:12 +01:00
jibees
4447cc19bf Merge pull request #8432 from Matt-Yorkley/split-system-tests 
Break up system tests into two jobs
 2021-10-29 14:30:51 +02:00
Matt-Yorkley
1ad1e51bb6 Break up system tests into two jobs 2021-10-29 12:00:45 +01:00
Matt-Yorkley
b898598070 Merge pull request #8411 from openfoodfoundation/dependabot/bundler/pagy-5.1.2 
Bump pagy from 5.1.1 to 5.1.2
 2021-10-29 10:27:17 +01:00
Maikel
43514f61ea Merge pull request #8312 from mariodz95/8249_fix_snail_on_shipping_method_fees 
Fix snail on shipping method fees
 2021-10-29 12:04:25 +11:00
Maikel
e5c755e6ad Merge pull request #8395 from sinansonmez/7937-include-missing-navigation-for-super-admin-only 
Missing navigation for super admin users only included
 2021-10-29 12:03:48 +11:00
Maikel
03963c8feb Merge pull request #8415 from jibees/add-tax_category_id-to-adjustements 
API: add the tax_category_id for each ajustements of an order
 2021-10-29 12:02:59 +11:00
Maikel
1b79fdd333 Merge pull request #8409 from luisAzcuaga/task/rubocop 
[6055] Task: Run rubocop over existing todo
 2021-10-29 12:01:12 +11:00
Jean-Baptiste Bellet
fc8cd30cce Add the tax_category_id for each adjustement 
- This tax_category_id could be null
 - Special case if the originator is a Spree::TaxRate: then use the tax_category_id of the originator

Co-Authored-By: Matt-Yorkley <9029026+Matt-Yorkley@users.noreply.github.com>
 2021-10-28 15:04:43 +02:00
Matt-Yorkley
d1a91a53ea Merge pull request #8365 from lamphanqg/fix_menu_indicator 
Fix menu indicator on bulk order page
 2021-10-28 13:59:32 +01:00
Matt-Yorkley
f0ec739350 Merge pull request #8366 from lamphanqg/fix_bulk_buy_layout 
Fix broken layout of bulk buy
 2021-10-28 12:35:36 +01:00
Maikel
2e8f4c1538 Merge pull request #8367 from bellvat/bug-show-error 
Add test and change order_cycle#show to redirect to edit page.
 2021-10-28 16:36:47 +11:00
Maikel
514e2dde27 Merge pull request #8394 from georgethoppilshopify/master 
Fix about us paragraph breaks
 2021-10-28 16:36:12 +11:00
Luis Azcuaga
39b2cfca39 Update spec/system/consumer/shopping/shopping_spec.rb 
Co-authored-by: Maikel <maikel@email.org.au>
 2021-10-27 16:02:07 -05:00
Matt-Yorkley
074ae7ce40 Merge pull request #8417 from openfoodfoundation/dependabot/npm_and_yarn/mrujs-0.5.10 
Bump mrujs from 0.5.9 to 0.5.10
 2021-10-27 11:12:43 +01:00
dependabot[bot]
4e6f2bee84 Bump mrujs from 0.5.9 to 0.5.10 
Bumps [mrujs](https://github.com/ParamagicDev/mrujs) from 0.5.9 to 0.5.10.
- [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.5.9...v0.5.10)

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

Signed-off-by: dependabot[bot] <support@github.com>
 2021-10-27 09:07:09 +00:00
Maikel
866c3d6276 Merge pull request #8413 from openfoodfoundation/dependabot/npm_and_yarn/karma-6.3.6 
Bump karma from 6.3.5 to 6.3.6
 2021-10-27 14:35:54 +11:00
Maikel
509bdd845b Merge pull request #8408 from Matt-Yorkley/remove-dalli-gem 
Remove dalli gem
 2021-10-27 14:13:02 +11:00
Maikel
40aac6a21b Merge pull request #8386 from jibees/download-artifact 
Archive failed tests screenshots
 2021-10-27 14:03:49 +11:00
Matt-Yorkley
49efb3bd6e Merge pull request #8412 from openfoodfoundation/revert-8261-bump-aws-sdk 
Revert "Bump aws-sdk to 2.2.0"
v4.1.5 		2021-10-26 13:10:54 +01:00
dependabot[bot]
becbdd6e67 Bump karma from 6.3.5 to 6.3.6 
Bumps [karma](https://github.com/karma-runner/karma) from 6.3.5 to 6.3.6.
- [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.5...v6.3.6)

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

Signed-off-by: dependabot[bot] <support@github.com>
 2021-10-26 09:05:16 +00:00
dependabot[bot]
c0f8175519 Bump pagy from 5.1.1 to 5.1.2 
Bumps [pagy](https://github.com/ddnexus/pagy) from 5.1.1 to 5.1.2.
- [Release notes](https://github.com/ddnexus/pagy/releases)
- [Changelog](https://github.com/ddnexus/pagy/blob/master/CHANGELOG.md)
- [Commits](https://github.com/ddnexus/pagy/compare/5.1.1...5.1.2)

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

Signed-off-by: dependabot[bot] <support@github.com>
 2021-10-26 09:03:21 +00:00
jibees
8d1f750a3a Revert "Bump aws-sdk to 2.2.0" 2021-10-26 10:16:50 +02:00
Luis Azcuaga
e8fd89a6d2 Run rubocop over existing todo 2021-10-25 21:28:28 -05:00
PHAN QUANG LAM
77524c633d Fix menu indicator on bulk order page 2021-10-26 06:41:30 +09:00
Matt-Yorkley
6f2fe06c27 Merge pull request #8388 from openfoodfoundation/dependabot/bundler/webdrivers-5.0.0 
Bump webdrivers from 4.7.0 to 5.0.0
 2021-10-25 19:48:29 +01:00
Matt-Yorkley
f204b43487 Merge pull request #8407 from filipefurtad0/enterprise_fees_into_system 
Updates/moves enterprise_fees into system
 2021-10-25 19:45:26 +01:00
Matt-Yorkley
ec74567657 Merge pull request #8406 from filipefurtad0/bulk_product_update_into_system 
Updates/moves bulk_product_update into system
 2021-10-25 19:45:06 +01:00
Matt-Yorkley
303c658080 Merge pull request #8404 from filipefurtad0/bulk_order_management_into_system 
Moves/updates bulk_order_management spec into system
 2021-10-25 19:44:20 +01:00
Matt-Yorkley
889e8a969b Merge pull request #8402 from filipefurtad0/adjustments_into_system 
Moves/updates adjustments_spec into system
 2021-10-25 19:43:54 +01:00
Matt-Yorkley
edcc091a60 Merge pull request #8400 from filipefurtad0/reports_into_system 
Reports into system specs
 2021-10-25 19:41:45 +01:00
Matt-Yorkley
32d7be7779 Merge pull request #8396 from openfoodfoundation/dependabot/bundler/pagy-5.1.1 
Bump pagy from 5.0.1 to 5.1.1
 2021-10-25 19:37:43 +01:00
Matt-Yorkley
26c9d6d3ad Merge pull request #8397 from openfoodfoundation/dependabot/bundler/json-2.6.1 
Bump json from 2.6.0 to 2.6.1
 2021-10-25 19:37:07 +01:00
Matt-Yorkley
57a4c0d156 Merge pull request #8390 from openfoodfoundation/dependabot/bundler/view_component-2.41.0 
Bump view_component from 2.40.0 to 2.41.0
 2021-10-25 19:00:45 +01:00
Matt-Yorkley
36c5e6250a Merge pull request #8392 from openfoodfoundation/dependabot/bundler/rubocop-1.22.2 
Bump rubocop from 1.22.1 to 1.22.2
 2021-10-25 18:59:31 +01:00
dependabot[bot]
057e605800 Bump webdrivers from 4.7.0 to 5.0.0 
Bumps [webdrivers](https://github.com/titusfortner/webdrivers) from 4.7.0 to 5.0.0.
- [Release notes](https://github.com/titusfortner/webdrivers/releases)
- [Changelog](https://github.com/titusfortner/webdrivers/blob/main/CHANGELOG.md)
- [Commits](https://github.com/titusfortner/webdrivers/compare/v4.7.0...v5.0.0)

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

Signed-off-by: dependabot[bot] <support@github.com>
 2021-10-25 17:54:34 +00:00
Matt-Yorkley
902ed6f3e1 Merge pull request #8389 from openfoodfoundation/dependabot/npm_and_yarn/karma-6.3.5 
Bump karma from 6.3.4 to 6.3.5
 2021-10-25 18:53:49 +01:00
Matt-Yorkley
df370ed17b Merge pull request #8387 from openfoodfoundation/dependabot/bundler/selenium-webdriver-4.0.3 
Bump selenium-webdriver from 4.0.2 to 4.0.3
 2021-10-25 18:52:32 +01:00
Matt-Yorkley
af53838e83 Remove dalli gem 
Dalli is a wrapper around memcached, which we previously removed.
 2021-10-25 18:40:16 +01:00
filipefurtad0
143e63182c Updates/moves enterprise_fees into system 2021-10-25 17:23:47 +01:00
filipefurtad0
f9beec6b7a Updates/moves bulk_product_update into system 2021-10-25 17:15:06 +01:00
filipefurtad0
d08f9ea817 Updates/moves adjustments spec into system 2021-10-25 17:06:48 +01:00
filipefurtad0
6d52543e47 Moves/updates bulk_order_management spec into system 2021-10-25 15:26:45 +01:00
jibees
5fa5497c2f Merge pull request #8403 from filipefurtad0/authentication_into_system 
Moves/updates authentication_spec into system
 2021-10-25 14:33:19 +02:00
filipefurtad0
bb1f875ea5 Moves/updates authentication_spec into system 2021-10-25 13:00:45 +01:00