Raphael
|
c74f210464
|
Merge branch 'master' of github.com:diaspora/diaspora
|
2010-10-06 18:39:12 -07:00 |
|
maxwell
|
8bb454f824
|
Merge branch 'master' of github.com:diaspora/diaspora
|
2010-10-06 18:38:51 -07:00 |
|
maxwell
|
0fb091ebbc
|
MS pretty sure we dont need to get the oauth path every time we load the public aspect...
|
2010-10-06 18:38:37 -07:00 |
|
danielvincent
|
ee4c197b89
|
fixed hcard finder on image
|
2010-10-06 18:32:56 -07:00 |
|
maxwell
|
c68a026658
|
MS changed the profile edit field to be private
|
2010-10-06 18:19:58 -07:00 |
|
Raphael
|
a315b489f1
|
Merge branch 'master' of github.com:diaspora/diaspora
|
2010-10-06 18:19:38 -07:00 |
|
danielvincent
|
66b356b5fe
|
moved public route
|
2010-10-06 18:14:37 -07:00 |
|
Raphael
|
582b323a7c
|
Merge branch 'master' of github.com:diaspora/diaspora
|
2010-10-05 21:05:13 -07:00 |
|
danielvincent
|
6b74053e06
|
scratch that last commit
|
2010-10-05 20:37:28 -07:00 |
|
danielvincent
|
982f51b9c7
|
prepend pod_url to image paths
|
2010-10-05 20:31:40 -07:00 |
|
danielvincent
|
91bbd607e6
|
user avatar in public feed activity:subject
|
2010-10-05 20:27:33 -07:00 |
|
danielvincent
|
dc88110716
|
img tag in hcard
|
2010-10-05 20:22:13 -07:00 |
|
danielvincent
|
d519e46f4d
|
webfinger edit
|
2010-10-05 19:01:04 -07:00 |
|
danielvincent
|
fc31eb405d
|
removing logging messages
|
2010-10-05 18:34:56 -07:00 |
|
danielvincent
|
7f652eb81c
|
more logging
|
2010-10-05 18:03:17 -07:00 |
|
danielvincent
|
57e47e5a68
|
removed excess dumb. pubsub should work now
|
2010-10-05 17:58:56 -07:00 |
|
Raphael
|
caffd8f9ff
|
Don't check for servers that aren't there
|
2010-10-05 17:58:48 -07:00 |
|
danielvincent
|
cc01345edd
|
debug statements
|
2010-10-05 17:56:13 -07:00 |
|
danielvincent
|
d08d7c3a1b
|
Merge branch 'master' of github.com:diaspora/diaspora
|
2010-10-05 17:52:28 -07:00 |
|
danielvincent
|
a063207a0a
|
logger instead of debug
|
2010-10-05 17:52:21 -07:00 |
|
maxwell
|
ec4c63ada7
|
Merge branch 'master' of github.com:diaspora/diaspora
|
2010-10-05 17:51:10 -07:00 |
|
maxwell
|
d638bdb018
|
MS IZ password change field is now in edit profile
|
2010-10-05 17:49:06 -07:00 |
|
Raphael
|
79f19b6870
|
Merge branch 'master' of github.com:diaspora/diaspora
|
2010-10-05 17:46:25 -07:00 |
|
Raphael
|
de9cdfbe7b
|
Always set the FACEBOOK constant
|
2010-10-05 17:46:14 -07:00 |
|
danielvincent
|
d890b57b13
|
temp logger message
|
2010-10-05 17:45:35 -07:00 |
|
danielvincent
|
9d5a99efc8
|
Merge branch 'master' of github.com:diaspora/diaspora
|
2010-10-05 17:34:09 -07:00 |
|
danielvincent
|
7c4feb7464
|
better log message
|
2010-10-05 17:34:03 -07:00 |
|
Yaron Shahrabani
|
77d5b68e15
|
Fixed some typos
|
2010-10-06 08:29:58 +08:00 |
|
Stoyan Gaydarov
|
dbacff250a
|
added extra user spec
|
2010-10-06 08:27:25 +08:00 |
|
Stoyan Gaydarov
|
9eb8fe0c5a
|
use the correct pod url in the user spec
|
2010-10-06 08:27:25 +08:00 |
|
danielvincent
|
e01eedef95
|
Merge branch 'master' of github.com:diaspora/diaspora
|
2010-10-05 17:26:41 -07:00 |
|
danielvincent
|
0e8b84fb96
|
publish instead of get
|
2010-10-05 17:26:26 -07:00 |
|
Daniele Di Sarli
|
5074d2f8f2
|
Updated Italian translation
|
2010-10-06 08:25:29 +08:00 |
|
Raphael
|
2df3cf353b
|
Merge branch 'master' of github.com:diaspora/diaspora
|
2010-10-05 17:24:18 -07:00 |
|
Raphael
|
5847e7767d
|
Add profile photo url to hcard parser
|
2010-10-05 17:24:01 -07:00 |
|
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 |
|