raggedstaff/openfoodnetwork
1
0
Fork 0
mirror of https://github.com/openfoodfoundation/openfoodnetwork synced 2026-03-14 04:04:23 +00:00
Code Issues Packages Projects Releases Wiki Activity
12,963 Commits 16 Branches 456 Tags
fd77f48aca239f1ba07c6af8b355d345bfb341ce
Commit Graph

12963 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Maikel Linke
02c4795640 Remove default dates from reports 
Closes https://github.com/openfoodfoundation/openfoodnetwork/issues/2212
 2018-05-29 16:47:23 +10:00
Transifex-Openfoodnetwork
6d450aeae2 Updating translations for config/locales/pt.yml 2018-05-29 14:53:01 +10:00
Transifex-Openfoodnetwork
d1e9d52acd Updating translations for config/locales/fr.yml 2018-05-29 14:51:07 +10:00
Matt-Yorkley
b440d05205 Tidy up unnecessary PI code 2018-05-26 19:34:20 +01:00
Matt-Yorkley
a4a2bc438a Import settings spec 2018-05-26 19:34:20 +01:00
Matt-Yorkley
a503b5e2d0 Add not_master scope to Spree::Variant 2018-05-26 19:34:20 +01:00
Matt-Yorkley
91521dc2b0 Improve import_date queries 2018-05-26 19:34:20 +01:00
Matt-Yorkley
6f6db9384f Tidy up SCSS and coffeescript 2018-05-26 19:34:20 +01:00
Matt-Yorkley
d9c720e89a Tidy up import_date 2018-05-26 19:34:20 +01:00
Matt-Yorkley
73f7bc3db0 Remove use of before_filter 2018-05-26 19:34:20 +01:00
Matt-Yorkley
e65bdf35fa Change wording on default import settings text 2018-05-26 19:34:20 +01:00
Matt-Yorkley
c5b7cec19f Change checkbox confirmation behaviour 2018-05-26 19:34:20 +01:00
Matt-Yorkley
58e9f0266a User guide check 2018-05-26 19:34:20 +01:00
Matt-Yorkley
b42e3eb2c9 Product Import Guide WIP 2018-05-26 19:34:20 +01:00
Matt-Yorkley
7da97be7d2 Create separate angular module 2018-05-26 19:34:20 +01:00
Matt-Yorkley
c2c42e1d9a Product Import refactor 2018-05-26 19:34:20 +01:00
Matt-Yorkley
11908f125e Fix flaky spec 2018-05-26 19:34:20 +01:00
Matt-Yorkley
1ed49d397e Refactor PI 2018-05-26 19:34:20 +01:00
Matt-Yorkley
1ff39b8df5 Fix altered translation key 2018-05-26 19:34:20 +01:00
Matt-Yorkley
7a64ad1cc1 Fix roo-xls version in Gemfile 2018-05-26 19:34:20 +01:00
Matt-Yorkley
3a6f316ede Codeclimate refactor 2018-05-26 19:34:20 +01:00
Matt-Yorkley
7c283d90db Spec adjustments 2018-05-26 19:34:19 +01:00
Matt-Yorkley
1c34ce6162 PI exception handling 2018-05-26 19:34:19 +01:00
Matt-Yorkley
b26bec45d6 Expanding PI specs 
squash
 2018-05-26 19:34:19 +01:00
Matt-Yorkley
6efd167400 PI inventories UX 
Minor tweaks
 2018-05-26 19:34:19 +01:00
Matt-Yorkley
678a2a365d Fix spec date to string issue 2018-05-26 19:34:19 +01:00
Matt-Yorkley
2ef63efe28 Tax and Shipping adjustments 2018-05-26 19:34:19 +01:00
Matt-Yorkley
fe01e8ede3 PI human-readable unit fields 
Enhanced unit specs
 2018-05-26 19:34:19 +01:00
Matt-Yorkley
02661d5c23 PI unit_value typecasting 2018-05-26 19:34:19 +01:00
Matt-Yorkley
e848957712 Clean up PI controller 
Remove assignment

Tweak
 2018-05-26 19:34:19 +01:00
Matt-Yorkley
b3c906b3a4 Product Import v3 with asynchronous processing 
Fixed spec

Quick spec tweak
 2018-05-26 19:34:19 +01:00
Matt-Yorkley
3a650dd8b3 Add roo-xls gem for Excel support 2018-05-26 19:34:19 +01:00
Matt-Yorkley
684b493fb3 PI translations 2018-05-26 19:34:19 +01:00
Matt-Yorkley
6e2de0d6ac PI refactoring 2018-05-26 19:34:19 +01:00
Matt-Yorkley
e76a818fde Update PI spec 2018-05-26 19:34:19 +01:00
Matt-Yorkley
ffbb67d480 PI inventories additions 2018-05-26 19:34:19 +01:00
Matt-Yorkley
4e97445655 PI inventories timestamps 2018-05-26 19:34:19 +01:00
Matt-Yorkley
a2a65a8900 PI inventories and overhaul 2018-05-26 19:34:19 +01:00
Matt-Yorkley
e362c2d867 PI timestamps 2018-05-26 19:34:19 +01:00
Matt-Yorkley
fc2cc09ea5 checkout redirect excludes angular path variables 2018-05-26 18:13:35 +01:00
luisramos0
533ae77234 Fixed missing translations on shops filter - delivery option 2018-05-25 23:46:44 +01:00
Pau Pérez Fabregat
e04141d797 Merge pull request #2291 from coopdevs/remove-producers-tab-from-dashboard 
Remove producers tab from dashboard
 2018-05-25 19:24:29 +02:00
Rob Harrington
17259b3269 Overwrite cached value for current_order_cycle when updating it 
This ensures that the correct order cycle is rendered in the json response
 2018-05-25 17:28:54 +10:00
Pau Pérez Fabregat
9d57beb33f Merge pull request #2305 from Matt-Yorkley/uk/domain_headers 
Ensure domain in SSL header matches request with or without www prefix
v1.15.2 		2018-05-23 20:08:56 +02:00
luisramos0
d821664ee3 Fixed issue #1913 with expand/collapse of list of producers of a shop 2018-05-23 17:32:38 +01:00
luisramos0
a59d9cb670 Fixed broken translation keys in new order cycle screen 2018-05-23 13:12:56 +01:00
Luis Ramos
12232f552c Added missing translation key for no results in admin orders page 2018-05-22 21:00:03 +01:00
Pau Perez
2a3772dba0 Do not show icons for producer-enterprises 
Payment and shipping methods don't apply to them.
 2018-05-22 16:50:27 +02:00
Pau Perez
208e3bbadd Ensure non-distributors are listed in dashboard 
We want to show all enterprises in a single list regardless of their
type.
 2018-05-22 10:21:35 +02:00
Pau Perez
bd34f27ace Inline partials into enterprises view 
Now there are no tabs in the dashboard so is pointless to refer to them
and to split in multiple partials.
 2018-05-22 10:21:35 +02:00