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

107 Commits

Author SHA1 Message Date
Will Marshall
d4f26c9ef1 Moving foundation out of assets group 2014-03-27 13:01:02 +11:00
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
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
Rohan Mitchell
5c744c7295 Move enterprises_distributor_info_rich_text_feature styles into central files 2013-12-13 16:01:36 +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
Rohan Mitchell
0c5312f893 Update gem repo URLs 2013-10-23 10:41:26 +11: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
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
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
alexs
42c912bb0d Using webmock for test group only. 2013-08-14 17:26:42 +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
00743fada8 Added foundation gem to the right group. 2013-08-07 14:06:40 +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
108dd6e619 Update Rails to 3.2.13 from 3.2.11 2013-07-23 10:42:07 +10:00
Rob H
ba840124d2 Install rabl and oj 2013-07-23 10:40:42 +10:00
Rohan Mitchell
efec0b07d6 Merge branch 'amazon-ec2' 
Conflicts:
	Gemfile
	Gemfile.lock
 2013-07-22 10:29:11 +10:00
Rohan Mitchell
cbeffaced1 Configure Travis, remove spork, add simplecov, add turbo sprokets. 
Add travis config
(cherry picked from commit e3fdb12289)

Only build on Ruby 1.9.3
(cherry picked from commit 719ef386bf)

Exclude pry from CI build
(cherry picked from commit d60935c800)

Conflicts:

	Gemfile

Attempt 2
(cherry picked from commit 2b19253895)

Conflicts:

	Gemfile.lock

Configure travis for postgres
(cherry picked from commit 3a441cd7d9)

Fix migrations that fail because of coupling to changed/removed models
(cherry picked from commit b030793f15)

Set up xvfb for Travis
(cherry picked from commit cdc3ab09a1)

Add a failing test to test travis
(cherry picked from commit 72aa8fe5e5)

Revert "Add a failing test to test travis"

This reverts commit 72aa8fe5e5.
(cherry picked from commit bd5533e2b1)

Add simplecov
(cherry picked from commit 5089d3bb22)

Conflicts:

	Gemfile.lock

Add turbo sprockets for faster asset precompile
(cherry picked from commit 3e6c56a638)

Remove spork
(cherry picked from commit ed7bded642)

Conflicts:

	spec/spec_helper.rb

Remove more spork-specific things, remove unused cuc config from zeus
(cherry picked from commit fa11ff8982)

Ensure order decorator is required, fix test fragility
(cherry picked from commit 1e94f88c5e)
 2013-06-07 16:23:24 +10:00
Rohan Mitchell
6670c9543b Remove spork 
Conflicts:

	Gemfile
	Gemfile.lock
 2013-06-04 14:04:26 +10:00
Andrew Spinks
88508c254b Install db2fog for S3 database backups 
Conflicts:

	Gemfile.lock
 2013-05-05 14:19:56 +10:00
Rohan Mitchell
e20e4950bb Install db2fog for S3 database backups 2013-04-29 11:31:01 +10:00
Rohan Mitchell
953fe22d4c Add new feature for rich text distributor info for enterprises 2013-04-26 12:27:15 +10:00
Rohan Mitchell
9f6d1a2f18 Order cycle reports are precise to time of day, not just date 2013-04-25 21:22:26 +10:00
Rohan Mitchell
0da57f1d6c Remove spree_heroku - S3 support is now built into Spree 2013-04-23 07:32:23 +10:00