raggedstaff/openfoodnetwork
1
0
Fork 0
mirror of https://github.com/openfoodfoundation/openfoodnetwork synced 2026-01-24 20:36:49 +00:00
Code Issues Packages Projects Releases Wiki Activity
5,382 Commits 21 Branches 450 Tags
89b153dc2c8fcd899fe1606b0c8f09cb06a4c4ce
Commit Graph

5382 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Rob Harrington
89b153dc2c Update AJAX request to use sells instead of deprecated is_distributor attribute 2015-05-07 12:50:54 +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
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
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
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
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
Rohan Mitchell
153604dd64 Merge branch 'single-order-patches' 2015-05-01 14:39:17 +10:00
Rohan Mitchell
a6cecdcc25 Display header for Xero invoices report 2015-05-01 11:59:52 +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
Maikel Linke
ecf635e080 handle missing bill_address on admin order page 2015-04-29 14:32:13 +10:00
Maikel Linke
2e66a082eb add customer notes to admin order index page 2015-04-29 14:31:59 +10:00
Rohan Mitchell
3b61d7a1e0 Add ref for country ISO codoes 2015-04-29 14:12:08 +10:00
Rohan Mitchell
c3f99d7540 Merge branch '441-default-country' of https://github.com/folklabs/openfoodnetwork into folklabs-441-default-country 2015-04-29 14:07:58 +10:00
Maikel Linke
f6d87eee87 Merge remote-tracking branch 'origin/master' into single-order-patches 2015-04-29 13:20:44 +10:00
Maikel Linke
e82a3a9d82 add ship button to admin order index page 2015-04-29 12:30:05 +10:00
Maikel Linke
8511bd19ce add ship button to order edit page 2015-04-29 12:03:49 +10:00
Maikel Linke
1268108877 handle ship event on order 2015-04-29 12:03:11 +10:00
Maikel Linke
2b0f867ed8 new order method ready_to_ship? 2015-04-29 11:42:35 +10:00
Rob Harrington
6a4de7c7e2 Hiding filters on list views because styling is broken v0.8.1 2015-04-24 19:35:18 +10:00
Rob Harrington
505fd8ff96 Merge branch 'properties' of github.com:openfoodfoundation/openfoodnetwork into properties 2015-04-24 17:20:41 +10:00
Rob Harrington
b1b1bfd8f6 Resolve conflict for overflow dropdown between multiple single-line-selectors on the one page 2015-04-24 16:05:39 +10:00
Maikel Linke
f94a5a975a Edit Order: resend button uses new pretty template. 2015-04-24 15:31:45 +10:00
Rohan Mitchell
29faa5f3c6 Merge branch 'master' into properties 2015-04-24 15:14:52 +10:00
Rohan Mitchell
8e2c224d4d cd before sourcing includes 2015-04-24 15:00:49 +10:00
Rohan Mitchell
bb2f2a6f54 Also stop delayed job before loading staging baseline 2015-04-24 15:00:38 +10:00
Rob Harrington
dab3b59f6a Merge branch 'master' into properties 2015-04-24 14:00:08 +10:00
Rob Harrington
bdf462926d Ensure that producer properties have a position 2015-04-24 13:05:01 +10:00