danielvincent af91eb51b4 Merge branch 'master' of github.com:diaspora/diaspora

2010-09-23 10:49:41 -07:00

..

albums

Merge branch 'master' into HEAD

2010-09-22 21:32:03 -07:00

aspects

Forgot a merge conflict

2010-09-22 21:39:22 -07:00

comments

removed the auto_link seems to fix HTML injection, no more autolinking

2010-09-21 11:59:04 -07:00

devise

MS changed the session page to show APP_CONFIG[:terse_pod_url]

2010-09-23 10:39:47 -07:00

js

websocket js should honor app socket port configuration

2010-09-17 03:11:11 +08:00

layouts

Added localization to layouts and shared views

2010-09-16 15:11:58 -04:00

people

fix in person partial

2010-09-23 10:49:35 -07:00

photos

adding gif support

2010-09-24 01:10:46 +08:00

posts

added git info (branch,date,author) to debug partial

2010-09-16 17:03:14 -07:00

publics

DG MS fixing webfinger, i hope to goodness

2010-09-15 13:28:06 -07:00

registrations

Merge branch 'master' into HEAD

2010-09-22 21:32:03 -07:00

requests

Added translations to new requests view and aspects controller

2010-09-17 16:38:50 -04:00

shared

Merge branch 'master' into HEAD

2010-09-22 21:32:03 -07:00

status_messages

Merge branch 'master' into HEAD

2010-09-22 21:32:03 -07:00

users

Merge branch 'master' into HEAD

2010-09-22 21:32:03 -07:00