diaspora/app/views
danielgrippi 0112285985 Merge branch 'master' into profiles
Conflicts:
	lib/diaspora/shareable.rb
2012-02-27 14:27:05 -08:00
..
admins make popular tags human readable 2012-02-19 21:28:12 -06:00
apps
aspect_memberships remove unused files/methods 2012-01-11 02:26:12 -08:00
aspects change language around explore/participate. 2012-02-13 19:13:43 -08:00
authorizations small typo [ci skip] 2012-02-13 17:06:55 -08:00
comments Switch boilerplate for bootstrap 2 on mobile. [ci skip] 2012-01-29 11:51:47 -08:00
community_spotlight
contacts forgot to save a template [ci skip] 2012-02-10 15:24:47 -08:00
conversations fix a bunch of small css related media box issues [ci skip] 2012-02-10 15:18:27 -08:00
devise Better error messages for folks coming in with a bad invitation token, whether by clicking the "view this invitation in your browser" link or by clicking the accept invitation button. 2011-11-14 17:02:13 -08:00
home remove joindiaspora specific home page from repo [ci skip] 2012-02-10 15:45:48 -08:00
invitations a couple of additions to the branch 2012-01-19 13:33:05 +01:00
layouts MS DC show last post and show page works unauthenticated 2012-02-24 19:09:00 -08:00
likes Bring the likes back. Ditch the pins. 2012-02-13 19:13:43 -08:00
messages fix a bunch of small css related media box issues [ci skip] 2012-02-10 15:18:27 -08:00
notifications use the user presenter, luke 2012-02-16 13:19:14 -08:00
notifier refactor out profile url generation into local_or_remote_person_path and use it everywhere. closes #2471 2011-12-06 13:08:21 +01:00
people MS DC show last post and show page works unauthenticated 2012-02-24 19:09:00 -08:00
photos cukes passing 2012-02-23 17:24:19 -08:00
posts display original author if post is a reshare 2012-02-21 15:23:30 -08:00
profiles a user can mark themselves as nsfw 2012-02-07 19:03:20 -08:00
publics adapt host-meta document to RFC 6415 2012-02-25 16:56:34 +01:00
registrations introduce base_pod_uri, so we can support domains that use www and [bare] with webfinger 2012-01-17 17:34:42 -08:00
requests
reshares remove unused files/methods 2012-01-11 02:26:12 -08:00
services put all the elements back on the page and make facebook inviter usable again 2012-02-24 20:46:27 -06:00
sessions Switch boilerplate for bootstrap 2 on mobile. [ci skip] 2012-01-29 11:51:47 -08:00
shared fix missing translation in mentioning-lightbox 2012-01-31 22:16:48 +01:00
status_messages escape all passed params in js - fixes #2922 2012-02-24 14:15:08 +01:00
tags push stream listings to the side a bit 2012-02-01 13:56:52 -08:00
tokens use guid instead of id for /people/ urls 2012-01-23 23:35:31 +01:00
users Fix problem with atom feed entry titles being too long 2012-02-18 16:18:54 +00:00