raggedstaff/openfoodnetwork
1
0
Fork 0
mirror of https://github.com/openfoodfoundation/openfoodnetwork synced 2026-02-09 23:06:06 +00:00
Code Issues Packages Projects Releases Wiki Activity
19,029 Commits 18 Branches 453 Tags
07a42e8a2127377e7dcdc8f1136838cdafcfc46b
Commit Graph

19029 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Matt-Yorkley
444747c8b2 Split shopping_shared/details partial into header and tabs partials and only include tabs in shop page (not cart and checkout). 2020-01-22 11:30:43 +01:00
Danni M
95f51e2db9 Updated shopfront message placeholder 
Change required now that there is a home tab instead of a green shopfront message.

>An optional message to welcome customers and explain how to shop with you. If text is entered here it will be displayed in a home tab when customers first arrive at your shopfront.
 2020-01-22 14:24:20 +11:00
Transifex-Openfoodnetwork
0463e05296 Updating translations for config/locales/pt_BR.yml 2020-01-22 10:35:12 +11:00
Transifex-Openfoodnetwork
f176e2ba91 Updating translations for config/locales/pt_BR.yml 2020-01-22 10:32:03 +11:00
luisramos0
cccff6b500 Remove unused methods from navigation helper 2020-01-21 22:51:23 +00:00
luisramos0
b4e6c5307e Convert orders submenu partial to haml 2020-01-21 22:51:23 +00:00
luisramos0
fb4f96eb4a Remove unused submenu entries from _tabs partial and convert hash syntax 2020-01-21 22:51:23 +00:00
luisramos0
27572cbe68 Remove alias_method klass_for_with_sym_fallback 2020-01-21 22:49:55 +00:00
luisramos0
8a912d6f02 Remove redundant method tab_with_cancan_check 
This was introduced to work with previous versions of spree
 2020-01-21 22:49:55 +00:00
luisramos0
cd7f97b01d Fix rubocop issues in nav helper 2020-01-21 22:49:55 +00:00
luisramos0
1b18595d94 Merge navigator_helper with decorator 2020-01-21 22:49:55 +00:00
Maikel Linke
30888a9e59 Stabilise spec by not creating noise data 
We were using a more complex order factory that created more data than
we needed. The order contained a second line item and therefor the
manifest had two items as well. Sometimes we would pick the wrong one.
 2020-01-22 09:49:37 +11:00
luisramos0
8987121058 Add navigation helper from spree_backend 2020-01-21 22:48:44 +00:00
Luis Ramos
6bb4f2477c Merge pull request #4586 from luisramos0/states_erb 
Make states/new.js template depend on the states/new.haml template in OFN (not the states/new.erb in spree)
 2020-01-21 22:47:28 +00:00
Matt-Yorkley
cca824f207 Ensure routes declared with match specify a method 2020-01-20 17:32:00 +01:00
Matt-Yorkley
147f7d4850 Separate non-report routes from reports route list for clarity 2020-01-20 17:30:46 +01:00
Matt-Yorkley
8024dcec64 Merge double Spree routes declarations into one 
The app has a lot of problems with this in Rails 4
 2020-01-20 17:27:26 +01:00
Matt-Yorkley
dfee9b6c6b Relax two codeclimate SCSS rules 2020-01-20 15:08:20 +01:00
Luis Ramos
1c3fd26eef Merge pull request #4655 from Matt-Yorkley/mobile-shoptabs 
Mobile: shop tabs
 2020-01-20 08:51:59 +00:00
Matt-Yorkley
f8145f8429 Update shop tab button styling in mobile 2020-01-19 15:59:37 +01:00
Matt-Yorkley
a1256f9aeb Remove old green box styling from shopfront messages 2020-01-19 15:57:01 +01:00
dependabot-preview[bot]
094c175a64 Bump ddtrace from 0.31.0 to 0.31.1 
Bumps [ddtrace](https://github.com/DataDog/dd-trace-rb) from 0.31.0 to 0.31.1.
- [Release notes](https://github.com/DataDog/dd-trace-rb/releases)
- [Changelog](https://github.com/DataDog/dd-trace-rb/blob/v0.31.1/CHANGELOG.md)
- [Commits](https://github.com/DataDog/dd-trace-rb/compare/v0.31.0...v0.31.1)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2020-01-17 19:14:25 +00:00
Luis Ramos
dd9f2a063f Merge pull request #4682 from openfoodfoundation/dependabot/bundler/mini_racer-0.2.9 
Bump mini_racer from 0.2.4 to 0.2.9
 2020-01-17 13:36:02 +00:00
Luis Ramos
4973bcb9b6 Merge pull request #4677 from openfoodfoundation/dependabot/bundler/oj-3.10.1 
Bump oj from 3.10.0 to 3.10.1
 2020-01-17 13:14:15 +00:00
Maikel
9ee701bec1 Merge pull request #4683 from openfoodfoundation/dependabot/bundler/webmock-3.8.0 
Bump webmock from 3.7.6 to 3.8.0
 2020-01-17 09:14:50 +11:00
Maikel
e2469ded9a Merge pull request #4680 from openfoodfoundation/transifex 
Transifex
 2020-01-17 09:03:10 +11:00
dependabot-preview[bot]
eaa914a360 Bump webmock from 3.7.6 to 3.8.0 
Bumps [webmock](https://github.com/bblimke/webmock) from 3.7.6 to 3.8.0.
- [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.7.6...v3.8.0)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2020-01-16 19:19:26 +00:00
dependabot-preview[bot]
ea2fa9913d Bump mini_racer from 0.2.4 to 0.2.9 
Bumps [mini_racer](https://github.com/discourse/mini_racer) from 0.2.4 to 0.2.9.
- [Release notes](https://github.com/discourse/mini_racer/releases)
- [Changelog](https://github.com/rubyjs/mini_racer/blob/master/CHANGELOG)
- [Commits](https://github.com/discourse/mini_racer/compare/v0.2.4...v0.2.9)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2020-01-16 19:15:52 +00:00
Matt-Yorkley
b69b5ea81a Merge pull request #4678 from mkllnk/4490-tag-rules-spec 
4490 tag rules spec
 2020-01-16 14:28:37 +01:00
Luis Ramos
18b3a8122d Merge pull request #4508 from luisramos0/backend_ctrl_prods_vars 
Bring spree_backend products and variants controllers to OFN
 2020-01-16 13:01:31 +00:00
luisramos0
1e203ae419 Remove destroy with js format in variants controller, we dont use this endpoint in OFN and it avoids having to bring additional code from spree_backend 2020-01-16 11:59:36 +00:00
luisramos0
70a24b25e2 Update rubocop manual todo and Remove some unnecessary comments 2020-01-16 11:59:36 +00:00
luisramos0
f7490ae28b Remove unused stock and destroy actions and bring product routes from spree_backend 2020-01-16 11:58:59 +00:00
luisramos0
836abbec92 Fix rubocop issues in variant controller 2020-01-16 11:58:59 +00:00
luisramos0
d153237b69 Merge variants decorator with controller 2020-01-16 11:58:59 +00:00
luisramos0
56b6bf82bb Fix some rubocop issues 2020-01-16 11:58:59 +00:00
luisramos0
0d44f298fe Merge spree/admin/products_controller with its decorator 2020-01-16 11:58:59 +00:00
luisramos0
ff3611f52a Add variants_controller from spree_backend so that we can now merge it with the OFN's decorator 2020-01-16 11:58:59 +00:00
luisramos0
7fa9b4699c Add products_controller from spree_backend so that we can now merge it with the OFN's decorator 2020-01-16 11:58:59 +00:00
luisramos0
138248e1c9 Product import only works with csv right now. Here we remove dead code 
This can be reverted if we start suppporting xls and ods in the future
 2020-01-16 09:59:27 +00:00
Transifex-Openfoodnetwork
3dadb7f91c Updating translations for config/locales/en_GB.yml 2020-01-16 20:12:18 +11:00
Transifex-Openfoodnetwork
dd5c867298 Updating translations for config/locales/en_GB.yml 2020-01-16 20:09:10 +11:00
Transifex-Openfoodnetwork
918a0f053d Updating translations for config/locales/ar.yml 2020-01-16 18:25:27 +11:00
Transifex-Openfoodnetwork
2171125e85 Updating translations for config/locales/ar.yml 2020-01-16 18:22:18 +11:00
Transifex-Openfoodnetwork
5d0cb3549a Updating translations for config/locales/ar.yml 2020-01-16 18:19:07 +11:00
Maikel Linke
12fde5b9fc Update all locales with the latest Transifex translations v2.7.0 2020-01-16 15:28:57 +11:00
Maikel Linke
6b18d4a60c Avoid false positives in specs 
When switching from one tab to another, a `have_no_selector` check could
match because the new tab hasn't loaded yet. Now we use that check after
we verified other content on the new tab.
 2020-01-16 15:10:25 +11:00
Maikel Linke
4d53f47d88 Leave tag rules spec in clean state 2020-01-16 15:10:25 +11:00
Maikel Linke
3a9aaf6764 Wait for the first enterprise tab to be loaded 2020-01-16 15:10:25 +11:00
Maikel Linke
42aa15767e DRY navigating to Tag Rules section 2020-01-16 15:10:25 +11:00