Raphael
|
9cbdf78aa7
|
Don't redirect on status message create
|
2010-10-07 12:01:49 -07:00 |
|
Raphael
|
0859d8ebfe
|
Merge remote branch 'jeffry/master'
|
2010-10-07 11:45:39 -07:00 |
|
Raphael
|
d7bbb66d27
|
Run whitespace:cleanup
|
2010-10-07 10:47:37 -07:00 |
|
ilya
|
131e905322
|
fixed the public route
|
2010-10-06 19:05:43 -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 |
|
maxwell
|
c68a026658
|
MS changed the profile edit field to be private
|
2010-10-06 18:19:58 -07:00 |
|
danielvincent
|
66b356b5fe
|
moved public route
|
2010-10-06 18:14:37 -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
|
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 |
|
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 |
|
danielvincent
|
7c4feb7464
|
better log message
|
2010-10-05 17:34:03 -07:00 |
|
Raphael
|
5847e7767d
|
Add profile photo url to hcard parser
|
2010-10-05 17:24:01 -07:00 |
|
kook
|
85b384010e
|
exchange photos on adding new friend
|
2010-10-05 17:18:51 -07:00 |
|
danielvincent
|
c9d97d3233
|
render public with correct mime type
|
2010-10-05 17:15:00 -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
|
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
|
4a8a21b95f
|
public fix
|
2010-10-05 16:28:01 -07: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
|
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 |
|
danielvincent
|
aed9125e93
|
more querying through the current_user in controllers
|
2010-10-05 12:41:41 -07:00 |
|
ilya
|
ce4f8cab8b
|
not encrypting the entire thing
|
2010-10-03 17:39:16 -07:00 |
|
ilya
|
304e4ad32b
|
removed the puts
|
2010-10-02 12:37:53 -07:00 |
|
ilya
|
7dcde292e1
|
user posting spec is now green, now stubbing on the apropriate method
|
2010-10-02 12:34:16 -07:00 |
|
ilya
|
b6a912dd02
|
slowly getting specs to pass on with the new api
|
2010-09-30 15:17:53 -07:00 |
|
Jeffry Degrande
|
132eec2c63
|
Merge branch 'upstream'
Conflicts:
app/controllers/aspects_controller.rb
|
2010-09-29 02:11:20 -03:00 |
|
Jeffry Degrande
|
046dbf063b
|
fix i18n => I18n
|
2010-09-29 01:49:35 -03:00 |
|
danielvincent
|
f5a57a6f4a
|
photo partial now has labels
|
2010-09-28 13:05:58 -07:00 |
|
danielvincent
|
e0159aaaeb
|
small visual tweaks
|
2010-09-28 12:58:34 -07:00 |
|
danielvincent
|
4627c5338e
|
found placement of all aspects tab confusing; moved it to be the first tab
|
2010-09-28 12:29:35 -07:00 |
|
danielvincent
|
bf15514bc9
|
redirect users#public to root_url if user does not exist.
|
2010-09-28 10:23:03 -07:00 |
|
danielvincent
|
263615ad14
|
all status messages have labels
|
2010-09-27 23:51:20 -07:00 |
|
danielvincent
|
79926da3d3
|
removed owner image repeat
|
2010-09-27 23:16:19 -07:00 |
|
danielvincent
|
cb7c35af73
|
fixed thumbnail positioning
|
2010-09-27 23:15:48 -07:00 |
|
danielvincent
|
bf587be461
|
public indicator tag on status message partial.
|
2010-09-27 22:50:11 -07:00 |
|
danielvincent
|
15a4609c14
|
moved user's public route to user controller. changed person.public_url to reflect change.
|
2010-09-27 22:30:16 -07:00 |
|
danielvincent
|
eac6b8a63b
|
builder is now a class initialized with a user. added director class.
|
2010-09-27 21:54:01 -07:00 |
|
danielvincent
|
eb7244e07c
|
Merge branch 'master' of github.com:diaspora/diaspora
|
2010-09-27 19:07:01 -07:00 |
|
danielvincent
|
26a4dc76a6
|
Merge branch 'master' of github.com:diaspora/diaspora
|
2010-09-27 18:34:55 -07:00 |
|
danielvincent
|
3b8ddf76a3
|
temp route for atom feed. also, public atom currently displays all posts.
|
2010-09-27 18:34:47 -07:00 |
|