raggedstaff/openfoodnetwork
1
0
Fork 0
mirror of https://github.com/openfoodfoundation/openfoodnetwork synced 2026-01-27 21:06:49 +00:00
Code Issues Packages Projects Releases Wiki Activity
1,970 Commits 18 Branches 451 Tags
cdfaf4fc92b4a4594de97d03e4ef47c9eeae6b20
Commit Graph

197 Commits

Author SHA1 Message Date
alexs
38b0a581e0 New landing page - initial layout and functionality 2013-08-05 17:04:56 +10:00
Andrew Spinks
b0d9596489 Fix bug with available on translation - seemed to be getting overridden. 2013-08-05 10:00:47 +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
Rob H
3c973178fd WIP: remove unneeded representative-based data request infrastructure 2013-07-23 10:43:08 +10:00
Rob H
9863a84a27 WIP: transfer bulk product update data requests to API 2013-07-23 10:43:08 +10:00
Rob H
97c03b50cc Create new api routes/views/controllers for bulk product edit 2013-07-23 10:43:08 +10:00
Rob H
703f51ac1b WIP (Spree Update): Update reference to current_user -> spree_current_user 2013-07-23 10:43:08 +10:00
Rob H
4ae5085192 BPUR: Remove unnecessary collections of products on bulk edit page 2013-07-23 10:37:50 +10:00
Rob H
1e64dab9f7 Bulk product update rewrite: basic integration test passing 2013-07-23 10:37:50 +10:00
Rob H
731127d55c WIP: Bulk Product Update Rewrite: initial acceptance testing 2013-07-23 10:37:50 +10:00
Rohan Mitchell
efec0b07d6 Merge branch 'amazon-ec2' 
Conflicts:
	Gemfile
	Gemfile.lock
 2013-07-22 10:29:11 +10:00
Rohan Mitchell
5683656605 Merge branch 'invalid-login-message' 2013-07-12 13:07:30 +10:00
David Cook
98be44b301 Disable asset debug logging 2013-06-20 11:50:34 +10:00
David Cook
4e2549d347 Add host setting, required for authenticating local DBs 2013-06-20 11:49:36 +10:00
David Cook
1a06b53b21 More verbose sign in error message 2013-06-13 16:29:45 +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
ed067be530 Do not set site name and logo URLs in initializer, so that they can be set through admin interface 2013-06-04 08:43:35 +10:00
Andrew Spinks
174d7fac6f Increase unicorn timeout so that reports can run over long date range. 2013-05-05 18:42:42 +10:00
Andrew Spinks
df7dd557b5 Update CMS configuration take S3 details from the spree config. 2013-05-05 14:20:57 +10:00
Andrew Spinks
88508c254b Install db2fog for S3 database backups 
Conflicts:

	Gemfile.lock
 2013-05-05 14:19:56 +10:00
Andrew Spinks
6777a3ce58 Update CMS configuration take S3 details from the spree config. 2013-05-05 14:10:11 +10:00
Rohan Mitchell
234b2d26e9 Add MiGS payment gateway 2013-04-29 15:37:48 +10:00
Rohan Mitchell
e20e4950bb Install db2fog for S3 database backups 2013-04-29 11:31:01 +10:00
Rohan Mitchell
139188e021 Turn on asset init on precompile - now precompile can find assets stored in engines (lib/chili/...), but this breaks Heroku deployment 2013-04-22 17:37:02 +10:00
Rohan Mitchell
8f682a6d07 Unicorn handle forked db connections - fixes PG::Error SSL SYSCALL error: EOF detected 2013-04-19 09:52:16 +10:00
Rohan Mitchell
c5e8ac6fd1 Newrelic unicorn compatibility 2013-04-19 09:39:54 +10:00
Rohan Mitchell
4ce7525748 Configure newrelic for performance monitoring 2013-04-19 09:20:59 +10:00
Rohan Mitchell
3a441cd7d9 Configure travis for postgres 2013-02-24 18:46:31 +11:00
Rohan Mitchell
3982b2a690 Merge branch 'new-spree' 
Conflicts:
	Gemfile.lock
 2013-02-20 15:24:27 +11:00
Rohan Mitchell
8903c13c84 Bugsnag uses SSL, notify on staging as well as production 2013-02-20 10:09:43 +11:00
Rob H
d7c2bdfe22 Change reference to method 'has_role' to 'has_spree_role' in CMS initialiser (required for Spree 1.3) 2013-02-14 12:12:19 +11:00
Rohan Mitchell
83e3c6815d Merge branch 'checkout-changes' 
Conflicts:
	.rvmrc
	app/helpers/application_helper.rb
 2013-01-22 10:30:51 +11:00
Rohan Mitchell
05c9a189c8 Merge branch 'email-changes' 2013-01-17 16:09:25 +11:00
Rob H
9c9431ca7f Install Letter Opener for development environment 2012-12-07 14:31:23 +11:00
Rob H
ef22168349 Move select_distributor and deselect_distributor actions from enterprises controller to orders controller 2012-11-28 10:54:11 +11:00
Rohan Mitchell
d5310452b6 Admin list order cycles 2012-11-27 10:13:12 +11:00
Rohan Mitchell
2a645d04ae Move presentation to presenter, display calculator fields 2012-11-22 14:37:38 +11:00
Rohan Mitchell
98143ffe5b Add calculator to EnterpriseFee, test passes for listing enterprise fees 2012-11-16 16:07:40 +11:00
Rohan Mitchell
6247bd2541 Display admin table of enterprise fees with enterprise, fee type and name columns 2012-11-15 15:03:12 +11:00
Rohan Mitchell
ec74396659 Add enterprise fees to admin configurations menu 2012-11-15 13:58:51 +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
34588e6141 Remove old supplier and distributor routes, models, controllers, views, specs 2012-11-01 09:55:45 +11:00
Rohan Mitchell
9d5c127f0d Add enterprises controller that supercedes suppliers and distributors controllers. Add to cart consumer spec passes. 2012-10-31 16:47:01 +11:00
Rohan Mitchell
1d1c27701d Add admin interface for enterprises 2012-10-31 14:25:00 +11:00
Rohan Mitchell
5ac904005b Merge branch 'order-cycle-reports' 
Conflicts:
	app/controllers/spree/admin/reports_controller_decorator.rb
	config/routes.rb
 2012-10-31 10:18:11 +11:00
Rohan Mitchell
a3042118c7 Merge branch 'group-reports' 
Conflicts:
	app/controllers/spree/admin/reports_controller_decorator.rb
	config/routes.rb
 2012-10-26 17:14:49 +11:00
Rob H
d74591afe6 Fixes to reports controller and addition of order cycles reports 2012-10-26 13:44:13 +11:00
Rohan Mitchell
784969097d Move admin non-Spree controllers out of Spree namespace 2012-10-25 10:45:39 +11:00
Rohan Mitchell
15e91f7743 WIP Move non-admin non-Spree controllers out of Spree namespace 2012-10-25 10:45:39 +11:00
Rob H
eb7d69fe6b commit routes.rb file to prevent overwriting 2012-10-22 11:35:48 +11:00