diaspora

Author	SHA1	Message	Date
Raphael	1fd3aeabd9	Add or later to license notice	2010-10-07 16:25:34 -07:00
Alec Leamas	0d51af0a13	Removing shebang on non-script.	2010-10-07 16:11:43 +02:00
Stephen Caudill	536cea5e44	Remove consecutive empty lines	2010-09-25 12:06:39 -04:00
Raphael	2e8ecceaf7	Merge branch 'master' of github.com:diaspora/diaspora into production	2010-09-16 21:53:34 -07:00
cryptix	c80a79dea5	Unified require quotes	2010-09-17 07:44:47 +08:00
Raphael	c67a8ea100	Merge branch 'master' of github.com:diaspora/diaspora into production Conflicts: config/deploy.rb config/environments/production.rb spec/models/request_spec.rb	2010-09-15 22:37:05 -07:00
Stephen Caudill	5595dc5f48	Retab the project	2010-09-16 13:16:10 +08:00
Jamie Wilkinson	fbdd50172d	Cleanup stray whitespace	2010-09-16 10:07:59 +08: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	a23df47dbc	Trying to merge in the pivots changes that we want in master	2010-08-18 21:10:42 -07:00
Raphael	b55a99ec09	conf changes, kill nginx with go_cold	2010-08-17 11:42:59 -07:00
Raphael	16f53922c5	nginx conf done, comments deleted	2010-08-17 11:22:06 -07:00
Raphael	29e3fa4d04	sprinkle role	2010-08-17 11:04:34 -07:00
Raphael	8356126f8d	Added deploy key	2010-08-05 15:44:18 -07:00
Raphael	61ffda6bf4	re-enabling sprinkle script	2010-07-23 11:05:29 -07:00
ilya	d7e546c3b3	RS IZ Vim in sprinkle, not too nice	2010-07-21 15:26:08 -07:00
Raphael	de3a08d031	Took out putses	2010-07-20 10:23:19 -07:00
ilya	cdd6e2034e	Updated deploy scripts	2010-07-09 00:23:37 -04:00
Raphael	5e78163df3	added bundler to gemfile	2010-07-06 19:23:34 -07:00
Raphael Sofaer	fbe8915250	IZ uncommented the lines for the rackspace deploy	2010-06-18 22:08:17 -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
Raphael Sofaer	560269ef87	cleaning up sprinkle	2010-06-17 20:52:51 -07:00

29 commits