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

57 Commits

Author SHA1 Message Date
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 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
benni 9af26e1da6 Fixed deliveries. 2012-10-17 20:45:52 +02:00
benni ab81ef09d5 Replace will_paginate with kaminari. Fixed foodcoop/users page. 2012-10-08 15:24:32 +02:00
benni f20ae890dd Added twitter bootstrap layout. Adapt home page. 2012-10-06 17:14:57 +02:00
benni eb532babd6 Refactored pdf generation with newest prawn. 2012-10-02 02:50:48 +02:00
benni 78cc423a46 Replaced prawnto plugin with rails31 compatible version. 2012-09-30 21:48:57 +02:00
benni 0a1c326f14 Upgraded to rails 3.2.8 2012-09-30 21:38:52 +02:00
benni 29a6cd8b62 Upgraded to rails 3.1.8. Fixed various bugs in wiki. 2012-09-30 21:15:55 +02:00
benni b0c9580b53 Added delayed_job as new background queue manager. 2012-08-24 13:48:45 +02:00
benni f759552022 Fixed user settings. 2012-07-31 18:21:42 +02:00
benni 9ac747e9f3 Updated rails to 3.0.16 2012-07-27 18:12:10 +02:00
benni 8a74e7d77f Removed annoate and hirb Gemfiles. 
Annotate: Better look in schema.rb, this reference should be always up
to date.

Hirb: To reactivate hirb, look in railscasts:
http://railscasts.com/episodes/48-console-tricks-revised
 2012-07-27 18:07:42 +02:00
benni 4a8e286d98 Fixed encoding issues with ruby > 1.9.2.. 2012-04-16 08:49:54 +02:00
benni ad508b207b Updated to rails 3.0.12. remove old gettext code. 2012-04-15 19:59:39 +02:00
benni 5636e200dc Moved some plugins from vendor/plugins into Gemfile. 2012-04-15 19:13:38 +02:00
benni ea6348bc5c Refactored finance/ordergroups|transactions module. 2011-06-09 21:35:05 +02:00
benni 5bf6503a8f Included new localize_input gem. 2011-05-20 00:19:58 +02:00
benni 3f133bb8c3 Added client side validations. Fixed shared sync. 2011-05-19 22:35:13 +02:00
benni 013637a4fc Refactored shared article import. Added meta search gem. 2011-05-19 22:22:05 +02:00
benni 0decbb36e1 Refactored article_categories. 2011-05-18 16:10:30 +02:00
benni c87ead8da9 Added meta where and jquery observe field. Fixed members view. 2011-05-15 23:43:23 +02:00
benni a4f71bd672 Updated haml and acts_as_paranoid. Removed sass templates. 2011-05-15 21:50:43 +02:00
benni 03d84aed1d Added simple form for easier form building. 2011-05-14 17:06:32 +02:00
benni 2a72263bd3 Replaced protoype with jquery. Some fixes in mailer class. 2011-05-11 15:14:39 +02:00
benni b1a700ab5d Upgraded will_paginate. 2011-05-11 12:31:17 +02:00
benni d09d3922c1 Upgraded exception notifier plugin. 2011-05-11 11:03:36 +02:00
benni 4eba5fbc9c First step for upgrading to rails 3. 
Check rake rails:upgrade:check for next steps.
 2011-05-11 01:32:21 +02:00