raggedstaff/openfoodnetwork
1
0
Fork 0
mirror of https://github.com/openfoodfoundation/openfoodnetwork synced 2026-02-17 00:07:24 +00:00
Code Issues Packages Projects Releases Wiki Activity
28,564 Commits 15 Branches 453 Tags
2b9b79c8281d3370d480ee0260dc4fffadc2adf1
Commit Graph

28564 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Matt-Yorkley
2b9b79c828 Remove product display_as cell 
This was attempting to reference the master variant, which is now gone. Fixes an Angular scope error.
 2023-08-18 17:38:36 +02:00
Konrad
f3b09508ff Merge pull request #11347 from abdellani/fix-edit-order-button 
fix cancel order button
 2023-08-18 17:07:42 +02:00
Konrad
d8bc479a70 Merge pull request #11387 from jibees/10957-missing-translation-invalid-url 
Admin, White Label: add translation for invalid URL in white label context
 2023-08-18 15:59:39 +02:00
jibees
5395bc56f8 Merge pull request #11416 from jibees/11197-buu-no-results-page-and-number-of-results-tweaks 
🚧 BUU: No results page and number of results tweaks
 2023-08-18 10:14:09 +02:00
Jean-Baptiste Bellet
06fccd8618 Totally hide input above its container 2023-08-18 09:46:57 +02:00
Jean-Baptiste Bellet
47115a0daf Change default label for searched products 2023-08-18 09:46:57 +02:00
Jean-Baptiste Bellet
721baa4d3f Increase button size 2023-08-18 09:46:57 +02:00
Jean-Baptiste Bellet
117c373985 Add "remove-sign" icon before text in disruptive button 2023-08-18 09:46:57 +02:00
Jean-Baptiste Bellet
d27b2084ed Do not underline text when it's a button 2023-08-18 09:46:56 +02:00
Jean-Baptiste Bellet
e4479e7935 Increase button height when no result 2023-08-18 09:46:56 +02:00
Jean-Baptiste Bellet
f5e7738c78 Introduce relaxed, regular and condensed button for specify height 2023-08-18 09:46:56 +02:00
Jean-Baptiste Bellet
5de0d79ca2 Increase distance from search container to 136px 
116px + 20px (gap) = 136px
 2023-08-18 09:46:56 +02:00
Jean-Baptiste Bellet
4219d0aa08 Change font size and weight 2023-08-18 09:46:56 +02:00
Maikel Linke
0acdf5833f Update all locales with the latest Transifex translations v4.4.8 2023-08-18 15:54:00 +10:00
David Cook
01f0de2f4e Merge pull request #11405 from macanudo527/fix_rubocop_rails_errors 
Fix rubocop rails errors
 2023-08-18 11:54:17 +10:00
David Cook
7a04f63d62 Merge pull request #11407 from jibees/10878-buu-pagination-tweaks 
🚧 BUU: Pagination tweaks
 2023-08-18 09:25:55 +10:00
jibees
e82ff80582 Merge pull request #11420 from openfoodfoundation/dependabot/bundler/newrelic_rpm-9.4.1 
chore(deps): bump newrelic_rpm from 9.4.0 to 9.4.1
 2023-08-17 13:46:47 +02:00
dependabot[bot]
47ca35c38e chore(deps): bump newrelic_rpm from 9.4.0 to 9.4.1 
Bumps [newrelic_rpm](https://github.com/newrelic/newrelic-ruby-agent) from 9.4.0 to 9.4.1.
- [Release notes](https://github.com/newrelic/newrelic-ruby-agent/releases)
- [Changelog](https://github.com/newrelic/newrelic-ruby-agent/blob/dev/CHANGELOG.md)
- [Commits](https://github.com/newrelic/newrelic-ruby-agent/compare/9.4.0...9.4.1)

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

Signed-off-by: dependabot[bot] <support@github.com>
 2023-08-17 09:28:40 +00:00
Neal Chambers
fe5288c015 Update .rubocop_todo.yml 2023-08-17 16:45:52 +09:00
Neal Chambers
3c9afcf360 Fix Rails/CompactBlank 2023-08-17 16:43:13 +09:00
Neal Chambers
871a8e6f2c Fix Rails/Blank 2023-08-17 16:42:46 +09:00
Neal Chambers
b78bbd2629 Fix Rails/ApplicationController 2023-08-17 16:42:41 +09:00
Jean-Baptiste Bellet
fa4dda9976 Finally, remove disabled rule that is unused 
We only display active link
 2023-08-17 09:26:10 +02:00
Jean-Baptiste Bellet
394e964b91 Specify for element that have href attr: the ones we want to hover 2023-08-17 09:26:10 +02:00
Jean-Baptiste Bellet
e7d36ed772 Let link have the cursor: pointer by default, and specify only for current 2023-08-17 09:26:10 +02:00
Jean-Baptiste Bellet
2405dfdaa3 Refine and adjust position of icon in button 2023-08-17 09:26:10 +02:00
Jean-Baptiste Bellet
1a8a4ee72b Change size of pagination 
"it becomes extremely long for big catalogues"
 2023-08-17 09:26:10 +02:00
Jean-Baptiste Bellet
66a106b1c9 hide pagination for single page catalogue 
+ update specs then
 2023-08-17 09:26:10 +02:00
Jean-Baptiste Bellet
3fb8726c6a Do not display arrows if they're disabled 2023-08-17 09:06:26 +02:00
Jean-Baptiste Bellet
b1ea77e611 Remove white background from dots 2023-08-17 09:06:26 +02:00
Jean-Baptiste Bellet
c252de87b6 Specify cursor in order to not be text 2023-08-17 09:06:26 +02:00
Jean-Baptiste Bellet
5fc4f7bdaf Design hover (like current) 2023-08-17 09:06:26 +02:00
Jean-Baptiste Bellet
9d8325c0d9 font weight to be 600 2023-08-17 09:06:26 +02:00
Jean-Baptiste Bellet
d914644c35 change not selected font color to $near-black, also for arrows 2023-08-17 09:06:26 +02:00
Jean-Baptiste Bellet
06af58e923 increase distance between arrows and numbers to be 36px 2023-08-17 09:06:26 +02:00
Jean-Baptiste Bellet
6e29dd95ef Increase distance between numbers to be 8px 2023-08-17 09:06:26 +02:00
Jean-Baptiste Bellet
a2da3c2f61 Better management of margin/gap between each button with flex display 2023-08-17 09:06:26 +02:00
Jean-Baptiste Bellet
9396e75806 Increase padding top and padding bottom 2023-08-17 09:06:26 +02:00
Maikel
5762492511 Merge pull request #11392 from dacook/release-template 
Release template
 2023-08-17 16:47:49 +10:00
Maikel
6377149e18 Merge pull request #11400 from jibees/buu-update/refactor-tests 
🚧 BUU: refactor/improve testing
 2023-08-17 16:32:00 +10:00
David Cook
a854dccf04 Simplify tag steps 
Co-authored-by: Maikel <maikel@email.org.au>
 2023-08-17 16:09:06 +10:00
Maikel
d0559d2a6c Merge pull request #11413 from openfoodfoundation/dependabot/bundler/newrelic_rpm-9.4.0 
chore(deps): bump newrelic_rpm from 9.3.1 to 9.4.0
 2023-08-17 15:36:28 +10:00
Maikel
27dcad205e Merge pull request #11337 from macanudo527/fix_rubocop_6 
Fix autocorrect Rails Cops 2
 2023-08-17 10:39:34 +10:00
jibees
132d2e792e Merge pull request #11406 from openfoodfoundation/dependabot/bundler/timecop-0.9.8 
chore(deps-dev): bump timecop from 0.9.6 to 0.9.8
 2023-08-16 17:07:56 +02:00
dependabot[bot]
21e38c424f chore(deps): bump newrelic_rpm from 9.3.1 to 9.4.0 
Bumps [newrelic_rpm](https://github.com/newrelic/newrelic-ruby-agent) from 9.3.1 to 9.4.0.
- [Release notes](https://github.com/newrelic/newrelic-ruby-agent/releases)
- [Changelog](https://github.com/newrelic/newrelic-ruby-agent/blob/dev/CHANGELOG.md)
- [Commits](https://github.com/newrelic/newrelic-ruby-agent/compare/9.3.1...9.4.0)

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

Signed-off-by: dependabot[bot] <support@github.com>
 2023-08-16 14:41:10 +00:00
jibees
afe05f1932 Merge pull request #11414 from openfoodfoundation/dependabot/bundler/rails-i18n-7.0.8 
chore(deps): bump rails-i18n from 7.0.7 to 7.0.8
 2023-08-16 16:40:05 +02:00
dependabot[bot]
33d5e8436f chore(deps): bump rails-i18n from 7.0.7 to 7.0.8 
Bumps [rails-i18n](https://github.com/svenfuchs/rails-i18n) from 7.0.7 to 7.0.8.
- [Changelog](https://github.com/svenfuchs/rails-i18n/blob/master/CHANGELOG.md)
- [Commits](https://github.com/svenfuchs/rails-i18n/compare/v7.0.7...v7.0.8)

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

Signed-off-by: dependabot[bot] <support@github.com>
 2023-08-16 09:49:57 +00:00
jibees
33fc5bd409 Merge pull request #11409 from dacook/script-update 
Don't show extra red messages when gems missing
 2023-08-16 09:01:20 +02:00
David Cook
9bef8b74f8 Merge pull request #11401 from jibees/some-buu-design-updates 
🚧 BUU: some design updates + one small code fix
 2023-08-16 11:41:33 +10:00
Maikel
fd7b00ac7f Merge pull request #11323 from mkllnk/dfc-import-context 
Use known, statically cached DFC context
 2023-08-16 11:35:57 +10:00