raggedstaff/openfoodnetwork
1
0
Fork 0
mirror of https://github.com/openfoodfoundation/openfoodnetwork synced 2026-02-11 23:17:48 +00:00
Code Issues Packages Projects Releases Wiki Activity
31,419 Commits 19 Branches 453 Tags
20fb38da963f3d2cfc7324e2d14beeba172e4c53
Commit Graph

31419 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
filipefurtad0
20fb38da96 Adds tests around using the page 
- with no products

- column display dropdown

- listing products with several variants
 2024-06-17 14:56:22 +02:00
Maikel Linke
44a296691a Clearer naming of helper method 2024-06-17 14:56:22 +02:00
Maikel Linke
4b4ae8c7ba Allow only enterprise managers to connect apps 
Otherwise it doesn't work because non-managers, like super admins, are
not authorised to access enterprise data via the DFC API.
 2024-06-17 14:56:22 +02:00
Cillian O'Ruanaidh
36b1c2bd83 Remove redundant spec type offence from MapHelper spec 2024-06-17 14:56:22 +02:00
Cillian O'Ruanaidh
b428450cf8 Make sure OSM map is not enabled in test environment in case it abuses OSM tile servers 2024-06-17 14:56:22 +02:00
Cillian O'Ruanaidh
6dcb182c31 Add tests to make sure the appropriate map is loaded e.g. Open Street Map or Google 2024-06-17 14:56:22 +02:00
Cillian O'Ruanaidh
87fe5f413b Get registration location map working with OSM 2024-06-17 14:56:22 +02:00
Maikel Linke
f4a69b4664 Update locales 2024-05-31 12:16:18 +10:00
Maikel
c0690d51e5 Merge pull request #12530 from openfoodfoundation/dependabot/bundler/rack-timeout-0.7.0 
chore(deps): bump rack-timeout from 0.6.3 to 0.7.0
 2024-05-31 09:42:30 +10:00
Filipe
9eaf6c3b9c Merge pull request #12489 from mkllnk/available-locales 
More realistic test env for translations
 2024-05-30 15:00:36 +02:00
Filipe
a01dcaadcf Merge pull request #12506 from anansilva/12448-sanitise-html-enterprise-group 
Sanitise HTML in long description of enterprise group [read-only]
 2024-05-30 14:07:20 +02:00
dependabot[bot]
6dee200938 chore(deps): bump rack-timeout from 0.6.3 to 0.7.0 
Bumps [rack-timeout](https://github.com/zombocom/rack-timeout) from 0.6.3 to 0.7.0.
- [Changelog](https://github.com/zombocom/rack-timeout/blob/main/CHANGELOG.md)
- [Commits](https://github.com/zombocom/rack-timeout/compare/v0.6.3...v0.7.0)

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

Signed-off-by: dependabot[bot] <support@github.com>
 2024-05-29 09:35:40 +00:00
Gaetan Craig-Riou
c81e7f3b5d Update all locales with the latest Transifex translations v4.4.48 2024-05-29 14:19:54 +10:00
Gaetan Craig-Riou
0e9b753bbc Merge pull request #12514 from cyrillefr/RedundantPresenceValidationOnBelongs_part_V 
Fix redundant presence validation on belongs part V
 2024-05-29 09:57:22 +10:00
Maikel
5f137c19a3 Merge pull request #12527 from openfoodfoundation/dependabot/bundler/view_component-3.12.1 
chore(deps): bump view_component from 3.12.0 to 3.12.1
 2024-05-29 08:47:53 +10:00
dependabot[bot]
8421c35e42 chore(deps): bump view_component from 3.12.0 to 3.12.1 
Bumps [view_component](https://github.com/viewcomponent/view_component) from 3.12.0 to 3.12.1.
- [Release notes](https://github.com/viewcomponent/view_component/releases)
- [Changelog](https://github.com/ViewComponent/view_component/blob/main/docs/CHANGELOG.md)
- [Commits](https://github.com/viewcomponent/view_component/compare/v3.12.0...v3.12.1)

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

Signed-off-by: dependabot[bot] <support@github.com>
 2024-05-28 09:59:37 +00:00
Gaetan Craig-Riou
6f5bcda421 Merge pull request #12523 from openfoodfoundation/dependabot/bundler/webmock-3.23.1 
chore(deps-dev): bump webmock from 3.23.0 to 3.23.1
 2024-05-28 10:02:00 +10:00
dependabot[bot]
f70dd58533 chore(deps-dev): bump webmock from 3.23.0 to 3.23.1 
Bumps [webmock](https://github.com/bblimke/webmock) from 3.23.0 to 3.23.1.
- [Changelog](https://github.com/bblimke/webmock/blob/master/CHANGELOG.md)
- [Commits](https://github.com/bblimke/webmock/compare/v3.23.0...v3.23.1)

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

Signed-off-by: dependabot[bot] <support@github.com>
 2024-05-27 09:50:38 +00:00
David Cook
a405f17c0b Merge pull request #12510 from cyrillefr/RemoveUnusedMissingIdsCheckRakeTasks 
Deleting some used one-shot rake tasks
 2024-05-27 13:53:21 +10:00
Gaetan Craig-Riou
a64bf68d54 Merge pull request #12517 from openfoodfoundation/dependabot/bundler/knapsack_pro-7.4.0 
chore(deps-dev): bump knapsack_pro from 7.2.0 to 7.4.0
 2024-05-27 10:11:25 +10:00
dependabot[bot]
9cd5f5aaa0 chore(deps-dev): bump knapsack_pro from 7.2.0 to 7.4.0 
Bumps [knapsack_pro](https://github.com/KnapsackPro/knapsack_pro-ruby) from 7.2.0 to 7.4.0.
- [Changelog](https://github.com/KnapsackPro/knapsack_pro-ruby/blob/master/CHANGELOG.md)
- [Commits](https://github.com/KnapsackPro/knapsack_pro-ruby/compare/v7.2.0...v7.4.0)

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

Signed-off-by: dependabot[bot] <support@github.com>
 2024-05-24 09:13:06 +00:00
filipefurtad0
0bfa9fe997 Update all locales with the latest Transifex translations v4.4.47 2024-05-24 09:49:20 +01:00
cyrillefr
5bc6d16f34 Fix redundant presence validation on belongs part V 
- presence: true is redundant since Rails 5.0 BUT applies
   with new default config of
   belongs_to_required_by_default to true.
   Lots of files with belongs_to_required_by_default = false
   (backward compatibility).
   So: deleting this setting implies to adding optional: true
 2024-05-24 08:22:20 +02:00
Maikel
5b9e83745d Merge pull request #12508 from mkllnk/schema 
Fixup db schema.rb
 2024-05-24 08:19:31 +10:00
Filipe
88baf5e1de Merge pull request #12496 from isidzukuri/12355-remove-unused-discourse 
[12355] Remove discourse
 2024-05-23 19:28:02 +01:00
Filipe
5455e68620 Merge pull request #12504 from dacook/buu/edit-image-turbo-12399 
[BUU] Remove StimulusReflex from Image Edit
 2024-05-23 17:32:59 +01:00
Rachel Arnould
163e9b6c9c Merge pull request #12505 from filipefurtad0/remove_deprecation 
Removes deprecation strikethrough from tax report (by producer)
 2024-05-23 17:14:28 +02:00
cyrillefr
8c0e20f53c Deleting some used one-shot rake taskes 
- in relation to: Fix Rubocop Rails issues #11482
 - and  Require belongs_to associations by default #11297
 - and #12407 #12428 etc.
 2024-05-23 10:07:56 +02:00
Maikel Linke
b9c7be769a Fixup db schema.rb 
It looks like I forgot to commit the latest change in 46cd60aa3c.
 2024-05-23 15:51:43 +10:00
Maikel Linke
968456e5e0 Create special locale for test environment 
So hopefully we'll notice if our fallback mechanism fails.
 2024-05-23 15:10:24 +10:00
Maikel Linke
f14945c155 More realistic test env for translations 
Most production servers don't use the source locale `en`. Even if the
default language is English, they use a local variant like `en_AU` or
`en_GB` to customise some of the translations.

However the environment is configured, the app should always fallback to
`en` if no other translation is available.
 2024-05-23 15:08:11 +10:00
David Cook
e30dc1b05c Merge pull request #12493 from cyrillefr/RedundantPresenceValidationOnBelongs_part_IV 
Fix RedundantPresenceValidationOnBelongs on two files
 2024-05-23 13:09:17 +10:00
David Cook
55ac816a87 Show success message 
Phew, that was really easy.
And now the existing feature spec still Just Works.
 2024-05-23 11:55:56 +10:00
David Cook
05f0b93548 Use requestSubmit to allow JS events 
Yay, now it works. Not sure the best way to show loading yet.
- currently the Turbo loading indicator shows which is better than nothing (blue bar at top)
- ideally we could show a small spinner over the image thumbnail. need to write some stimulus to hook into turbo lifecycle I guess.
- or we could activate the frame-level loading overlay. refactor loading_controller a bit so that it's applied on the container, then hopefully  we can just call  change->loading#showLoading. the turbo_stream response could dectivate it.
 2024-05-23 11:55:33 +10:00
David Cook
665273ce2f [wip] Attempt to update edited image in-place with Turbo Stream 
but it doesn't quite work.

Maybe we can force it with JS (https://www.writesoftwarewell.com/process-turbo-stream-javascript/)
 2024-05-23 11:55:29 +10:00
David Cook
0e03ff6925 Merge branch 'master' into RedundantPresenceValidationOnBelongs_part_IV 2024-05-23 09:22:36 +10:00
Maikel
74cfa42461 Merge pull request #12465 from MrBowmanXD/mirror 
Allow return or line break in shipping / payment method description
 2024-05-23 09:10:13 +10:00
Maikel Linke
be79016753 Remove now obsolete check in rake task 2024-05-23 09:08:05 +10:00
Maikel
32eb9c5504 Merge pull request #12481 from mkllnk/connect-app-once 
Avoid submitting duplicate Connected Apps
 2024-05-23 08:50:34 +10:00
Manuel Gonçalves
2bc481d8f7 Merge branch 'master' into mirror 2024-05-22 23:35:45 +01:00
Ana Nunes da Silva
73218fab05 Sanitize read and write long description in enterprise group 2024-05-22 22:40:24 +01:00
Filipe
b4d4faafc0 Merge pull request #12472 from dacook/bump-stimulus_reflex-cable_ready 
Bump stimulus_reflex to 3.5.1 and cable_ready to 5.0.5
 2024-05-22 21:37:42 +01:00
Filipe
1130bf8cbe Merge pull request #12460 from mkllnk/enterprise-data-purge 
Clean up unused enterprise fields
 2024-05-22 21:29:54 +01:00
filipefurtad0
5ccecdd9ff Removes deprecation strikethrough from enterprise fees with tax report by producer 2024-05-22 20:38:11 +01:00
cyrillefr
46cd60aa3c Fix RedundantPresenceValidationOnBelongs on two files 
- presence: true is redundant since Rails 5.0 BUT applies
       with new default config of
       belongs_to_required_by_default to true.
       Lots of files with belongs_to_required_by_default = false
       (backward compatibility).
       So: deleting this setting implies to adding optional: true
     - added 'NOT NULL' constraints so model constraints match
       with contraints on DB tables.
     - corresponding migration files to match AR Models &
       DB tables
     - rake tasks to check corrupt data (ie: NULL/nil in id fields)
     - updated the todo
 2024-05-22 09:44:02 +02:00
David Cook
536b5608ab Show edit form for new images 2024-05-22 17:08:58 +10:00
David Cook
3fcc9ac1fa Move product image edit modal to Turbo Stream 
Didn't even need to touch the controller, because data-turbo-stream tells it to render the turbo_stream format ✨

But you might notice that it doesn't redirect to the right return_url yet. Let's see if we can use more Turbo to avoid the page refresh..

TODO: also handle empty images
 2024-05-22 17:08:58 +10:00
David Cook
b935a0e8d9 [add gem] turbo-rails 
This gives us a nice 'turbo_stream' format helper.
 2024-05-22 15:07:16 +10:00
Maikel
5fdea3e8ce Merge pull request #12502 from dacook/specs 
Break up large spec files
 2024-05-22 13:39:02 +10:00
Maikel
9d453a82ed Merge pull request #12494 from filipefurtad0/update_paypal_checkout_system_spec 
Updates Paypal system spec to consider new checkout flow
 2024-05-22 10:17:06 +10:00