raggedstaff/openfoodnetwork
1
0
Fork 0
mirror of https://github.com/openfoodfoundation/openfoodnetwork synced 2026-02-10 23:07:47 +00:00
Code Issues Packages Projects Releases Wiki Activity
15,608 Commits 20 Branches 453 Tags
20c41ce69e04299a6bf821094de21f63f678dcc2
Commit Graph

15608 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Steve Pettitt
3a813cb612 Merge master 2016-05-14 10:09:31 +01:00
Rohan Mitchell
da57e04a50 Merge branch 'fix-groups-map' of https://github.com/bingxie/openfoodnetwork into fix-groups-map 2016-05-13 16:02:22 +10:00
Bing Xie
ba2d5548ff Fix groups map view 2016-05-13 15:44:34 +10:00
Maikel
a4e5e49a08 Auto-merged master into uk-order-cycle-report on deployment. 2016-05-13 11:28:15 +10:00
Rohan Mitchell
027976626c Add spec for error summing Spree::Money 2016-05-13 11:19:44 +10:00
Rohan Mitchell
9f56494c4c Simplify 2016-05-13 10:36:23 +10:00
Steve Pettitt
ab37cd2577 Fix specs, need to add new for HTML 2016-05-13 10:30:21 +10:00
Steve Pettitt
559f7afc60 HTML order cycle report email, text customisable in translations 2016-05-13 10:30:21 +10:00
Steve Pettitt
ef418c7f50 Change to use total rather than display_total (which returns a Spree::Money object) 2016-05-13 10:30:21 +10:00
Steve Pettitt
c80255e9ab Add total to producer emails 2016-05-13 10:30:21 +10:00
Rohan Mitchell
7b994adc23 Merge branch 'use-save-bar' of https://github.com/bingxie/openfoodnetwork into use-save-bar 
Conflicts:
	app/assets/javascripts/admin/order_cycles/controllers/edit.js.coffee
	app/assets/javascripts/templates/admin/save_bar.html.haml
	app/views/admin/order_cycles/edit.html.haml
	app/views/admin/variant_overrides/_products.html.haml
	app/views/spree/admin/orders/bulk_management.html.haml
 2016-05-13 10:05:39 +10:00
Bing Xie
f8ec0d316a Save bar can support cancel button 2016-05-12 11:04:40 +10:00
Bing Xie
7040e4baae Resize window to fix failed test 2016-05-12 10:45:41 +10:00
Bing Xie
fed3ae9e85 Make the page long enough to avoid the save bar overlaying the form 2016-05-12 10:45:41 +10:00
Bing Xie
89ae77dfd9 Make the save bar look better 2016-05-12 10:45:41 +10:00
Bing Xie
7bf6881cb2 Tweaks 2016-05-12 10:45:41 +10:00
Bing Xie
ed1a06495b Remove unused test code 2016-05-12 10:45:41 +10:00
Bing Xie
e5d2e5010b Fix failed tests 2016-05-12 10:45:41 +10:00
Bing Xie
3760a34b2b Add save_bar to the order cycles simple editing form 2016-05-12 10:45:41 +10:00
Bing Xie
26bb1a9beb Update AdminEditOrderCycleCtrl unit tests 2016-05-12 10:45:41 +10:00
Bing Xie
d59dea29ab Fix failed test for the default form 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
7fc37e4737 Tweak save_bar css 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
d10719330d Extend save_bar directive to support more buttons 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
Rohan Mitchell
8c747f02b5 Merge branch 'use-save-bar' of https://github.com/bingxie/openfoodnetwork into use-save-bar 2016-05-11 14:41:41 +10:00
Rob H
6c625297f2 Merge pull request #934 from oeoeaio/uk/trial-length 
More intuitive logic for minimum billable turnover
 2016-05-11 12:36:54 +10:00
Maikel
8a47d49dfc Auto-merged master into uk/order_cycle_report on deployment. 2016-05-11 08:20:05 +10:00
Steve Pettitt
d5a7e907a3 Fix specs, need to add new for HTML 2016-05-10 23:11:14 +01:00
Steve Pettitt
6ecf896fa2 HTML order cycle report email, text customisable in translations 2016-05-10 23:04:06 +01:00
Paul Mackay
6dd989484a Switch to using the Spree GA tracker code 2016-05-10 05:32:40 +01:00
Bing Xie
a37820a963 Resize window to fix failed test 2016-05-06 14:55:16 +10:00
Continuous Integration
f90e7d3239 Merge remote-tracking branch 'origin/master' into HEAD 2016-05-06 13:58:37 +10:00
Bing Xie
08f0011244 Make the page long enough to avoid the save bar overlaying the form 2016-05-06 12:43:50 +10:00
Maikel Linke
3e231da472 Translate subjects of enterprise emails 
Minor text change

Fix #906

Thanks to Nicolas Blanc:
https://github.com/openfoodfoundation/openfoodnetwork/pull/937
 2016-05-06 11:31:15 +10:00
Bing Xie
064e3c426e Make the save bar look better 2016-05-06 11:00:34 +10:00
Continuous Integration
f0b80b47f1 Auto-merge from CI [skip ci] 2016-05-05 23:23:34 +10:00
Paul Mackay
22a6661b51 Improved layout and image for 404 and 500 error pages 2016-05-05 14:21:16 +01:00
Steve Pettitt
7f1fc56f78 Change to use total rather than display_total (which returns a Spree::Money object) 2016-05-04 07:58:23 +01:00
Bing Xie
3cac9c452f Tweaks 2016-05-04 14:56:21 +10:00
Bing Xie
57ec7bb9a9 Remove unused test code 2016-05-04 12:45:23 +10:00
Bing Xie
8b5e5105a8 Fix failed tests 2016-05-04 12:45:23 +10:00
Bing Xie
1833f0dd5d Add save_bar to the order cycles simple editing form 2016-05-04 12:45:23 +10:00
Bing Xie
019e16c5ba Update AdminEditOrderCycleCtrl unit tests 2016-05-04 12:45:23 +10:00
Bing Xie
885d489bc3 Fix failed test for the default form 2016-05-04 12:45:23 +10:00
Bing Xie
63b644551c Keep the action with save button 2016-05-04 12:45:23 +10:00
Bing Xie
70ce58f5e1 Tweak save_bar css 2016-05-04 12:45:23 +10:00
Bing Xie
33d0f9fc1b Use save_bar on order cycle update form 2016-05-04 12:45:23 +10:00
Bing Xie
00858656b5 Extend save_bar directive to support more buttons 2016-05-04 12:45:23 +10:00