danielgrippi 1f5edb1d92 Merge branch 'private_messages' ... Conflicts: app/controllers/status_messages_controller.rb app/models/data_point.rb app/models/status_message.rb db/schema.rb lib/fake.rb public/stylesheets/sass/application.sass spec/models/mention_spec.rb		2011-03-08 21:23:41 -08:00
..
.gitkeep	Activerecord this time\!	2010-06-11 10:40:49 -07:00
backup.rake	iz ms wip fixing contactController destroy	2011-02-17 18:05:21 -08:00
batch_inviter.rake	Standardize how we're requiring config/environment	2011-01-23 12:42:09 -08:00
cruise.rake	Clean up the public/uploads folder after ci runs.	2011-02-12 09:16:12 -08:00
cucumber.rake	Re-enable running a single cucumber feature on the command line	2011-02-02 11:13:59 -08:00
db.rake	addedthe controllers and the views for the message and the conversation inbox, going to pull in some left nav styling	2011-03-02 12:27:57 -08:00
default.rake	run specs before cucumber in default rake task	2010-12-24 10:41:20 -08:00
generate_session_secret.rake	Add or later to license notice	2010-10-07 16:25:34 -07:00
jasmine.rake	can haz working jasmine	2010-10-29 22:21:08 -07:00
migrations.rake	Standardize how we're requiring config/environment	2011-01-23 12:42:09 -08:00
resque.rake	Standardize how we're requiring config/environment	2011-01-23 12:42:09 -08:00
rspec.rake	Add rcov task	2011-03-01 18:12:42 -08:00
statistics.rake	Delete statistic and data point models	2011-03-01 16:54:12 -08:00
whitespace.rake	Improve task which remove consecutive blank lines	2010-09-26 12:50:25 -04:00