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 |
|
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 |
|
ilya
|
7852c346f2
|
mode the visible posts api more general and moved to it on the public controller
|
2010-09-27 18:31:37 -07:00 |
|
danielvincent
|
df800dc87e
|
ostatus builder
|
2010-09-27 17:58:44 -07:00 |
|
ilya
|
6e407572c4
|
removed unused repost method, going through the warden object
|
2010-09-27 17:27:49 -07:00 |
|
ilya
|
c2b84fd9c6
|
added a public key to post
|
2010-09-27 16:59:54 -07:00 |
|
ilya
|
52313b799b
|
added a warning, moved connected as into a partial, removed the
publishing box from settings page
|
2010-09-27 16:31:19 -07:00 |
|
ilya
|
d41b370630
|
removing the fb feed for now
|
2010-09-27 16:20:27 -07:00 |
|
ilya
|
7b29e6ec26
|
checking that a user is logged in before doing fb checking
|
2010-09-27 15:50: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
|
8f55852ea9
|
Merge branch 'master' of github.com:diaspora/diaspora
|
2010-09-27 15:30:27 -07:00 |
|
Raphael
|
12bd0f2301
|
Merge branch 'master' of http://github.com/uiri/diaspora
|
2010-09-27 14:48:11 -07:00 |
|
Raphael
|
1ab536bf04
|
Merge branch 'master' of http://github.com/sarahmei/diaspora
|
2010-09-27 11:09:14 -07:00 |
|
Raphael
|
ce0accafbb
|
Don't depend on user => person delagation so we can eventually get rid of that, thanks astronouth7303
|
2010-09-27 11:03:48 -07:00 |
|
ilya
|
98bc2df841
|
removed the encryption key= method, and user with private key factory
|
2010-09-27 10:10:54 -07:00 |
|
ilya
|
cf0df90dae
|
moved the private key into user where it belongs, two failing cucumber tests
|
2010-09-26 22:08:42 -07:00 |
|
Sarah Mei
|
4bb4602762
|
Merge branch 'master' of github.com:diaspora/diaspora
|
2010-09-26 13:14:50 -07:00 |
|
Stephen Caudill
|
43fa70f90b
|
Label error notification as such.
|
2010-09-26 16:10:13 -04:00 |
|
Sarah Mei
|
68a8ecb05f
|
Merge branch 'master' of github.com:diaspora/diaspora
|
2010-09-26 13:08:56 -07:00 |
|
Sarah Mei
|
0ec074be6d
|
Remove annoying deprecation warning from spec runs
Add spec for validation hook
|
2010-09-26 10:00:29 -07:00 |
|