diaspora

No description

Find a file

danielvincent 7f795e05cb Merge branch 'master' into half-decent Conflicts: app/controllers/dashboard_controller.rb		2010-06-21 14:25:22 -07:00
app	Merge branch 'master' into half-decent	2010-06-21 14:25:22 -07:00
autotest	Activerecord this time\!	2010-06-11 10:40:49 -07:00
config	just kidding. needed that test config, but pulled out some deprecated curl stuff hanging around statusmessages and checked tests accordingly	2010-06-19 15:53:37 -07:00
db	Activerecord this time\!	2010-06-11 10:40:49 -07:00
doc	Activerecord this time\!	2010-06-11 10:40:49 -07:00
lib	fixed the addressable issue; we needed to specify the actuall file the gem gets required as ::sigh::	2010-06-19 14:56:20 -07:00
public	added dumb partial switcher function in dashboard controller	2010-06-21 14:23:59 -07:00
script	Activerecord this time\!	2010-06-11 10:40:49 -07:00
spec	fixed one spec bug in bookmarks	2010-06-21 15:01:12 -04:00
test	Activerecord this time\!	2010-06-11 10:40:49 -07:00
vendor/plugins	Activerecord this time\!	2010-06-11 10:40:49 -07:00
.gitignore	RS, IZ; A bunch of deploy stuff, including nginx, nginx_conf (maybe), and thin conf	2010-06-18 17:33:43 -07:00
.rspec	added colors to rake spec, also, use a new shell and the command autotest to constantly keep the testing env going, much much faster	2010-06-13 15:46:40 -07:00
Capfile	RS IZ deploy stuffz	2010-06-16 19:42:39 -07:00
config.ru	Activerecord this time\!	2010-06-11 10:40:49 -07:00
Gemfile	update em-http-request, removed the mutex because we are thin. also removed some uneeded config for database cleaner in the test setup env	2010-06-19 15:48:50 -07:00
Rakefile	Activerecord this time\!	2010-06-11 10:40:49 -07:00
README	added colors to rake spec, also, use a new shell and the command autotest to constantly keep the testing env going, much much faster	2010-06-13 15:46:40 -07:00
science	MS RS IZ start nginx & science	2010-06-18 23:38:58 -07:00

README

broner