raggedstaff/openfoodnetwork
1
0
Fork 0
mirror of https://github.com/openfoodfoundation/openfoodnetwork synced 2026-03-11 03:40:20 +00:00
Code Issues Packages Projects Releases Wiki Activity
18,001 Commits 16 Branches 456 Tags
d4ff9055c0136246e3193ff34d017cfdee726c50
Commit Graph

18001 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Maikel
d4ff9055c0 Merge pull request #6351 from efgalvao/issue#6249 
Fixes Issue#6249
 2020-11-13 13:28:55 +11:00
Maikel
591ba34eb6 Merge pull request #6335 from cillian/reset-on-demand-on-inventory-import 
When resetting stock to 0 on absent products in inventory import also reset the on demand setting
 2020-11-13 13:28:17 +11:00
Pau Pérez Fabregat
777cedd90d Merge pull request #6305 from efgalvao/issue#6292 
Fixed issue #6292.
 2020-11-12 17:42:42 +01:00
Pau Pérez Fabregat
7c4691ab33 Merge pull request #6339 from andrewpbrett/fix-instance-unit-picker 
Fix #6304 (Product edit: Cannot change Variant unit scale of an existing product)
 2020-11-12 16:15:00 +01:00
Pau Pérez Fabregat
692adb0113 Merge pull request #6336 from coopdevs/fix-shop-layout 
Fix .top-bar-section not to wrap the icons-menu
 2020-11-11 17:29:53 +01:00
Andy Brett
d5037abbe7 add specs for new/edit product pages 2020-11-10 10:49:14 -08:00
Pau Pérez Fabregat
bea8982085 Merge pull request #6329 from openfoodfoundation/transifex 
Transifex
 2020-11-10 17:37:00 +01:00
Pau Pérez Fabregat
fc06cc242b Merge pull request #6210 from ipalo/feature/update-docker-image-to-ubuntu-20-04 
Update the base Ubuntu Docker image from 18.04 to 20.04
 2020-11-10 17:30:03 +01:00
Pau Pérez Fabregat
b70c349b05 Merge pull request #6352 from openfoodfoundation/dependabot/bundler/webmock-3.9.5 
Bump webmock from 3.9.4 to 3.9.5
 2020-11-10 16:47:44 +01:00
Pau Perez
634ab5ca6a Don't scale logo image 
The trick using `width: 100%` and a set `max-width` doesn't work if we
can't know the image width as it can be uploaded by superadmins. There's
no need though because the media query breakpoint triggers just before that.
 2020-11-10 09:51:41 +01:00
Luis Ramos
c7c5a95407 Merge pull request #6345 from Matt-Yorkley/flaky-oc-spec 
Improve flaky order cycle spec
 2020-11-09 21:59:41 +00:00
dependabot-preview[bot]
1825c90a5f Bump webmock from 3.9.4 to 3.9.5 
Bumps [webmock](https://github.com/bblimke/webmock) from 3.9.4 to 3.9.5.
- [Release notes](https://github.com/bblimke/webmock/releases)
- [Changelog](https://github.com/bblimke/webmock/blob/master/CHANGELOG.md)
- [Commits](https://github.com/bblimke/webmock/compare/v3.9.4...v3.9.5)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2020-11-09 19:14:30 +00:00
efgalvao
307b1ca9f9 Fixes Issue#6249 2020-11-09 14:06:37 -03:00
Pau Perez
17abb3e345 Fix feature specs 
The underlying markup and CSS changed but the tests did not.
 2020-11-09 15:43:54 +01:00
Pau Perez
1903c575ff Reorder properties alphabetically 
As Hound demands.
 2020-11-09 15:40:25 +01:00
Pau Perez
9a885173b9 Remove element from class selector 
Fixes Hound error `Avoid qualifying class selectors with an element.`.
 2020-11-09 15:39:09 +01:00
Transifex-Openfoodnetwork
3167e5ae2b Updating translations for config/locales/ru.yml 2020-11-10 01:29:44 +11:00
Transifex-Openfoodnetwork
7f968b2b10 Updating translations for config/locales/ru.yml 2020-11-10 01:26:34 +11:00
Transifex-Openfoodnetwork
b08299e83a Updating translations for config/locales/ru.yml 2020-11-10 01:23:23 +11:00
Matt-Yorkley
d9e2a80a4f Improve flaky order cycle spec 
There are various points in this spec where content is dynamically added to the DOM, but Capybara is jumping ahead to start interacting with it before it as actually finished loading.
 2020-11-09 11:26:12 +00:00
Luis Ramos
6114dfb4ef Merge pull request #6337 from openfoodfoundation/dependabot/bundler/webmock-3.9.4 
Bump webmock from 3.9.3 to 3.9.4
 2020-11-07 08:57:13 +00:00
Luis Ramos
f39008f3d3 Merge pull request #6338 from openfoodfoundation/dependabot/bundler/highline-2.0.3 
Bump highline from 1.6.18 to 2.0.3
 2020-11-07 08:57:02 +00:00
Andy Brett
99301e1fb2 fix #6304 2020-11-06 12:49:07 -08:00
dependabot-preview[bot]
cb0b7ed030 Bump highline from 1.6.18 to 2.0.3 
Bumps [highline](https://github.com/JEG2/highline) from 1.6.18 to 2.0.3.
- [Release notes](https://github.com/JEG2/highline/releases)
- [Changelog](https://github.com/JEG2/highline/blob/master/Changelog.md)
- [Commits](https://github.com/JEG2/highline/commits/v2.0.3)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2020-11-06 19:17:11 +00:00
dependabot-preview[bot]
7d9948f5b6 Bump webmock from 3.9.3 to 3.9.4 
Bumps [webmock](https://github.com/bblimke/webmock) from 3.9.3 to 3.9.4.
- [Release notes](https://github.com/bblimke/webmock/releases)
- [Changelog](https://github.com/bblimke/webmock/blob/master/CHANGELOG.md)
- [Commits](https://github.com/bblimke/webmock/compare/v3.9.3...v3.9.4)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2020-11-06 19:14:43 +00:00
Transifex-Openfoodnetwork
18a7bdc631 Updating translations for config/locales/de_DE.yml 2020-11-07 05:32:48 +11:00
Transifex-Openfoodnetwork
6083d61ba7 Updating translations for config/locales/de_DE.yml 2020-11-07 05:29:38 +11:00
Transifex-Openfoodnetwork
9e2054dcd4 Updating translations for config/locales/de_DE.yml 2020-11-07 05:26:28 +11:00
Pau Perez
b5f27d48df Fix .top-bar-section not to wrap the icons-menu 
This line-wrap makes the icons-menu overlap the OC selector. The menu's
background is transparent, what makes it look even more broken.

The fix involves refactoring the `.top-bar-section` into using flexbox
instead of this highly coupled CSS and floats. With flexbox it becomes
as easy as telling the browser to space the three sections evenly
filling-up the window, while scaling down the logo if there's not enough
room.

The root cause is that every instance uses a custom logo, which wasn't
the one we used while designing and implementing. This is why using
fixed-sizes in pixels won't work.
 2020-11-06 17:35:24 +01:00
Cillian O'Ruanaidh
89d63dfbb9 When resetting stock to 0 on absent products in inventory import also reset the on demand setting 
Before when you imported inventory and clicked the 'Set stock to zero for all existing products not present in the file' option it would set the on hand stock to 0 but if the variant override was also set to be on demand the inventory would still be available for sale. This change makes sure the on demand setting is turned off too.

Fixes #6289.
 2020-11-06 14:57:31 +00:00
Matt-Yorkley
73995d1aff Merge pull request #6334 from Matt-Yorkley/hound2 
Switch to rubocop_styleguide.yml as style source
 2020-11-06 12:55:23 +01:00
Matt-Yorkley
f5a9c6f3f4 Switch to rubocop_styleguide.yml as style source 2020-11-06 11:53:56 +00:00
Matt-Yorkley
f6aeb04b14 Merge pull request #6322 from Matt-Yorkley/hound 
Add HoundCI config
 2020-11-06 12:20:03 +01:00
Matt-Yorkley
00320e4387 Use .scss-lint.yml with HoundCI 2020-11-06 10:18:35 +00:00
Matt-Yorkley
ebd7409f70 Add scss-lint configs to .scss-lint.yml 2020-11-06 10:18:34 +00:00
Transifex-Openfoodnetwork
e86d84e10f Updating translations for config/locales/en_FR.yml 2020-11-06 19:26:16 +11:00
Transifex-Openfoodnetwork
b7a503a848 Updating translations for config/locales/fr.yml 2020-11-06 19:26:04 +11:00
Luis Ramos
28570cded2 Update all locales with the latest Transifex translations 2020-11-06 04:20:08 +00:00
Luis Ramos
c0bb9aad5e Merge pull request #6286 from openfoodfoundation/transifex 
Transifex
 2020-11-06 04:18:56 +00:00
Luis Ramos
b281e7e9e5 Merge pull request #6312 from mkllnk/variant-override-loading 
Avoid loading variant overrides for no reason
 2020-11-06 03:59:33 +00:00
Matt-Yorkley
3011bdb87d Add HoundCI config 2020-11-06 00:27:32 +00:00
Matt-Yorkley
66b531ddf6 Merge pull request #6310 from luisramos0/acts_as_list 
Bump acts_as_list to 0.3.0
 2020-11-05 23:03:02 +01:00
Transifex-Openfoodnetwork
213f3cf072 Updating translations for config/locales/ar.yml 2020-11-06 07:43:38 +11:00
Transifex-Openfoodnetwork
e1962419c2 Updating translations for config/locales/ar.yml 2020-11-06 07:40:32 +11:00
Transifex-Openfoodnetwork
bb6f5cb3a7 Updating translations for config/locales/en_US.yml 2020-11-06 07:06:15 +11:00
Matt-Yorkley
db3576f469 Merge pull request #6308 from luisramos0/translations 
Fix some missing translations in orders edit page
 2020-11-05 18:33:51 +01:00
Matt-Yorkley
c2362921fa Merge pull request #6272 from tsara27/fix-alignment-order 
Align center order adjustment and order total title
 2020-11-05 18:33:08 +01:00
Matt-Yorkley
0668dd2591 Merge pull request #6307 from efgalvao/issue#6262 
Fixes issue #6262.
 2020-11-05 18:31:49 +01:00
Matt-Yorkley
d8f9dead8b Merge pull request #6270 from Matt-Yorkley/paperclip-handlers 
Remove Paperclip URL handlers
 2020-11-05 18:29:20 +01:00
Matt-Yorkley
bc96ad9515 Merge pull request #6299 from Matt-Yorkley/admin-image-edit 
Fix display issue in product image edit page
 2020-11-05 18:28:10 +01:00