raggedstaff/openfoodnetwork
1
0
Fork 0
mirror of https://github.com/openfoodfoundation/openfoodnetwork synced 2026-02-14 23:47:48 +00:00
Code Issues Packages Projects Releases Wiki Activity
21,853 Commits 19 Branches 453 Tags
fe99a5cc55a2466dfac9c6efeecb66bf9000ffa0
Commit Graph

21853 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Matt-Yorkley
fe99a5cc55 Merge pull request #8129 from Matt-Yorkley/searchable 
Searchable attributes
 2021-09-03 09:43:25 +02:00
Matt-Yorkley
72d494c640 Merge pull request #8127 from Matt-Yorkley/session-uri-parsing 
Strip subdomains from session cookie host
 2021-09-03 09:38:11 +02:00
Matt-Yorkley
fbdc38b6c4 Merge pull request #8111 from jibees/4582-remove-units-on-quantity-column- 
Display variant quantity on the quantity column on the edit order page in backoffice
 2021-09-02 20:45:22 +02:00
Matt-Yorkley
0459071ce3 Set RAILS_ENV=test in test suite 2021-09-02 17:29:26 +01:00
Matt-Yorkley
dc8939c35f Strip subdomains from session cookie host 2021-09-02 17:29:26 +01:00
Matt-Yorkley
3fc0278776 Whitelist searchable attributes on primary models 2021-09-02 14:06:15 +01:00
Matt-Yorkley
b25759670e Implement ransackable whitelisting 2021-09-02 13:43:22 +01:00
Matt-Yorkley
fd8de65749 Merge pull request #8123 from openfoodfoundation/dependabot/bundler/view_component-2.39.0 
Bump view_component from 2.38.0 to 2.39.0
 2021-09-01 16:52:05 +02:00
Matt-Yorkley
cab470bd86 Merge pull request #8122 from openfoodfoundation/dependabot/npm_and_yarn/tar-6.1.11 
Bump tar from 6.1.5 to 6.1.11
 2021-09-01 16:51:00 +02:00
dependabot[bot]
6d16b66a76 Bump view_component from 2.38.0 to 2.39.0 
Bumps [view_component](https://github.com/github/view_component) from 2.38.0 to 2.39.0.
- [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.38.0...v2.39.0)

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

Signed-off-by: dependabot[bot] <support@github.com>
 2021-09-01 09:03:48 +00:00
dependabot[bot]
cd75fcf6c2 Bump tar from 6.1.5 to 6.1.11 
Bumps [tar](https://github.com/npm/node-tar) from 6.1.5 to 6.1.11.
- [Release notes](https://github.com/npm/node-tar/releases)
- [Changelog](https://github.com/npm/node-tar/blob/main/CHANGELOG.md)
- [Commits](https://github.com/npm/node-tar/compare/v6.1.5...v6.1.11)

---
updated-dependencies:
- dependency-name: tar
  dependency-type: indirect
...

Signed-off-by: dependabot[bot] <support@github.com>
 2021-08-31 23:01:16 +00:00
Matt-Yorkley
aaf45afbfe Merge pull request #8090 from Matt-Yorkley/session-storage 
Allow sessions to work across subdomains
 2021-08-31 22:11:44 +02:00
Matt-Yorkley
c72e0f7268 Merge pull request #8117 from openfoodfoundation/dependabot/bundler/rack-mini-profiler-2.3.3 
Bump rack-mini-profiler from 2.3.2 to 2.3.3
 2021-08-31 10:15:30 +02:00
dependabot[bot]
2554083557 Bump rack-mini-profiler from 2.3.2 to 2.3.3 
Bumps [rack-mini-profiler](https://github.com/MiniProfiler/rack-mini-profiler) from 2.3.2 to 2.3.3.
- [Release notes](https://github.com/MiniProfiler/rack-mini-profiler/releases)
- [Changelog](https://github.com/MiniProfiler/rack-mini-profiler/blob/master/CHANGELOG.md)
- [Commits](https://github.com/MiniProfiler/rack-mini-profiler/compare/v2.3.2...v2.3.3)

---
updated-dependencies:
- dependency-name: rack-mini-profiler
  dependency-type: direct:development
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
 2021-08-30 09:03:59 +00:00
Andy Brett
ca7da94fd8 Merge pull request #8088 from jibees/8087-select-unselect-orders-in-admin 
Handle select/unselect all orders in the admin orders page
 2021-08-28 11:34:20 -07:00
Jean-Baptiste Bellet
5c05be22f5 As it is a quantity column, display variant quantity 
(this column was confused, and was understood like a simply quantity column not the item quantity separated according to its "state")

Update specs as well
 2021-08-27 15:15:14 +02:00
Andy Brett
e833921d2f Merge pull request #8106 from andrewpbrett/remove-codecov 
Remove codecov
 2021-08-26 10:37:49 -07:00
Andy Brett
2d511c6d18 Merge pull request #8044 from apricot12/Undo_reversing_of_email_copy_paste 
Allow copy paste of email from contact tab and footer without reversing
 2021-08-26 10:02:09 -07:00
Andy Brett
3fcce8574e Merge pull request #8040 from guidoDutra/7627-prevent-removing-last-item-in-order 
Prevent removing last item in order
 2021-08-26 10:01:42 -07:00
Andy Brett
3fad554dbd remove codecov 2021-08-25 17:24:11 -07:00
Matt-Yorkley
c0cd68a747 Merge pull request #8084 from openfoodfoundation/dependabot/bundler/pagy-4.11.0 
Bump pagy from 4.10.2 to 4.11.0
 2021-08-24 23:48:13 +02:00
Andy Brett
50395d3142 Merge pull request #8096 from openfoodfoundation/dependabot/bundler/sidekiq-6.2.2 
Bump sidekiq from 6.2.1 to 6.2.2
 2021-08-24 13:25:59 -07:00
dependabot[bot]
43072dcfcd Bump sidekiq from 6.2.1 to 6.2.2 
Bumps [sidekiq](https://github.com/mperham/sidekiq) from 6.2.1 to 6.2.2.
- [Release notes](https://github.com/mperham/sidekiq/releases)
- [Changelog](https://github.com/mperham/sidekiq/blob/master/Changes.md)
- [Commits](https://github.com/mperham/sidekiq/compare/v6.2.1...v6.2.2)

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

Signed-off-by: dependabot[bot] <support@github.com>
 2021-08-24 09:04:07 +00:00
jibees
13e32149c1 Merge pull request #8093 from openfoodfoundation/dependabot/bundler/webpacker-5.4.2 
Bump webpacker from 5.4.0 to 5.4.2
 2021-08-24 10:33:13 +02:00
jibees
6766801aed Merge pull request #8094 from openfoodfoundation/dependabot/npm_and_yarn/rails/webpacker-5.4.2 
Bump @rails/webpacker from 5.4.0 to 5.4.2
 2021-08-24 10:32:46 +02:00
Andy Brett
1399171cc2 Merge pull request #8085 from openfoodfoundation/dependabot/bundler/webdrivers-4.6.1 
Bump webdrivers from 4.6.0 to 4.6.1
 2021-08-23 13:23:16 -07:00
Andy Brett
185493f846 Merge pull request #8077 from openfoodfoundation/dependabot/bundler/codecov-0.6.0 
Bump codecov from 0.5.2 to 0.6.0
 2021-08-23 13:22:18 -07:00
Andy Brett
4b79ee5f68 Merge pull request #8078 from openfoodfoundation/dependabot/bundler/rubocop-1.19.1 
Bump rubocop from 1.19.0 to 1.19.1
 2021-08-23 13:22:04 -07:00
Andy Brett
e8873ccb4f Merge pull request #8092 from filipefurtad0/improve_oc_spec 
Sets OC-times in relation to the Zone time
 2021-08-23 12:29:53 -07:00
dependabot[bot]
031b93af5e Bump @rails/webpacker from 5.4.0 to 5.4.2 
Bumps [@rails/webpacker](https://github.com/rails/webpacker) from 5.4.0 to 5.4.2.
- [Release notes](https://github.com/rails/webpacker/releases)
- [Changelog](https://github.com/rails/webpacker/blob/v5.4.2/CHANGELOG.md)
- [Commits](https://github.com/rails/webpacker/compare/v5.4.0...v5.4.2)

---
updated-dependencies:
- dependency-name: "@rails/webpacker"
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
 2021-08-23 09:06:00 +00:00
dependabot[bot]
9aa6cf7804 Bump webpacker from 5.4.0 to 5.4.2 
Bumps [webpacker](https://github.com/rails/webpacker) from 5.4.0 to 5.4.2.
- [Release notes](https://github.com/rails/webpacker/releases)
- [Changelog](https://github.com/rails/webpacker/blob/master/CHANGELOG.md)
- [Commits](https://github.com/rails/webpacker/compare/v5.4.0...v5.4.2)

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

Signed-off-by: dependabot[bot] <support@github.com>
 2021-08-23 09:02:13 +00:00
jibees
67f04856a8 Merge pull request #8083 from openfoodfoundation/dependabot/bundler/rails-6.1.4.1 
Bump rails from 6.1.4 to 6.1.4.1
 2021-08-23 09:42:15 +02:00
Matt-Yorkley
39372f7bd7 Update cookies policy notes and related spec 
The session cookie is now named `_ofn_session_id` instead of `_session_id`.
 2021-08-22 15:57:43 +01:00
Matt-Yorkley
1d472d0dec Add Rack Middleware for transitioning existing sessions 
This checks if the current request has been submitted using the old session key (_session_id) and transparently migrates the session id to a new session cookie with the new settings and the new key (_ofn_session_id).
 2021-08-22 15:57:43 +01:00
Matt-Yorkley
e6ac57ac3a Migrate session cookies to new setup 
Currently sessions set on (www.openfoodnetwork.xxx) are not usable on the bare domain (openfoonetwork.xxx). When transitioning from one to the other, the user's session is completely lost.

This change means sessions on subdomains (including www) will be transferable.
 2021-08-22 15:53:41 +01:00
filipefurtad0
cd16e8527c Sets OC-times in relation to the Zone time 2021-08-21 19:13:26 +01:00
Matt-Yorkley
697a073330 Merge pull request #8060 from Matt-Yorkley/script-split 
Maps and AMS conditional loading
 2021-08-21 16:35:46 +02:00
Jean-Baptiste Bellet
8fe0a82b75 Change ng-click to ng-change to capture ng-model updated value 
- Create a feature test for this feature
 2021-08-20 15:18:09 +02:00
Nihal Mohammed
92ecdb4163 Add Angular directive to undo reverse of email 2021-08-20 18:34:42 +05:30
dependabot[bot]
bd190145f6 Bump webdrivers from 4.6.0 to 4.6.1 
Bumps [webdrivers](https://github.com/titusfortner/webdrivers) from 4.6.0 to 4.6.1.
- [Release notes](https://github.com/titusfortner/webdrivers/releases)
- [Changelog](https://github.com/titusfortner/webdrivers/blob/master/CHANGELOG.md)
- [Commits](https://github.com/titusfortner/webdrivers/compare/v4.6.0...v4.6.1)

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

Signed-off-by: dependabot[bot] <support@github.com>
 2021-08-20 09:04:50 +00:00
dependabot[bot]
d41cd695a8 Bump pagy from 4.10.2 to 4.11.0 
Bumps [pagy](https://github.com/ddnexus/pagy) from 4.10.2 to 4.11.0.
- [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/4.10.2...4.11.0)

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

Signed-off-by: dependabot[bot] <support@github.com>
 2021-08-20 09:03:47 +00:00
dependabot[bot]
3f6251fa29 Bump rails from 6.1.4 to 6.1.4.1 
Bumps [rails](https://github.com/rails/rails) from 6.1.4 to 6.1.4.1.
- [Release notes](https://github.com/rails/rails/releases)
- [Commits](https://github.com/rails/rails/compare/v6.1.4...v6.1.4.1)

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

Signed-off-by: dependabot[bot] <support@github.com>
 2021-08-20 09:02:58 +00:00
Nihal Mohammed
d2dcfa5848 Undo changes 2021-08-20 13:15:44 +05:30
dependabot[bot]
b3deaa65f6 Bump rubocop from 1.19.0 to 1.19.1 
Bumps [rubocop](https://github.com/rubocop/rubocop) from 1.19.0 to 1.19.1.
- [Release notes](https://github.com/rubocop/rubocop/releases)
- [Changelog](https://github.com/rubocop/rubocop/blob/master/CHANGELOG.md)
- [Commits](https://github.com/rubocop/rubocop/compare/v1.19.0...v1.19.1)

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

Signed-off-by: dependabot[bot] <support@github.com>
 2021-08-19 09:03:16 +00:00
dependabot[bot]
26143980b3 Bump codecov from 0.5.2 to 0.6.0 
Bumps [codecov](https://github.com/codecov/codecov-ruby) from 0.5.2 to 0.6.0.
- [Release notes](https://github.com/codecov/codecov-ruby/releases)
- [Changelog](https://github.com/codecov/codecov-ruby/blob/master/CHANGELOG.md)
- [Commits](https://github.com/codecov/codecov-ruby/compare/v0.5.2...v0.6.0)

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

Signed-off-by: dependabot[bot] <support@github.com>
 2021-08-19 09:02:23 +00:00
Andy Brett
68311f8fa4 Merge pull request #8073 from openfoodfoundation/dependabot/bundler/pagy-4.10.2 
Bump pagy from 4.10.1 to 4.10.2
 2021-08-18 09:47:37 -07:00
Guido Oliveira
b1cd163900 Prevent removing last item in order 2021-08-18 12:00:32 -03:00
dependabot[bot]
828e06b271 Bump pagy from 4.10.1 to 4.10.2 
Bumps [pagy](https://github.com/ddnexus/pagy) from 4.10.1 to 4.10.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/4.10.1...4.10.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-08-18 09:01:48 +00:00
Andy Brett
f783926deb Merge pull request #8063 from openfoodfoundation/dependabot/bundler/bullet-6.1.5 
Bump bullet from 6.1.4 to 6.1.5
 2021-08-17 10:30:00 -07:00
Andy Brett
28c1ba1ad4 Merge pull request #8062 from openfoodfoundation/dependabot/bundler/ffaker-2.19.0 
Bump ffaker from 2.18.0 to 2.19.0
 2021-08-17 10:29:18 -07:00