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
filipefurtad0
71b4a7d38e Moves/updates multilingual_spec into system 2021-11-01 14:57:58 +00:00
dependabot[bot]
9273e86b6b Bump mrujs from 0.5.11 to 0.6.0 
Bumps [mrujs](https://github.com/ParamagicDev/mrujs) from 0.5.11 to 0.6.0.
- [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.11...v0.6.0)

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

Signed-off-by: dependabot[bot] <support@github.com>
 2021-11-01 09:07:00 +00:00
Matt-Yorkley
636ca9987a Ignore StateMachines warnings in console output 
We *already* ignore them anyway, so this just removes the console noise.
 2021-10-29 18:59:08 +01:00
Matt-Yorkley
1007d7afdf Drop source_id and source_type columns from spree_adjustments 
These are no longer used
 2021-10-29 18:46:53 +01:00
Transifex-Openfoodnetwork
7afae8fc7a Updating translations for config/locales/ru.yml 2021-10-30 03:29:36 +11:00
Transifex-Openfoodnetwork
822d10983c Updating translations for config/locales/en_FR.yml 2021-10-30 03:29:33 +11:00
Transifex-Openfoodnetwork
5598967f1d Updating translations for config/locales/it.yml 2021-10-30 03:26:29 +11:00
Transifex-Openfoodnetwork
7f38f646ce Updating translations for config/locales/en_IE.yml 2021-10-30 03:26:27 +11:00
Matt-Yorkley
b0545c7fd3 Merge pull request #8431 from filipefurtad0/admin_specs_into_system 
Admin enterprise specs into system
 2021-10-29 16:10:31 +01:00
Matt-Yorkley
d75ebb8dab Merge pull request #8419 from drummer83/master 
Added blank space in "Address (contd.)"
 2021-10-29 16:09:01 +01:00
Matt-Yorkley
fafbc1c3cb Merge pull request #8410 from openfoodfoundation/dependabot/bundler/capybara-3.36.0 
Bump capybara from 3.35.3 to 3.36.0
 2021-10-29 14:45:38 +01:00
Matt-Yorkley
64d368a960 Merge pull request #8424 from openfoodfoundation/dependabot/npm_and_yarn/mrujs-0.5.11 
Bump mrujs from 0.5.10 to 0.5.11
 2021-10-29 14:40:20 +01:00
filipefurtad0
a1b094b015 Uses trigger.click to click elements outside visible area 2021-10-29 14:28:16 +01:00
filipefurtad0
ace761464e Moves/updates enteprises_spec into system 2021-10-29 14:28:16 +01:00
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
Thierry Jet
c8340d5c3b Add flatpickr_spec.rb to spec/system and add tests for datepicker in it. Use nth-last-child in tests. Modify test for datetimepicker to also select a datetime before closing and then check the value is correct after close occurred 2021-10-29 11:06:24 +02:00
Thierry Jet
8eff2716ed Modify choose_today_from_datepicker to avoid possible ambiguous match with the find 2021-10-29 11:06:24 +02:00
Matt-Yorkley
5316f7cd68 Remove Codecov 
We're still getting build errors related to CodeCov reports not being uploaded
 2021-10-29 10:02:13 +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
Matt-Yorkley
462ff15f76 Remove Enterprise #inheritance_column 
Apparently this was part of an old feature from 2014...
 2021-10-28 10:44:23 +01:00
dependabot[bot]
846629b7f2 Bump mrujs from 0.5.10 to 0.5.11 
Bumps [mrujs](https://github.com/ParamagicDev/mrujs) from 0.5.10 to 0.5.11.
- [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.10...v0.5.11)

---
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-28 09:04:55 +00: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
Konrad
1f422522a9 Update en.yml 2021-10-27 18:04:45 +02: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
Thierry Jet
41a7369b23 Add a test for datetimepicker close button usage 2021-10-26 19:51:28 +02:00
Thierry Jet
5ebee9cd5f Translation stuff ready for Close button. Add close: key scoped spree.admin.date_picker in en.yml 2021-10-26 19:38:49 +02:00
Thierry Jet
66f754267b Customize spacing for shortcut-buttons into flatpickr 2021-10-26 14:40:42 +02:00
Thierry Jet
47e9692226 Add a close button to datepicker. Close the popover when clicked. Not yet using translation 2021-10-26 14:36:16 +02:00
Thierry Jet
c45e120ff8 Add a close button to datetimepicker. Close the popover when clicked. Not yet using translation 2021-10-26 14:33:02 +02: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