raggedstaff/openfoodnetwork
1
0
Fork 0
mirror of https://github.com/openfoodfoundation/openfoodnetwork synced 2026-02-03 22:06:07 +00:00
Code Issues Packages Projects Releases Wiki Activity
445 Commits 19 Branches 452 Tags
488fc2d60e599f9ea00e7eec6ab9f00a1f9f2c90
Commit Graph

45 Commits

Author SHA1 Message Date
Rohan Mitchell
488fc2d60e Upgrade capybara, spec/requests changed to spec/features 2013-01-15 10:10:24 +11:00
Rohan Mitchell
63ba5d13a3 Add representative, output enterprise fees as JSON 2012-11-21 14:58:29 +11:00
Rohan Mitchell
6d84cf7613 Merge branch 'master' into enterprises 
Conflicts:
	app/controllers/enterprises_controller.rb
	app/views/spree/checkout/_distributor.html.haml
	db/schema.rb
	spec/lib/open_food_web/group_buy_report_spec.rb
 2012-11-01 11:02:02 +11:00
Rohan Mitchell
1b89331aa4 Update capybara and selenium-webdriver for compatibility with firefox 16 2012-10-31 17:09:26 +11:00
Rohan Mitchell
f03d9b66f0 Update spree_paypal_express to fail gracefully when setting address 2012-10-31 15:17:05 +11:00
Rohan Mitchell
03610c93de Upgrade capybara and selenium-webdriver for compatibility with Firefox 16 2012-10-28 12:28:55 +11:00
Rohan Mitchell
51850be83e Update spree_paypal_express to handle blank states from paypal 2012-10-24 16:19:53 +11:00
Rohan Mitchell
32db258db0 Use spree_heroku with support for staging env 2012-10-24 13:11:40 +11:00
Rohan Mitchell
8c7a02ec10 Fix image uploads with CMS 2012-10-18 11:13:40 +11:00
Rohan Mitchell
f4f250675c Use eaterprises spree_paypal_express with Bugsnag notification of paypal gateway errors 2012-10-18 10:30:35 +11:00
Rohan Mitchell
394a269df2 Update Spree, fixes paypal password blanking bug. Update spree_paypal_express, fixes nil state error on checkout. 2012-10-18 10:17:52 +11:00
Rohan Mitchell
41dcc85ad1 Update version of spree_paypal_express for debugging 2012-10-17 15:26:06 +11:00
Rohan Mitchell
9be9d75cb5 Update version of spree_paypal_express for debugging 2012-10-17 15:10:04 +11:00
Rohan Mitchell
11483a77e8 Update bugsnag and spree_paypal_express for paypal error debugging 2012-10-17 08:42:33 +11:00
Rohan Mitchell
642f58551c Use spree_paypal_express from RohanM with debugging for nil state from paypal address error 2012-10-16 10:34:11 +11:00
Rohan Mitchell
b35fb618f3 Add base install of Comfortable Mexican Sofa 2012-10-11 10:50:36 +11:00
Rohan Mitchell
2bce9df25a Track 1-1-stable on spree git, fixes order quantity change bug 2012-09-21 15:55:51 +10:00
Rohan Mitchell
479c49752c Update spree_paypal_express, hopefully fixing 'Validation failed: State can't be blank' error 2012-09-21 15:32:19 +10:00
Rohan Mitchell
593f3887c8 Switch pry for pry-debugger 2012-09-21 12:29:06 +10:00
Rohan Mitchell
3794c00856 Upgrade Rails to 3.2.8 and Spree to 1.1.3 2012-09-14 10:20:52 +10:00
Rohan Mitchell
356ae40c7b Display product descriptions as HTML in checkout 2012-09-13 13:05:12 +10:00
Rohan Mitchell
7d5c158021 Install Bugsnag 2012-08-02 10:32:33 +10:00
Rohan Mitchell
5e04032797 Explicitly specify Spree 1.1.1, fix test regression in OrdersController 2012-07-23 18:48:30 +10:00
Andrew Spinks
7e9a84087e cleaning up order report 2012-07-19 22:48:42 +10:00
Rohan Mitchell
9afa566be5 Add spree_last_address extension, which retrieves a customer's address when they order a second time so they don't need to retype it 2012-07-01 11:44:18 +10:00
Rohan Mitchell
82dd485e01 Install spree_paypal_express gem 2012-06-29 14:40:20 +10:00
Rohan Mitchell
4911a06c9d Display current distributor in main nav bar 2012-06-22 11:46:40 +10:00
Rohan Mitchell
f962db4288 Convert factories from machinist to factory girl 2012-06-19 13:54:34 +10:00
Rohan Mitchell
13569b5263 Switch to patched version of simple_form, which fixes collection_check_boxes when used within form_for block 2012-06-19 10:27:09 +10:00
Rohan Mitchell
eb095baf64 Installed spork 2012-06-19 07:08:27 +10:00
Rohan Mitchell
3d0f6a43b4 Add pry to Gemfile 2012-06-18 19:41:00 +10:00
Rohan Mitchell
d704f3aa68 Enable therubyracer JS env, reqd on linux 2012-06-18 16:58:06 +10:00
Andrew Spinks
1288760839 Added first working acceptance spec for supplier. 2012-06-09 14:41:09 +10:00
Andrew Spinks
04e4523f6b upgrade to spree 1.1 2012-05-20 16:28:14 +10:00
Andrew Spinks
02f5d01ca1 try to get s3 to work. 2012-05-12 13:37:26 +10:00
Andrew Spinks
f7372a80c2 add distributor to checkout 2012-04-09 09:56:37 +10:00
Andrew Spinks
b2b8bd0112 add selector for distributor in checkout. Not saving relation as yet. 2012-04-07 16:34:27 +10:00
Andrew Spinks
0a6852616d added distributors. 2012-03-31 19:16:57 +11:00
Andrew Spinks
511dfa23af add rspec 2012-03-31 16:38:16 +11:00
Andrew Spinks
5ae983caba Use Australian locale. 2012-03-28 20:28:52 +11:00
Andrew Spinks
6debd10a0a lockit! 2012-03-27 14:05:48 +11:00
Andrew Spinks
7f33da5cb1 add initial s3 support. 2012-03-27 12:09:54 +11:00
Andrew Spinks
f9bd58bf5f switch to unicorn. 2012-03-27 11:22:20 +11:00
Andrew Spinks
cd1938a74e spree install. 2012-03-27 11:06:49 +11:00
Andrew Spinks
b6ca20beee new rails 3.1.4 app 2012-03-27 10:10:26 +11:00