danielvincent
|
c01bbbb3e0
|
capitalization error. should push to pubsub now.
|
2010-10-05 17:24:00 -07:00 |
|
kook
|
85b384010e
|
exchange photos on adding new friend
|
2010-10-05 17:18:51 -07:00 |
|
danielvincent
|
7a1811807c
|
Merge branch 'master' of github.com:diaspora/diaspora
|
2010-10-05 17:15:14 -07:00 |
|
danielvincent
|
c9d97d3233
|
render public with correct mime type
|
2010-10-05 17:15:00 -07:00 |
|
Raphael
|
233a2d2bb2
|
Merge branch 'master' of github.com:diaspora/diaspora
|
2010-10-05 17:06:17 -07:00 |
|
Raphael
|
a2209d454b
|
Add a link to authoritative rebase instructions
|
2010-10-05 17:01:23 -07:00 |
|
danielvincent
|
66ec5f0570
|
Merge branch 'master' of github.com:diaspora/diaspora
|
2010-10-05 17:00:20 -07:00 |
|
danielvincent
|
830b3772d5
|
self reference in atom
|
2010-10-05 16:59:55 -07:00 |
|
Raphael
|
22f90086ca
|
Merge branch 'master' of github.com:diaspora/diaspora
|
2010-10-05 16:58:06 -07:00 |
|
Raphael
|
37fb2bfd32
|
Don't require a facebook yml
|
2010-10-05 16:57:22 -07:00 |
|
UserAd
|
1d0a4579f6
|
Add missing localization for aspect managment
|
2010-10-06 07:56:23 +08:00 |
|
UserAd
|
e7c153df4e
|
Add translation support in profile ('or' between buttons). Fix Russian locale
|
2010-10-06 07:56:23 +08:00 |
|
danielvincent
|
09b861c7a3
|
remove .atom from public url
|
2010-10-05 16:51:27 -07:00 |
|
danielvincent
|
6723a51149
|
correctly indent xml
|
2010-10-05 16:40:50 -07:00 |
|
danielvincent
|
11857a9308
|
fixing id field in atom
|
2010-10-05 16:35:29 -07:00 |
|
danielvincent
|
8d2cc724b0
|
Merge branch 'master' of github.com:diaspora/diaspora
|
2010-10-05 16:28:21 -07:00 |
|
danielvincent
|
4a8a21b95f
|
public fix
|
2010-10-05 16:28:01 -07:00 |
|
Alec Leamas
|
8bea8a98b2
|
Don't use any scratch dir, handle write-protected installation
|
2010-10-06 05:05:39 +08:00 |
|
Alec Leamas
|
a9806ddad0
|
Fixing bad execute permissions on various *.html, *.js, *.css,*.png etc.
|
2010-10-06 04:59:46 +08:00 |
|
danielvincent
|
c284c9b07f
|
added public back into webfinger
|
2010-10-05 13:47:42 -07:00 |
|
danielvincent
|
33e478229e
|
Merge branch 'master' of github.com:diaspora/diaspora
|
2010-10-05 13:40:10 -07:00 |
|
danielvincent
|
f3c34692d8
|
pubsub support
|
2010-10-05 13:39:56 -07:00 |
|
ilya
|
45d40f27d9
|
changed the deploy config back to master
|
2010-10-05 13:06:55 -07:00 |
|
ilya
|
57b61f6827
|
Merge branch 'master' of github.com:diaspora/diaspora
|
2010-10-05 13:00:54 -07:00 |
|
ilya
|
63cb7dcbdd
|
Fb friends are displayed only once
|
2010-10-05 13:00:42 -07:00 |
|
Alec Leamas
|
9f21b9383d
|
Server start, but fails on missing .git dirs (!)
|
2010-10-05 21:47:17 +02:00 |
|
danielvincent
|
aed9125e93
|
more querying through the current_user in controllers
|
2010-10-05 12:41:41 -07:00 |
|
ilya
|
85f71aa4aa
|
added the deploy task to symlink the fb_config
|
2010-10-05 12:38:20 -07:00 |
|
ilya
|
82455981b8
|
added fb_config to gitignore
|
2010-10-05 12:21:33 -07:00 |
|
ilya
|
05968db7be
|
Merge branch 'master' of github.com:diaspora/diaspora
|
2010-10-05 12:17:07 -07:00 |
|
Raphael
|
1fa732498b
|
Update sprinkle script
|
2010-10-05 11:55:47 -07:00 |
|
Raphael
|
bb88a6fb8c
|
Merge branch 'salmon-refactor'
|
2010-10-05 09:47:10 -07:00 |
|
ilya
|
44414d545d
|
Merge branch 'master' of github.com:diaspora/diaspora
|
2010-10-05 09:42:12 -07:00 |
|
Alec Leamas
|
55dd35dcc1
|
provisionary
|
2010-10-05 17:29:40 +02:00 |
|
Alec Leamas
|
735bb847c2
|
provisionary
|
2010-10-05 16:00:09 +02:00 |
|
Alec Leamas
|
ff48b6cd7b
|
provisionary, passes rpmbuild and rpmplint (more or less)
|
2010-10-05 15:19:21 +02:00 |
|
Alec Leamas
|
b0abe9db07
|
bugfix
|
2010-10-05 00:12:00 +02:00 |
|
Alec Leamas
|
ee1f2063b4
|
Initial, buggy file check in
|
2010-10-05 00:11:13 +02:00 |
|
Raphael
|
be909e27d6
|
Deleting adams
|
2010-10-04 14:49:27 -04:00 |
|
Raphael
|
e60585862a
|
Merge branch 'master' of github.com:diaspora/diaspora
|
2010-10-04 14:47:40 -04:00 |
|
Maxwell Salzberg
|
a09a6d82b7
|
updated bundler dependency to include newer ones
|
2010-10-04 09:45:12 -07:00 |
|
ilya
|
0d2d5b65fb
|
removed the logging statements, now servers communicate sucessfully and only re-encrypt the header for people
|
2010-10-03 18:08:18 -07:00 |
|
ilya
|
ce4f8cab8b
|
not encrypting the entire thing
|
2010-10-03 17:39:16 -07:00 |
|
ilya
|
3eaf4e0ba1
|
a couple of logger lines to help debug on remote
|
2010-10-03 17:33:31 -07:00 |
|
ilya
|
dadacbd092
|
removed whitespace striping
|
2010-10-03 13:33:01 -07: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 |
|
ilya
|
7b690f5dcb
|
slight publics controller spec refactor
|
2010-10-02 13:20:23 -07:00 |
|
ilya
|
f9cecd9d89
|
specs are green
|
2010-10-02 13:03:11 -07:00 |
|
ilya
|
304e4ad32b
|
removed the puts
|
2010-10-02 12:37:53 -07:00 |
|