5416 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Paul Mackay	2f05fc3824	#275: Insert receival time and instructions into email.	2015-05-24 10:38:49 +01:00
Paul Mackay	955f41633a	Merge remote-tracking branch 'refs/remotes/origin/master' into producer-emails	2015-05-11 08:36:09 +01:00
Paul Mackay	fd37324359	#536: Add permissions checking for Notify producers action.	2015-05-09 11:02:25 +01:00
Rohan Mitchell	e8c8d8885c	Merge branch 'master' into single-order-patches	2015-05-08 12:42:56 +10:00
Rohan Mitchell	bd6bac8874	Display deployment output in real time ... This reverts commit 485eee4bdd.	2015-05-06 20:02:22 +10:00
Rohan Mitchell	50d2ddc05f	Add progress comments	2015-05-06 20:00:50 +10:00
Rohan Mitchell	10b7a86745	Add debugging to merge script	2015-05-06 19:50:06 +10:00
Rohan Mitchell	6d33dc5070	Add script to merge master into the current branch if required before running specs	2015-05-06 19:41:36 +10:00
Rohan Mitchell	d109e898d2	Preserve newlines when displaying deploy script output	2015-05-06 19:38:20 +10:00
Rohan Mitchell	3dee29cd12	Remove build badge - master branch is always green	2015-05-06 19:37:21 +10:00
Rohan Mitchell	0921cd2dfa	Merge branch 'master' into single-order-patches	2015-05-06 18:13:55 +10:00
Rohan Mitchell	7b4130972b	Fix first feature spec sometimes timing out	2015-05-06 18:12:17 +10:00
Rohan Mitchell	485eee4bdd	Deploy scripts display their output	2015-05-06 18:07:50 +10:00
Rohan Mitchell	f84e704d99	Retry simple push-to-master script	2015-05-06 17:59:36 +10:00
Rohan Mitchell	ad7e5a45bb	Add updated merge script	2015-05-06 17:58:36 +10:00
Rohan Mitchell	d9404d3332	Merge branch 'master' into single-order-patches	2015-05-06 17:29:23 +10:00
Rohan Mitchell	e43d726b97	Merge branch 'master' into payments-report-fix	2015-05-06 14:55:10 +10:00
Rob Harrington	8788322492	Alllowing payments in payment reports to access soft-deleted payment methods	2015-05-06 11:10:50 +10:00
Rohan Mitchell	63ec0d7dcf	Merge branch 'master' into folklabs-producer-emails	2015-05-05 11:48:31 +10:00
Rick Giner	368402f115	Changed selectors' ng-repeat. Using existing variable instead of method call	2015-05-03 15:24:16 +10:00
Rick Giner	9e70c80d1d	bind-once in product modal	2015-05-03 14:48:27 +10:00
Rick Giner	8fb11defdb	bind-once in groups home page	2015-05-03 14:41:34 +10:00
Rick Giner	9c26b3ebb2	bind-once in partials	2015-05-03 14:34:42 +10:00
Rick Giner	3fc616cdff	bind-once on hubs	2015-05-03 14:11:09 +10:00
Rick Giner	16e9f0545b	bind-once in products	2015-05-03 14:02:33 +10:00
Rick Giner	a3664d4448	Added bindonce and ng-if improvements to Producers templates	2015-05-03 12:51:59 +10:00
Maikel Linke	11acb3ba59	Allow to remove adjustments ... Managers of an order cycle and the distributor of an order are allowed to remove an adjustment from the order.	2015-05-01 15:59:46 +10:00
Rohan Mitchell	e91de69d5a	Merge branch 'master' into pin-refunds	2015-05-01 14:58:19 +10:00
Rohan Mitchell	03ae740cd6	Revert "Display header for Xero invoices report" ... This reverts commit a6cecdcc25.	2015-05-01 14:55:26 +10:00
Maikel Linke	7c55285708	Merge branch 'master' of github.com:openfoodfoundation/openfoodnetwork into single-order-patches	2015-05-01 14:50:51 +10:00
Maikel Linke	e6e063670c	Allow managers to remove line items from order ... Managers of an order cycle and the distributor of an order are allowed to remove a line item from the order.	2015-05-01 14:49:34 +10:00
Rohan Mitchell	153604dd64	Merge branch 'single-order-patches'	2015-05-01 14:39:17 +10:00
Maikel Linke	b7bac326bd	admin order edit: re-label update button to "update and recalculate fees"	2015-05-01 12:05:43 +10:00
Rohan Mitchell	a6cecdcc25	Display header for Xero invoices report	2015-05-01 11:59:52 +10:00
Rohan Mitchell	91ca5f0213	Fix specs for receival_time / instructions	2015-05-01 10:08:24 +10:00
Rohan Mitchell	f5b45fa0ba	Merge branch 'master' into folklabs-producer-emails	2015-05-01 09:51:01 +10:00
Maikel Linke	af78859db6	Merge remote-tracking branch 'origin/master' into single-order-patches	2015-04-30 17:18:02 +10:00
Maikel Linke	5efc0a5110	quick fix: update fees after updating order	2015-04-30 16:29:51 +10:00
Rohan Mitchell	2c7a5c0656	Update Spree - fixes bug where Payment#method_missing depends on #provider already called.	2015-04-30 15:49:48 +10:00
Rohan Mitchell	0b652a2113	Add refund icon	2015-04-30 15:49:48 +10:00
Rohan Mitchell	b498c28632	Payments can be refunded	2015-04-30 15:49:48 +10:00
Rohan Mitchell	8184a7c7b2	Pin payments can't void or credit, but they can refund	2015-04-30 15:49:48 +10:00
Rohan Mitchell	b09ae550c8	Add spec for payment actions	2015-04-30 15:49:48 +10:00
Rohan Mitchell	f4df227ef0	Buildkite should now support Fuubar	2015-04-30 13:54:27 +10:00
Rohan Mitchell	a207f50aeb	Merge branch 'master' into delay-devise-emails ... Conflicts: script/run_tests.sh	2015-04-30 12:29:06 +10:00
Rohan Mitchell	73376b30e2	Convention	2015-04-29 15:56:27 +10:00
Rohan Mitchell	3565548e91	Extract data preparation into private methods	2015-04-29 15:50:42 +10:00
Rohan Mitchell	6999bcfd4e	Only include complete orders in producer mailer report	2015-04-29 15:43:50 +10:00
Rohan Mitchell	2fe5d7c73f	Remove commented code, use neater syntax for accessing Spree config var	2015-04-29 15:33:39 +10:00
Rohan Mitchell	3a3bf19cf8	Clean up duplication	2015-04-29 15:31:42 +10:00