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
1,970 Commits 21 Branches 450 Tags
cdfaf4fc92b4a4594de97d03e4ef47c9eeae6b20
Commit Graph

133 Commits

Author SHA1 Message Date
Will Marshall
e4bb2f1cdf Keeping Foundation 4 and 5 parallel 2014-03-27 13:01:02 +11:00
Will Marshall
bf7d12b40e Upgrading Foundation, starting to work through regression issues 2014-03-27 13:01:01 +11:00
Rohan Mitchell
6934cf236f Update Rails 2014-02-28 14:34:14 +11:00
Will Marshall
f5a3167fac Patching up the form and update to get form submission working 2014-02-26 15:12:35 +11:00
Will Marshall
b6b5c2889e Reworking checkout to use f_form_for, show validation, better controller layout 2014-02-21 14:31:03 +11:00
Will Marshall
ece7caa14a Moving Darkswarm to new Angular version 2014-02-18 14:00:23 +11:00
Will Marshall
1a1057b824 Removing unhelpful gem 2014-01-16 13:04:44 +11:00
Will Marshall
d4d2482927 Adding ng-min 2014-01-16 11:24:53 +11:00
Rohan Mitchell
2f98888acd Remove active model serializers gem 2014-01-08 11:31:05 +11:00
Will Marshall
c4c5f3a8c7 Merging from master 2013-12-17 14:18:21 +11:00
Will Marshall
843a1133ef Moving to use custom serializers for ze JSON API 2013-12-17 13:48:08 +11:00
Will Marshall
12743850b4 Removing a chili, refactoring order mailer 2013-12-13 15:40:22 +11:00
Will Marshall
9efd7c2d69 Getting the darkswarm build flow up and running. Like a boss 2013-12-04 13:09:30 +11:00
Will Marshall
a8a12d6d04 Adding some magical guard unicorn sparkles 2013-11-29 16:11:56 +11:00
Will Marshall
281220c490 Updating a few gems 2013-11-13 16:25:06 +11:00
Will Marshall
26f2d27d64 Updating therubyracer to fix mac compatibility with libv8 2013-11-01 14:46:41 +11:00
Rohan Mitchell
0c5312f893 Update gem repo URLs 2013-10-23 10:41:26 +11:00
Rohan Mitchell
f06f4702ed Update newrelic agent 2013-09-19 09:35:13 +10:00
Rohan Mitchell
c30b8554da Pin deface to working version, update spree_paypal_express with state capitalisation fix 2013-09-18 12:39:20 +10:00
Rohan Mitchell
fb9adf051e Update bugsnag. I can haz custom exception metadata? 2013-09-18 11:42:31 +10:00
Rohan Mitchell
5d0dabc1e8 Switch to eaterprises spree_paypal_express with instrumentation to debug state-blank-from-paypal issue 2013-09-18 09:15:30 +10:00
Rohan Mitchell
42a6ad6e7c Inline spree_last_address into the codebase to attempt to fix errors with it appearing only in prod 2013-09-17 13:48:53 +10:00
Rohan Mitchell
f0381f7579 Fix problems with spree_last_address - upgrade gem to a newer version, add a spec around it 2013-09-16 14:11:00 +10:00
Rohan Mitchell
9410123841 Convert to github-specific notation in gemfile 2013-09-16 14:11:00 +10:00
alexs333
019d8ed2dc Reverted poltergeist/capybara upgrade. 2013-08-23 17:02:33 +10:00
alexs333
ef96099f2d Merge branch 'master' of https://github.com/eaterprises/openfoodweb 
Conflicts:
	Gemfile.lock
 2013-08-23 16:11:02 +10:00
alexs333
9be7b5eecc Updated poltergeist. 2013-08-23 15:40:04 +10:00
Rohan Mitchell
158cd6994b Update spree, syntax fix 2013-08-23 14:00:31 +10:00
Rohan Mitchell
2e1de9a6d3 Fix admin create order - remove override on spree address form, update to spree patched to fix respond_override (spree issue #2210), fix nil state error 2013-08-23 14:00:31 +10:00
Rohan Mitchell
d465560dba Update selenium-webdriver (for test debugging with selenium) 2013-08-22 10:49:42 +10:00
alexs
da68dae586 Added unicorn-rails gem for running unicorn in dev. 2013-08-15 16:34:21 +10:00
alexs
c72a4a961f Added the mechanism to test JSON APIs (Rabl stuff etc.) 2013-08-15 11:38:52 +10:00
Rohan Mitchell
eaf71e28bb Raise an error when tests hit the network 2013-08-14 11:19:16 +10:00
alexs
48cb725da5 Upgraded fundation to fetch from the edge (until the next release when gmaps4rails integration is fixed). 2013-08-14 10:39:42 +10:00
alexs
1a3c09a846 Temporarily downgraded zurb foundation to make it work with gmaps4rails (will be fixed in future release of Foundation). 2013-08-13 15:18:31 +10:00
alexs
e9110ac752 Merge branch 'master' of github.com:eaterprises/openfoodweb 
Conflicts:
	Gemfile.lock
 2013-08-11 16:59:02 +10:00
alexs
51a4795763 Added rack-ssl and spinjs. 2013-08-11 16:52:34 +10:00
Rohan Mitchell
b84c476348 Upgrade Rails to 3.2.14, use forked spree with calculators that are compatible with LineItems 2013-08-09 15:30:35 +10:00
alexs
b5cc2ab4cf Added postcode search that redirect to page with map view. 2013-08-09 13:20:22 +10:00
alexs
28f94ae959 Stubbed out geolocation. 2013-08-07 18:03:41 +10:00
alexs
ef39d0ce31 Geocoded Spree addresses 2013-08-07 14:01:27 +10:00
alexs
38b0a581e0 New landing page - initial layout and functionality 2013-08-05 17:04:56 +10:00
alexs
fadb1e4710 Merge branch 'master' of github.com:eaterprises/openfoodweb 
Conflicts:
	Gemfile
 2013-07-23 18:02:28 +10:00
alexs
37a88a1be6 Changed JavaScript driver from selenium to phantomjs. 2013-07-23 17:54:05 +10:00
Andrew Spinks
7cb054f430 Merge branch 'master' into order-cycle-selection 
Conflicts:
	Gemfile
	Gemfile.lock
	app/controllers/spree/orders_controller_decorator.rb
	app/models/enterprise.rb
	app/models/spree/order_decorator.rb
	app/views/spree/checkout/_other_available_distributors.html.erb
	app/views/spree/products/_add_to_cart.html.haml
	lib/open_food_web/distributor_change_validator.rb
	spec/spec_helper.rb
 2013-07-23 14:42:57 +10:00
Rohan Mitchell
fe61cddda6 Merge branch 'local-organics' 
Conflicts:
	Gemfile
	Gemfile.lock
	app/assets/stylesheets/store/variables.css.scss
	app/overrides/add_feedback_script.rb
	app/views/spree/shared/_order_details_steps_data.html.erb
	db/schema.rb
	script/rails
	spec/spec_helper.rb
 2013-07-23 11:40:03 +10:00
Rohan Mitchell
86616c4a6c Add sass gem explicitly 2013-07-23 10:47:35 +10:00
Rob H
de78d09790 New branch for spree_last_address to fix compatibility issue with spree_auth_devise 1.3 2013-07-23 10:43:08 +10:00
Rob H
56f507dc03 WIP (Spree Update): Bump spree_auth_devise to resolve issue with admin 'Configuration' tab 2013-07-23 10:43:08 +10:00
Rob H
7941a61879 WIP (Spree Update): Update Spree 1.3.3, install and run migrations 2013-07-23 10:43:08 +10:00