raggedstaff/openfoodnetwork
1
0
Fork 0
mirror of https://github.com/openfoodfoundation/openfoodnetwork synced 2026-01-28 21:07:16 +00:00
Code Issues Packages Projects Releases Wiki Activity
13,501 Commits 20 Branches 451 Tags
7c19fe418eb59e54425fb252f30bc096438cb91b
Commit Graph

13501 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
luisramos0
7c19fe418e Adapt OC specs to new page flow with 3 steps (these specs are not green yet) 2019-11-12 12:00:48 +00:00
luisramos0
46d0023018 Adapt OC spec to new page flow with 3 steps 2019-11-12 12:00:48 +00:00
luisramos0
43cf249184 Make NoDistributors warning only appear on simple_create and simple_edit and outgoing settings 2019-11-12 12:00:48 +00:00
luisramos0
537dbd3dc0 Fix angular specs by moving specs to the same place as the code was moved previously 
Quite a few copy pasted specs were also removed
 2019-11-12 12:00:48 +00:00
luisramos0
7c54781d90 Restructure OC page controllers so that methods related to exchanges are only loaded on the incoming and outgoing settings pages 2019-11-12 12:00:48 +00:00
luisramos0
3b4241c70d Remove more copy pasted code by adding new AdminOrderCycleCtrl with common code from create and edit OC controllers 2019-11-12 12:00:48 +00:00
luisramos0
a290e83501 Move more copy pasted code to basic OC controller 2019-11-12 12:00:48 +00:00
luisramos0
6e0019227b Remove some serious copy/paste party of the past... by extending from new AdminOrderCycleBasicCtrl where we put all the basic methods for the OC create/edit/simple_create/simple_edit controllers 2019-11-12 12:00:48 +00:00
luisramos0
7845b6c6fb Use only AdminOrderCycleIncomingCtrl in incoming view and make AdminOrderCycleIncomingCtrl extend AdminEditOrderCycleCtrl 
Same for AdminOrderCycleOutgoingCtrl
 2019-11-12 12:00:48 +00:00
luisramos0
e03e3ae50a Fix the simple edit OC and the new OC page flows 2019-11-12 12:00:48 +00:00
luisramos0
305d7b1125 Adapted navigation between OC edit pages by adding new previous and next buttons 2019-11-12 12:00:48 +00:00
luisramos0
5ef751d409 Add wizard to OC new and edit pages 2019-11-12 12:00:48 +00:00
luisramos0
683232dd10 Improve page titles and fix broken translation 2019-11-12 12:00:48 +00:00
luisramos0
5f1360e226 Move incoming and outgoing parts of the (not simple) OC new and edit pages to separate routes and views to make this page a multi step page 2019-11-12 12:00:48 +00:00
Pau Pérez Fabregat
ed15bc422e Merge pull request #4453 from luisramos0/rubo 
run rubocop --auto-correct
 2019-11-12 10:30:21 +01:00
Luis Ramos
3e318e5c4e Merge pull request #4425 from Matt-Yorkley/admin_eager_loading 
Eager-load variant associations in admin ProductsController
 2019-11-11 15:29:45 +00:00
Luis Ramos
3eb4caeb3e Merge pull request #4408 from luisramos0/poc_oc 
Remove dead code from OC edit page code
 2019-11-11 14:55:37 +00:00
luisramos0
555ae12b35 Add exceptions to some unresolved rubocop issues 2019-11-10 19:40:41 +00:00
luisramos0
553d4ebaa0 Fix a few rubocop issues in reports code 2019-11-10 19:27:41 +00:00
luisramos0
73ee14cc7c Fix long line in injection helper 2019-11-10 19:21:08 +00:00
luisramos0
c9177feb19 Fix a few more rubocop issues manually 2019-11-10 19:14:12 +00:00
luisramos0
71ea281424 Regenerate rubocop todo files after last large fix of issues 2019-11-10 19:07:16 +00:00
luisramos0
9404aacfb2 run rubocop --auto-correct 2019-11-10 18:42:43 +00:00
Matt-Yorkley
5e99ecd9cc Merge pull request #4446 from luisramos0/remove_listen 
Remove unused dependency listen
 2019-11-10 10:03:19 +00:00
Matt-Yorkley
c94713c1ef Merge pull request #4451 from openfoodfoundation/dependabot/bundler/rack-mini-profiler-1.0.0 
Bump rack-mini-profiler from 0.10.7 to 1.0.0
 2019-11-09 19:28:54 +00:00
Maikel
6864c0d3c3 Merge pull request #4448 from luisramos0/rubo_kanp 
Update rubocop todo lists and regenrate knapsack report
 2019-11-09 10:59:14 +11:00
Maikel
5591525160 Merge pull request #4445 from openfoodfoundation/dependabot/bundler/test-unit-3.3.4 
Bump test-unit from 3.3.3 to 3.3.4
 2019-11-09 10:40:41 +11:00
luisramos0
4d00b79d8d Add new knapsack report so build jobs are more balanced 2019-11-08 20:43:49 +00:00
dependabot-preview[bot]
e3007db324 Bump rack-mini-profiler from 0.10.7 to 1.0.0 
Bumps [rack-mini-profiler](https://github.com/MiniProfiler/rack-mini-profiler) from 0.10.7 to 1.0.0.
- [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/v0.10.7...v1.0.0)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-11-08 19:18:25 +00:00
luisramos0
05ddebd78e Update rubocop todo lists with payment_methods_controler exceptions 2019-11-08 17:05:51 +00:00
Luis Ramos
fd6639c7d1 Merge pull request #4415 from lin-d-hop/delivery-report 
Update end date on delivery report
 2019-11-08 16:58:27 +00:00
Luis Ramos
314ecf6d90 Merge pull request #4372 from luisramos0/images 
Move Images from spree_backend to OFN
 2019-11-08 16:21:33 +00:00
Luis Ramos
ea8eb0ee14 Merge pull request #4371 from luisramos0/payment_methods 
Move Payment methods from spree_backend to OFN
 2019-11-08 14:26:21 +00:00
luisramos0
9bb940ae43 Remove unused dependency listen, it was used in guard but guard was deleted 2019-11-08 12:49:06 +00:00
Luis Ramos
9e713e449f Merge pull request #4441 from openfoodfoundation/dependabot/bundler/rubocop-0.68.1 
Bump rubocop from 0.57.2 to 0.68.1
 2019-11-08 12:35:11 +00:00
Matt-Yorkley
34f4bbe06c Eager-load variant associations in admin ProductsController 2019-11-08 10:44:47 +00:00
Maikel Linke
babe2247a5 Put new violations on the todo list 2019-11-08 19:08:36 +11:00
Maikel Linke
3295aedeee Update Rubocop config for new version 2019-11-08 19:08:36 +11:00
dependabot-preview[bot]
eaaf082572 Bump rubocop from 0.57.2 to 0.68.1 
Bumps [rubocop](https://github.com/rubocop-hq/rubocop) from 0.57.2 to 0.68.1.
- [Release notes](https://github.com/rubocop-hq/rubocop/releases)
- [Changelog](https://github.com/rubocop-hq/rubocop/blob/master/CHANGELOG.md)
- [Commits](https://github.com/rubocop-hq/rubocop/compare/v0.57.2...v0.68.1)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-11-08 19:08:36 +11:00
Maikel Linke
f8803888f2 Update Rubocop config to pass local run 2019-11-08 19:08:36 +11:00
Maikel
032fbc7348 Merge pull request #4440 from openfoodfoundation/transifex 
Transifex
 2019-11-08 17:44:02 +11:00
Matt-Yorkley
b64633d2d8 Merge pull request #4434 from coopdevs/remove-duplicate-feature-spec 
Don't test existence of a field used in next spec
 2019-11-08 00:43:57 +00:00
Transifex-Openfoodnetwork
bc46b2bccb Updating translations for config/locales/en_FR.yml 2019-11-08 07:28:30 +11:00
Transifex-Openfoodnetwork
fc8bd530e6 Updating translations for config/locales/en_GB.yml 2019-11-08 07:13:52 +11:00
Transifex-Openfoodnetwork
8e6079ad5b Updating translations for config/locales/en_GB.yml 2019-11-08 07:10:42 +11:00
dependabot-preview[bot]
f29922312d Bump test-unit from 3.3.3 to 3.3.4 
Bumps [test-unit](https://github.com/test-unit/test-unit) from 3.3.3 to 3.3.4.
- [Release notes](https://github.com/test-unit/test-unit/releases)
- [Commits](https://github.com/test-unit/test-unit/compare/3.3.3...3.3.4)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-11-07 19:20:30 +00:00
Transifex-Openfoodnetwork
b5e69c883b Updating translations for config/locales/fr.yml 2019-11-07 23:50:03 +11:00
Transifex-Openfoodnetwork
5f0ad3fd71 Updating translations for config/locales/fr.yml 2019-11-07 23:46:53 +11:00
Pau Perez
a6ba956355 Update all locales with the latest Transifex translations v2.6.2 2019-11-07 12:47:10 +01:00
Luis Ramos
76cffe4c7f Merge pull request #4301 from Matt-Yorkley/ruby-2.2.10 
Use Ruby 2.2.10
 2019-11-07 10:17:54 +00:00