Raphael
|
1fd3aeabd9
|
Add or later to license notice
|
2010-10-07 16:25:34 -07:00 |
|
Raphael
|
caffd8f9ff
|
Don't check for servers that aren't there
|
2010-10-05 17:58:48 -07:00 |
|
ilya
|
45d40f27d9
|
changed the deploy config back to master
|
2010-10-05 13:06:55 -07:00 |
|
Raphael
|
bb88a6fb8c
|
Merge branch 'salmon-refactor'
|
2010-10-05 09:47:10 -07:00 |
|
Raphael
|
be909e27d6
|
Deleting adams
|
2010-10-04 14:49:27 -04:00 |
|
Raphael
|
2cd8cf0621
|
Remove a bunch of deleted backer servers
|
2010-10-02 20:30:37 -04:00 |
|
ilya
|
88dafbf5cc
|
changed deploy branch
|
2010-10-02 13:29:36 -07:00 |
|
danielvincent
|
44c29cf8e6
|
deploy_config back to master
|
2010-09-27 21:57:52 -07:00 |
|
ilya
|
08b9aa864a
|
Merge branch 'master' of github.com:diaspora/diaspora into fb
Conflicts:
app/views/layouts/application.html.haml
app/views/shared/_publisher.haml
app/views/shared/_sub_header.haml
app/views/users/edit.html.haml
config/deploy_config.yml
config/routes.rb
|
2010-09-27 15:39:50 -07:00 |
|
ilya
|
f36b99b03c
|
changed the deploy_config to play on remote
|
2010-09-26 22:13:28 -07:00 |
|
Dorian
|
e792344c0e
|
Use improved whitespace:scrub_gratuitous_newlines
|
2010-09-26 12:52:39 -04:00 |
|
ilya
|
04e670f0d0
|
deploy script now uses public url
|
2010-09-23 12:31:19 -07:00 |
|
ilya
|
5857838a0a
|
adding the new files
|
2010-09-23 12:29:00 -07:00 |
|
danielvincent
|
53c0aff23d
|
deploy from the right branch
|
2010-09-22 16:34:42 -07:00 |
|
Raphael
|
f5c10bb24c
|
Put master deploy info back in master
|
2010-09-17 14:39:15 -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 |
|
Raphael
|
a9b587ca06
|
Adding in deploy config for production
|
2010-09-14 22:31:57 -07:00 |
|
Raphael
|
1d94039684
|
put in deploy configs
|
2010-09-14 22:28:13 -07:00 |
|