Luis Ramos
6a7ed6e0c9
Rebuild .rubocop_manual_todo.yml
2020-06-22 16:51:46 +01:00
Luis Ramos
4e9c21d525
Add new regenerated rubocop_todo
2020-06-22 16:51:46 +01:00
Luis Ramos
b879439d58
Use rubocop auto correct to fix Style/SafeNavigation issue
2020-06-22 16:51:46 +01:00
Luis Ramos
1b6e51c79e
Fix rubocop issue
2020-06-22 16:51:46 +01:00
Luis Ramos
f848a89a00
Rename update_attributes to update #rails4
2020-06-22 16:51:43 +01:00
Luis Ramos
8a61257547
Rename all before_filter to before_action, it's the same function with a new name
2020-06-22 13:11:57 +01:00
Luis Ramos
46a1c1cf26
Fix rubocop issue
2020-06-22 13:08:54 +01:00
Luis Ramos
adfe1f89b6
Revert previous rubocop auto correct fix that breaks the cart spec
2020-06-22 13:08:38 +01:00
Luis Ramos
473fee19eb
Fix rubocop issues
2020-06-22 13:03:18 +01:00
Luis Ramos
6eebb0e399
Use rubocop autocorrect to fix rubocop issue
2020-06-22 12:58:33 +01:00
Luis Ramos
e574e254db
Use rubocop autocorrect to fix rubocop issue
2020-06-22 12:57:12 +01:00
Luis Ramos
3b91dd9dea
Use rubocop auto-correct to fix more issues
2020-06-22 12:51:47 +01:00
Luis Ramos
5d710f1e24
Use ruboccop autocorrect to fix issues
2020-06-22 12:46:07 +01:00
Luis Ramos
fb92745db4
Fix rubocop issues
2020-06-22 12:41:31 +01:00
Luis Ramos
8a9dae0ee2
Run rubocop autocorrect
...
This is the result of bundle exec rubocop --auto-correct
2020-06-22 12:23:10 +01:00
Luis Ramos
15babd8bc4
Merge pull request #5651 from luisramos0/xhr
...
[Rails 4.1] Change for xhr rquest to avoid csrf during testing
2020-06-22 12:20:41 +01:00
Luis Ramos
57d925a7de
Add new rubocop rules and fix the single offence
2020-06-22 12:19:19 +01:00
Lucas Hiago
357c2c7b25
change for xhr to avoid csrf during testing
2020-06-21 20:22:33 +01:00
Transifex-Openfoodnetwork
eb55d00051
Updating translations for config/locales/en_US.yml
2020-06-20 03:34:37 +10:00
Transifex-Openfoodnetwork
c5d3156351
Updating translations for config/locales/fr.yml
2020-06-20 02:37:11 +10:00
Transifex-Openfoodnetwork
28a6f694de
Updating translations for config/locales/en_FR.yml
2020-06-20 02:34:30 +10:00
Pau Pérez Fabregat
dd9d9e3316
Merge pull request #5639 from luchiago/fix-seeds-on-setup
...
FIx setup seed
2020-06-19 16:49:16 +02:00
Pau Perez
f36e08a163
Rename *.css.scss to *.scss
...
This fixes the following deprecation warning
```
DEPRECATION WARNING: Extra .css in SCSS file is unnecessary. Rename /usr/src/app/app/assets/stylesheets/darkswarm/variables.css.scss to /usr/src/app/app/assets/stylesheets/darkswar
m/variables.scss. (called from _app_views_layouts_darkswarm_html_haml___3990351141569700945_46957256630860 at /usr/src/app/app/views/layouts/darkswarm.html.haml:18)
(...)
```
2020-06-19 16:29:08 +02:00
Matt-Yorkley
66de0a4a71
Merge pull request #5642 from Matt-Yorkley/fix-table-width
...
Ensure cart page table is full-width
2020-06-19 14:27:00 +02:00
Matt-Yorkley
cda5a042b3
Ensure cart page table is full-width
2020-06-19 12:56:47 +02:00
Transifex-Openfoodnetwork
fd6cbe064d
Updating translations for config/locales/tr.yml
2020-06-19 20:27:09 +10:00
Pau Pérez Fabregat
db80992326
Merge branch 'master' into drop-blockenspiel
2020-06-19 12:12:10 +02:00
Matt-Yorkley
444097c75f
Merge pull request #5559 from luisramos0/display_only_shop
...
Make display only shops work again
2020-06-19 11:12:55 +02:00
Matt-Yorkley
be4a4c48d9
Merge pull request #5480 from Matt-Yorkley/mobile-cart-restyle
...
[Mobile] Cart Dropdown
2020-06-19 09:25:04 +02:00
Matt-Yorkley
b189d06eb7
Update shopping CTA logic
...
Shows "Take me shopping!" button on /shops page if a shop is selected
2020-06-19 08:59:43 +02:00
Lucas Hiago
52da896b03
Fix name when try to search on seed
2020-06-18 21:06:04 -03:00
Eduardo
573f7b1087
make shop links on the producers page open in new tab
2020-06-18 19:55:06 -03:00
Matt-Yorkley
ff6ba8819f
Use image_tag helper with relative paths when loading static images in /app/assets/images folder
...
This seems to be needed for Rails 4
2020-06-18 22:22:31 +02:00
Matt-Yorkley
7c7ab322bb
Ensure cart-header has the same height when the cart is empty
...
Fixes a minor visual bug
2020-06-18 22:21:55 +02:00
Matt-Yorkley
5a480439ca
Remove test for items from previous orders looking in cart dropdown
...
This feature has been removed
2020-06-18 22:21:55 +02:00
Matt-Yorkley
a6edc1c973
Enable control over body scroll with BodyScroll service
2020-06-18 22:21:55 +02:00
Matt-Yorkley
ed086c2db5
Add character limit to product and variant names in cart sidebar
2020-06-18 22:21:55 +02:00
Matt-Yorkley
2cc02d9711
Make cart header stick to top of cart
2020-06-18 22:21:55 +02:00
Matt-Yorkley
886df0e87d
Fix cart page button style regression
2020-06-18 22:21:55 +02:00
Matt-Yorkley
076ecfdb43
Adjust scrollbar visibility in sidebar
2020-06-18 22:21:55 +02:00
Matt-Yorkley
7093e0f7a3
Use plural or singular description in cart, depending on number of items
2020-06-18 22:21:55 +02:00
Matt-Yorkley
850e1b0364
Reduce specificity in cart css rules
2020-06-18 22:21:55 +02:00
Matt-Yorkley
b58ccc02ee
Adjust shop.css.scss and remove indentation
2020-06-18 22:21:55 +02:00
Matt-Yorkley
234f0f94cf
Change images in serializer to use product.images over variant.images
2020-06-18 22:21:55 +02:00
Matt-Yorkley
9c6dd1b324
Add comment on z-index
2020-06-18 22:21:55 +02:00
Matt-Yorkley
1eb9d11e27
Update colour variables
2020-06-18 22:21:55 +02:00
Matt-Yorkley
17c2721ab6
Remove unused translation keys
2020-06-18 22:21:55 +02:00
Matt-Yorkley
656c23f407
Replace previous min-width breakpoint.
...
This was mistakenly changed to use a max-width breakpoint in a previous commit.
2020-06-18 22:21:55 +02:00
Matt-Yorkley
1d8386bee8
Disable two SCSS-lint rules
2020-06-18 22:21:55 +02:00
Matt-Yorkley
c0282b57b6
Fix some linting warnings
2020-06-18 22:21:55 +02:00
