Commit graph

16 commits

Author SHA1 Message Date
Raphael
1fd3aeabd9 Add or later to license notice 2010-10-07 16:25:34 -07:00
Dorian
e792344c0e Use improved whitespace:scrub_gratuitous_newlines 2010-09-26 12:52:39 -04:00
Raphael
a96a52def7 Run 3 thins 2010-09-17 11:58:34 -07:00
Raphael
de93fd2818 Merge branch 'master' of github.com:diaspora/diaspora into production 2010-09-15 18:10:13 -07:00
Raphael
708e9f88a5 Spell our own name right 2010-09-15 17:56:18 -07:00
Raphael
1006e8a680 Merge branch 'master' of github.com:diaspora/diaspora into production 2010-09-15 11:01:11 -07:00
Raphael
aa3ebe372c License notices replaced 2010-09-15 10:58:48 -07:00
Daniel Vincent Grippi
c1a9a89be7 Merge branch 'production' of github.com:diaspora/diaspora into production
Conflicts:
	app/models/user.rb
	config/deploy.rb
	spec/factories.rb
	spec/models/request_spec.rb
	spec/spec_helper.rb
2010-09-14 11:08:18 -07:00
Daniel Vincent Grippi
4c15b1a01c added license to every single goddamn file. also, put one in the root dir. 2010-09-13 14:23:50 -07:00
Raphael
b55a99ec09 conf changes, kill nginx with go_cold 2010-08-17 11:42:59 -07:00
Raphael
2261a0d8a4 nginx... 2010-08-17 11:28:22 -07:00
Raphael
16f53922c5 nginx conf done, comments deleted 2010-08-17 11:22:06 -07:00
Raphael
bfe5769fcb rolled back to development environment 2010-06-22 15:47:18 -07:00
Raphael Sofaer
cd1ed1d164 Hopefully final conf changes 2010-06-18 19:02:59 -07:00
Raphael Sofaer
c435ba28f9 changing configures... 2010-06-18 18:09:57 -07:00
Raphael Sofaer
178085b984 RS, IZ; A bunch of deploy stuff, including nginx, nginx_conf (maybe), and thin conf 2010-06-18 17:33:43 -07:00