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
10,609 Commits 20 Branches 451 Tags
dbfcbc6db903386474a57fd35bf2dfbc1825be21
Commit Graph

230 Commits

Author SHA1 Message Date
Kristina Lim
798a6ed391 Translate more text in OC filters 2018-09-17 10:09:17 +10:00
Kristina Lim
86f4a118dd Translate placeholder for order cycle name filter 2018-09-07 17:58:34 +08:00
Kristina Lim
c14e7ea8d5 Allow bulk update of order cycle name 2018-08-16 21:18:24 +08:00
Rob Harrington
86d7453d26 Ask user to confirm oc date change for open order cycles with subsciptions 2018-06-20 13:06:05 +10:00
luisramos0
a59d9cb670 Fixed broken translation keys in new order cycle screen 2018-05-23 13:12:56 +01:00
HugsDaniel
451c57da40 Changed i18n t() path to get content from locales 2018-03-14 15:01:01 +11:00
Rob Harrington
094c3e70f7 Replace references to 'standing order' with 'subscription' (HAML) 2018-02-09 14:44:13 +11:00
Rob Harrington
7d9d510c0f Adding a comma after each schedule listed on OC index 2018-02-09 14:44:01 +11:00
Rob Harrington
c64f3590ad Using placeholder attribute to show prompt text for schedule dropdown 2018-02-09 14:44:01 +11:00
Rob Harrington
25639a822a Implementing standing order feature toggle on back-end interface 2018-02-09 14:43:57 +11:00
Rob Harrington
733dc76c6c Order Cycles can be assigned to schedules via new/edit form 2018-02-09 14:43:29 +11:00
Rob Harrington
4195bd6cd8 Order Cycles can be filtered by Schedule 2018-02-09 14:43:29 +11:00
Rob Harrington
357040f67a Enterprise User can create and update schedules via OC index 2018-02-09 14:43:28 +11:00
Rob Harrington
920f52e112 Adding schedules to Order Cycles interface 2018-02-09 14:43:28 +11:00
Rob Harrington
0d845b0fd6 Adding column toggling interface to Order Cycles index 2018-02-09 14:43:27 +11:00
Rob Harrington
fe9f147ff0 Adding ability to filter OC index by OC name or 'involved' enterprise 2018-02-09 14:43:27 +11:00
Rob Harrington
2a5f598fb0 Angularising Order Cycles Index 2018-02-09 14:43:20 +11:00
Pau Perez
96e31235da Replace hardcoded strings with i18n keys 2017-09-14 17:31:52 +10:00
Pau Perez
e217f96454 Use Rails lazy lookup for translation keys 
See "lazy" lookup in
http://guides.rubyonrails.org/i18n.html#abstracting-localized-code
 2017-09-14 17:31:52 +10:00
Julius Pabrinkis
ef488133e8 Add missing translations from files list. 2017-07-21 12:17:12 +10:00
Matt-Yorkley
0d1547f439 Require OC ready_for in simple OC UI 2017-04-21 09:34:50 +10:00
Matt-Yorkley
fa5ed529cb Added OC form validation 2017-04-21 09:32:49 +10:00
Matt-Yorkley
a4e4e1ec68 Require OC name 2017-04-21 09:32:49 +10:00
Maikel Linke
775f9b3ada Move text from view to locale (i18n) 2017-04-12 10:06:53 +10:00
Maikel Linke
20c033317f Remove unnecessary string interpolation from view 2017-04-12 09:49:24 +10:00
Matt-Yorkley
e7a5d063ac Update simple OC form 2017-04-12 09:41:40 +10:00
Matt-Yorkley
1fda781d7e Set maxlength on OC displayname field 2017-04-12 09:41:39 +10:00
Matt-Yorkley
45fc801a08 Added tooltips to OC form 2017-04-12 09:41:39 +10:00
François Turbelin
88dea0f2b8 Adding i18n keys on Admin side (Rails views) 2017-01-11 10:00:06 +11:00
Rob Harrington
c8c8f0d02d Removing old cancel button from bottom of OC forms 2016-06-15 10:51:34 +10:00
Bing Xie
001ae19b26 Update create and update order cycle page save-bar 2016-06-15 10:51:34 +10:00
Bing Xie
baa6fda3e0 Use save bar in create order cycle page 2016-06-15 10:51:34 +10:00
Rob Harrington
9dc1294ec5 Outgoing exchanges can be tagged 
Using panels infrastructure to display tags and products interfaces
 2016-05-27 16:25:10 +10:00
Rob Harrington
b9f6cb8800 Adding translations for all column names 2016-05-25 08:10:20 +10:00
Rob Harrington
533a94267a Refactoring save-bar 2016-05-25 08:10:20 +10:00
Rob Harrington
245db8971a Fixing specs broken by faster PhantomJS 2016-05-25 08:10:20 +10:00
Rob Harrington
cf94d67caf Preventing default submit behaviour for order cycle form submission buttons 2016-05-25 08:10:20 +10:00
Rob Harrington
97e53900ad Updating translation to start with a capital letter 2016-05-25 08:10:20 +10:00
Bing Xie
f8ec0d316a Save bar can support cancel button 2016-05-12 11:04:40 +10:00
Bing Xie
7bf6881cb2 Tweaks 2016-05-12 10:45:41 +10:00
Bing Xie
78b4a35d12 Keep the action with save button 2016-05-12 10:45:41 +10:00
Bing Xie
2214c83ec7 Use save_bar on order cycle update form 2016-05-12 10:45:41 +10:00
Bing Xie
38efa218d0 Use save bar on order cycle form 2016-05-12 10:45:41 +10:00
elf Pavlik
6d0dc438a7 i18n fixes after @sstead feedback in #799 2016-03-21 16:55:57 -06:00
Maikel Linke
2a3b3b6dd2 Merge remote-tracking branch 'origin/master' into i18n-hackathon 
Conflicts:
	app/assets/javascripts/admin/enterprise_fees.js
	app/assets/javascripts/admin/enterprises/controllers/side_menu_controller.js.coffee
	app/views/admin/shared/_columns_dropdown.html.haml
	app/views/admin/variant_overrides/_header.html.haml
	app/views/admin/variant_overrides/_products.html.haml
	spec/features/admin/bulk_order_management_spec.rb
	spec/features/admin/variant_overrides_spec.rb
 2016-03-11 15:38:28 +11:00
Maikel Linke
02cbad2697 Remove duplicate lines from merging 2016-03-09 18:49:35 +11:00
Rob Harrington
77e74c5642 OC Coordinators can opt to restrict products in an order cycle to those in their inventory only 2016-03-02 12:10:22 +11:00
Rob Harrington
f05f88c1cb Adding global config to allow shop users to only select from inventory variants in OC interface 2016-03-02 12:10:22 +11:00
elf Pavlik
68db9b9926 fixing faling tests 2016-02-28 19:58:03 +00:00
Nicolas Blanc
cb33ede9dc Revert "elf-pavlik@ee52f1d" 
This reverts commit a8d7732a39.
 2016-02-28 19:54:44 +00:00