raggedstaff/openfoodnetwork
1
0
Fork 0
mirror of https://github.com/openfoodfoundation/openfoodnetwork synced 2026-01-25 20:46:48 +00:00
Code Issues Packages Projects Releases Wiki Activity
13,574 Commits 21 Branches 450 Tags
6df7ec9dbdc8efc01cbdda4e7567ee78c1c9bfa2
Commit Graph

13574 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
dependabot-preview[bot]
6df7ec9dbd Bump ddtrace from 0.28.0 to 0.29.0 
Bumps [ddtrace](https://github.com/DataDog/dd-trace-rb) from 0.28.0 to 0.29.0.
- [Release notes](https://github.com/DataDog/dd-trace-rb/releases)
- [Changelog](https://github.com/DataDog/dd-trace-rb/blob/master/CHANGELOG.md)
- [Commits](https://github.com/DataDog/dd-trace-rb/compare/v0.28.0...v0.29.0)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-11-21 19:20:49 +00:00
Luis Ramos
008921c201 Merge pull request #4447 from luisramos0/clickable_steps 
Clickable steps on the OC edit page
 2019-11-20 21:16:07 +00:00
Luis Ramos
0882887abe Merge pull request #4452 from luisramos0/ready_for 
Make "Ready for" field show a red border when added to the list of outgoing exchanges
 2019-11-20 21:14:25 +00:00
Luis Ramos
0eb4574b37 Merge pull request #4422 from luisramos0/the_poc 
New Order Cycles edit page with steps
 2019-11-20 21:11:23 +00:00
Maikel
b54edff4cc Merge pull request #4470 from luisramos0/oc_perms 
Improve readability of OC permissions...
 2019-11-20 11:38:38 +11:00
Maikel
0d6911f41c Merge pull request #4467 from openfoodfoundation/transifex 
Transifex
 2019-11-20 08:04:54 +11:00
Luis Ramos
498acaefbc Merge pull request #4469 from Matt-Yorkley/shipping_selection 
Fix shipping_rate fetching in customer_totals_report
 2019-11-19 09:39:13 +00:00
Matt-Yorkley
585135d27e Fix shipping_method querying in customer totals reports 2019-11-18 15:14:10 +00:00
Matt-Yorkley
06fabe491d Add failing shipping_methods spec 2019-11-18 15:06:54 +00:00
luisramos0
052cc2848f Make visible_variants_for_incoming_exchanges_from and editable_variants_for_incoming_exchanges_from a bit easier to read 2019-11-18 13:25:38 +00:00
Transifex-Openfoodnetwork
b5b9d42764 Updating translations for config/locales/nb.yml 2019-11-18 19:04:54 +11:00
Transifex-Openfoodnetwork
d8e2239438 Updating translations for config/locales/nb.yml 2019-11-18 19:01:46 +11:00
Transifex-Openfoodnetwork
403ca3e538 Updating translations for config/locales/nb.yml 2019-11-18 18:58:37 +11:00
Transifex-Openfoodnetwork
ed65c80869 Updating translations for config/locales/ar.yml 2019-11-17 02:51:01 +11:00
Transifex-Openfoodnetwork
ca6ec9ee68 Updating translations for config/locales/ar.yml 2019-11-17 02:47:54 +11:00
Transifex-Openfoodnetwork
04fa4d3587 Updating translations for config/locales/fr.yml 2019-11-16 22:49:18 +11:00
Transifex-Openfoodnetwork
eedbcb6f1e Updating translations for config/locales/fr.yml 2019-11-16 22:46:21 +11:00
Transifex-Openfoodnetwork
61e3798533 Updating translations for config/locales/en_FR.yml 2019-11-16 22:44:43 +11:00
Transifex-Openfoodnetwork
bca978aacc Updating translations for config/locales/en_CA.yml 2019-11-16 15:06:46 +11:00
Transifex-Openfoodnetwork
190cb1dede Updating translations for config/locales/en_NZ.yml 2019-11-16 07:30:50 +11:00
Luis Ramos
9c8c71bd08 Merge pull request #4443 from openfoodfoundation/dependabot/bundler/roadie-rails-1.3.0 
Bump roadie-rails from 1.1.1 to 1.3.0
 2019-11-15 16:48:23 +00:00
Luis Ramos
2b37592280 Merge pull request #4449 from luisramos0/properties 
Move properties and product properties from spree_backend to OFN
 2019-11-15 08:57:32 +00:00
luisramos0
8546e11ffc Update all locales with the latest Transifex translations 2019-11-14 13:34:29 +00:00
Luis Ramos
76659d63d8 Merge pull request #4464 from openfoodfoundation/transifex 
Transifex
 2019-11-14 13:32:04 +00:00
Transifex-Openfoodnetwork
4d9cbf5d16 Updating translations for config/locales/nb.yml 2019-11-15 00:07:13 +11:00
Transifex-Openfoodnetwork
2166791554 Updating translations for config/locales/nb.yml 2019-11-15 00:04:04 +11:00
Luis Ramos
879e2f5c3a Merge pull request #4444 from openfoodfoundation/dependabot/bundler/wkhtmltopdf-binary-0.12.5 
Bump wkhtmltopdf-binary from 0.12.4 to 0.12.5
 2019-11-14 12:07:34 +00:00
Luis Ramos
471ec2023e Merge pull request #4426 from Matt-Yorkley/customer_totals 
Orders and Fulfilment reports
 2019-11-14 12:07:16 +00:00
Luis Ramos
5026afc011 Merge pull request #4141 from Matt-Yorkley/oc_performance 
OC performance
 2019-11-14 11:24:16 +00:00
Maikel
7c9cdccb49 Merge pull request #4460 from openfoodfoundation/transifex 
Transifex
 2019-11-13 10:29:22 +11:00
Transifex-Openfoodnetwork
19fbdb1848 Updating translations for config/locales/ar.yml 2019-11-13 05:24:53 +11:00
Transifex-Openfoodnetwork
c9b53022f2 Updating translations for config/locales/ar.yml 2019-11-13 05:21:47 +11:00
Pau Pérez Fabregat
a00b770229 Merge pull request #4459 from coopdevs/temporarily-disable-flaky-spec 
Temporarily disable flaky line item spec
 2019-11-12 13:59:02 +01:00
Pau Perez
16f570b8f7 Temporarily disable flaky line item spec 
This is causing almost all PRs to fail in CI and blocking our delivery
pipe. We're already working on a solution in
https://github.com/openfoodfoundation/openfoodnetwork/pull/4458.
 2019-11-12 13:23:04 +01:00
Luis Ramos
49bd21f29a Merge pull request #4456 from openfoodfoundation/dependabot/bundler/i18n-js-3.4.2 
Bump i18n-js from 3.4.1 to 3.4.2
 2019-11-12 12:09:34 +00:00
luisramos0
f1c055805f Use $timeout instead of setTimeout which makes it possible to remove apply() 2019-11-12 12:06:44 +00:00
luisramos0
5cadb0d16f Make ready for field show with red borders immediatly after exchange is added to the list 2019-11-12 12:06:44 +00:00
luisramos0
6875e9a41e Make view a bit simpler by removing unnecessary string interpolation 2019-11-12 12:05:40 +00:00
luisramos0
b6f1d6e395 Make OC edit page steps clickable when editing an OC 2019-11-12 12:05:40 +00:00
luisramos0
14433e7764 Fix some rubocop issues in admin/order_cycles_controller 2019-11-12 12:02:36 +00:00
luisramos0
5fdb86ae43 Make simple create redirect to OC list but normal create to jump to incoming settings 2019-11-12 12:00:48 +00:00
luisramos0
6615469f8b Fix 3 more specs in OC edit pages 2019-11-12 12:00:48 +00:00
luisramos0
d281837dd9 Remove useless spec now that we have 3 steps in OC edit process 2019-11-12 12:00:48 +00:00
luisramos0
7c63e59ae9 Add OC imcoming and outgoing abilities to managers, this fixes a few OC feature specs 2019-11-12 12:00:48 +00:00
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