raggedstaff/openfoodnetwork
1
0
Fork 0
mirror of https://github.com/openfoodfoundation/openfoodnetwork synced 2026-02-05 22:26:07 +00:00
Code Issues Packages Projects Releases Wiki Activity
558 Commits 18 Branches 452 Tags
efec0b07d6fcd6b944ccad5df3f5bee5fc2c6204
Commit Graph

558 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
7341d5e11a ignore Sublime project files 2013-07-05 16:24:37 +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
65af89c962 ignore new rvm files 2013-06-20 11:48:22 +10:00
Rohan Mitchell
772d01abf7 Merge branch 'favicon' 2013-06-14 12:22:51 +10:00
David Cook
1a06b53b21 More verbose sign in error message 2013-06-13 16:29:45 +10:00
Rohan Mitchell
1e94f88c5e Ensure order decorator is required, fix test fragility 2013-06-07 15:40:03 +10:00
David Cook
0f8cd4705a Regenerate favicon.ico from higher quality image 2013-05-24 10:14:40 +10:00
David Cook
731cf33f86 Add new favicon.ico file with size 16, 32 and 64 2013-05-22 16:21:13 +10:00
Andrew Spinks
df7dd557b5 Update CMS configuration take S3 details from the spree config. 3.1.2 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
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
3e2d31d432 spree-last-address repo deleted - use mirror 
Conflicts:

	Gemfile
	Gemfile.lock
 2013-04-19 09:27:40 +10:00
Rohan Mitchell
4ce7525748 Configure newrelic for performance monitoring 2013-04-19 09:20:59 +10:00
Rohan Mitchell
fa11ff8982 Remove more spork-specific things, remove unused cuc config from zeus 2013-04-05 15:25:46 +11:00
Rohan Mitchell
ed7bded642 Remove spork 2013-04-05 15:16:54 +11:00
Rob H
5544ccb94e Merge branch 'master', remote-tracking branch 'origin' 2013-03-27 10:42:05 +11:00
Rohan Mitchell
3e6c56a638 Add turbo sprockets for faster asset precompile 2013-03-16 13:08:14 +11:00
Rohan Mitchell
5089d3bb22 Add simplecov 2013-03-11 10:57:14 +11:00
Rohan Mitchell
bd5533e2b1 Revert "Add a failing test to test travis" 
This reverts commit 72aa8fe5e5.
 2013-02-24 20:22:37 +11:00
Rohan Mitchell
72aa8fe5e5 Add a failing test to test travis 2013-02-24 19:57:57 +11:00
Rohan Mitchell
cdc3ab09a1 Set up xvfb for Travis 2013-02-24 19:42:32 +11:00
Rohan Mitchell
b030793f15 Fix migrations that fail because of coupling to changed/removed models 2013-02-24 19:09:43 +11:00
Rohan Mitchell
3a441cd7d9 Configure travis for postgres 2013-02-24 18:46:31 +11:00
Rohan Mitchell
2b19253895 Attempt 2 2013-02-24 18:17:46 +11:00
Rohan Mitchell
d60935c800 Exclude pry from CI build 2013-02-24 18:05:11 +11:00
Rohan Mitchell
4bcd55959a spree-last-address repo deleted - use mirror 2013-02-24 17:51:46 +11:00
Rohan Mitchell
719ef386bf Only build on Ruby 1.9.3 2013-02-24 17:51:20 +11:00
Rohan Mitchell
e3fdb12289 Add travis config 2013-02-24 17:36:19 +11:00
Rohan Mitchell
b0a665aef7 Update ransack (rubygems could not find previous version) 2013-02-20 15:44:21 +11:00
Rohan Mitchell
3982b2a690 Merge branch 'new-spree' 
Conflicts:
	Gemfile.lock
 2013-02-20 15:24:27 +11:00
Rob H
a59b136864 Spree 1.3 upgrade: fix final failing tests 2013-02-20 15:16:43 +11:00
Rob H
055c07a466 Add before_payment method to checkout controller (fixes issues with spree_paypal_express) 2013-02-20 14:04:10 +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
046eb256ff Fix issues causing enterprise fee tests to break 2013-02-15 14:10:56 +11:00
Rob H
68246e08d2 Fix stack overflow error in admin shipping method test 2013-02-15 10:34:17 +11:00
Rob H
1ded1bac3f Lengthen Capybara.default_wait_time for tests that fail due to long load time 2013-02-15 10:31:41 +11:00
Rob H
2f1a9094bf Fix StaleObjectError in order model test 2013-02-14 16:49:28 +11:00
Rob H
2cdf458d6a Move additional of tabs to main nav bar to defaces, rather than overriding view directly 2013-02-14 15:42:47 +11:00
Rob H
9e9199643e Remove unneeded :partial from override 2013-02-14 15:35:50 +11:00
Rob H
c956706d78 Move set_current_order override to new location in lib (Spree 1.3 Upgrade), and update home controller test 2013-02-14 15:12:50 +11:00
Rob H
290f2276cd Update cms_admin spec work after Spree 1.3 upgrade broke it 2013-02-14 14:03:14 +11:00
Rob H
b924b0c817 Remove unnecessary include of Spree::Core::CurrentOrder (helper is now accessible by all controllers in Spree 1.3) 2013-02-14 12:24:01 +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
Rob H
a3746c6c59 Add analytics helper to Enterprises Controller 2013-02-14 12:10:31 +11:00
Rohan Mitchell
7cc1c97c53 Upgrade spree to 1.1.6beta 2013-02-12 09:18:50 +11:00
Rohan Mitchell
ccfe6bc0b3 Update bugsnag 2013-02-12 09:11:38 +11:00