Foodsoft
/
foodsoft
1
1
Fork 0
Code Issues 36 Pull Requests 5 Projects 1 Releases Wiki Activity
994 Commits 22 Branches 1 Tag 31 MiB
Commit Graph

83 Commits

Author SHA1 Message Date
wvengen 0abb63279f Merge branch 'master' into updated-gems 
Conflicts:
	Gemfile.lock
 2013-09-18 13:00:26 +02:00
wvengen 1cf2145ff6 version update for security (now properly) (see also resque/redis-namespace#64) 2013-09-17 15:02:58 +02:00
wvengen e6320e5b7b add resque version for security 2013-09-17 14:49:19 +02:00
wvengen 707f487128 update spec gems to make tests work again 2013-09-07 01:34:34 +02:00
wvengen 7de57715f2 Merge branch 'master' into tests-rspec 
Conflicts:
	Gemfile
 2013-09-07 01:11:24 +02:00
Benjamin Meichsner 4ea940e4a3 Removed unused acts_as_configurable gem. 2013-09-02 10:03:12 +02:00
wvengen eac8260b38 add i18n tests 2013-07-25 14:46:25 +02:00
wvengen ca50006235 add coverage report, set COVERAGE=1 in env when running specs 2013-07-25 14:00:08 +02:00
wvengen bb20e9abea Merge branch 'master' into tests-rspec 
Conflicts:
	Gemfile
	Gemfile.lock
 2013-07-24 21:25:36 +02:00
wvengen 62682b7e64 make integration test work 2013-07-24 12:37:20 +02:00
wvengen 0d33922ed9 make integration spec work with javascript driver too 2013-07-24 02:58:53 +02:00
wvengen d58ce31b7f add first integration test 2013-07-24 01:05:01 +02:00
wvengen b9599ce455 Merge branch 'master' into updated-gems 
Conflicts:
	Gemfile.lock
 2013-07-18 20:28:56 +02:00
wvengen 74bfc85562 Merge remote-tracking branch 'fsmanuel/master' into master. 
Updated migration date to today.

Conflicts:
	db/schema.rb
 2013-07-18 18:48:49 +02:00
wvengen eef4626107 Merge branch 'master' into updated-gems 
Conflicts:
	Gemfile.lock
	app/views/deliveries/_form.html.haml
 2013-07-17 11:04:28 +02:00
wvengen e5448603a4 update uglifier 2013-07-15 23:45:09 +02:00
wvengen 3c264f6225 add some rspec tests for supplier and article 2013-07-14 02:50:54 +02:00
wvengen fc6fbdaa95 use less-rails, and make exception_notifier work again 2013-07-13 23:06:30 +02:00
wvengen cfae279196 bundle update 2013-07-12 23:35:31 +02:00
wvengen 7fa8193010 start using rspec for tests 2013-07-12 20:06:49 +02:00
wvengen e9e7135639 run bundle update and make it work again 2013-07-08 14:32:24 +02:00
Julius Rapp a5565b436f Resolve merge conflicts 2013-07-07 14:58:57 +02:00
wvengen 8080cd6b7e pass locale to datepicker, use gem for that 2013-07-07 01:47:22 +02:00
Julius 6e6cce1cb7 Add Select2 jQuery plugin 2013-06-17 16:15:19 +02:00
Manuel Wiedenmann 5b7ec86ed6 Merge branch master into i18n 2013-06-14 02:02:57 +02:00
Manuel Wiedenmann 7a63394dac Merge remote-tracking branch 'origin/rails3' 
Conflicts:
	Gemfile
	Gemfile.lock
 2013-06-10 01:53:31 +02:00
Benjamin Meichsner e74c6b4068 Avoid having content-length warning in dev log. 2013-06-09 17:33:11 +02:00
wvengen a1a469da03 do not fail when common_deploy is not installed 2013-06-06 14:54:54 +02:00
Manuel Wiedenmann e8173d44ae adds rails-settings cached and rails-i18n-debug gems 2013-06-06 03:21:44 +02:00
Manuel Wiedenmann c42c00b5f1 adds mailcatcher to foodsoft:setup_development 2013-05-29 12:35:16 +02:00
Manuel Wiedenmann 2fb7797c12 readds mysql 2013-05-25 20:31:15 +02:00
Manuel Wiedenmann ec74b642a0 adds sqlite3 to Gemfile to test deployment 2013-05-25 20:16:49 +02:00
Manuel Wiedenmann 6b84f4f117 updates common_deploy 2013-05-25 20:10:48 +02:00
Manuel Wiedenmann 4024329474 adds doc/DEPLOYMENT instructions 2013-05-25 20:03:53 +02:00
Manuel Wiedenmann 92d9a57f3f adds capistrano for deployment 2013-05-25 19:38:14 +02:00
Benjamin Meichsner 77d4caea68 Added quiet_assets gem to have cleaner log file in developing. 2013-04-08 15:08:18 +02:00
Benjamin Meichsner 957dbc7202 Updated to rails 3.2.13 2013-03-19 13:18:48 +01:00
Benjamin Meichsner 07581b7ecf Removed acts_as_paranoid. Implemented own version. 2013-03-16 17:57:38 +01:00
Benjamin Meichsner 44ef0a9807 Added bullet gem to track unusued eager loading. 2013-01-26 16:16:50 +01:00
Benjamin Meichsner 65f9fe3392 Updated rails to version 3.2.11 2013-01-11 11:56:47 +01:00
benni d347e2404b Added whenever to manage cronjobs. 2012-12-26 14:03:35 +01:00
benni 2c0fe08be6 Replaced delayed_job with resque. See README_DEVEL 2012-12-23 17:38:04 +01:00
benni 8074fedefd Added libs for nice error output and benchmarker support. 2012-12-16 13:47:45 +01:00
benni ddcb4a9b2d Moved acts_as_configurable to gemfile. 2012-11-24 16:49:19 +01:00
benni 7e6ac8c924 Moved acts_as_tree to gemfile. 2012-11-24 16:41:34 +01:00
benni 7fc0462fc4 Upgrade to rails 3.2.9. Moved acts_as_versioned to gem. 2012-11-24 16:36:40 +01:00
benni 7c9d666909 Merge branch 'rails3' of github.com:bennibu/foodsoft into rails3 
Conflicts:
	Gemfile
 2012-11-24 15:27:48 +01:00
benni fc1c173718 Fixed articles module. 2012-10-28 18:03:50 +01:00
benni f30e57dd49 Fixed articles views. 2012-10-19 01:12:47 +02:00
Robert Waltemath 736ac91aef Added Gemfile.lock. 2012-10-18 10:09:32 +02:00