diaspora/app/views
danielgrippi 775e7b6b2b Merge branch 'master' into follow
Conflicts:
	features/step_definitions/user_steps.rb
2011-05-17 11:33:35 -07:00
..
admins let admin give a user 10 ma user 10 more invites 2011-04-07 17:54:22 -07:00
aspect_memberships fixed the incrementing aspect ids on the contacts#sharing modal window, showing 'Add to Aspect' button only on the tags and profile pages 2011-05-16 02:16:46 -07:00
aspects Merge branch 'master' into follow 2011-05-16 14:56:28 -07:00
comments Revert "Clean up WSR, add comment processing to ContentUpdater, add comment fixture, update post processing spec" 2011-05-11 11:51:51 +02:00
contacts fixed the incrementing aspect ids on the contacts#sharing modal window, showing 'Add to Aspect' button only on the tags and profile pages 2011-05-16 02:16:46 -07:00
conversations Fix rendering into json for names with quotes 2011-05-03 10:50:13 -07:00
devise update devise_invitable and devise 2011-05-13 16:32:07 -07:00
home added the header back 2011-05-11 15:33:39 -07:00
invitations added dir attribute to html element; made tipsy gravity dependant on that 2011-04-11 18:00:28 +02:00
js if we disable websocket in single process mode, there's no need for the JS 2011-05-17 19:26:37 +02:00
layouts Merge branch 'master' into follow 2011-05-16 14:56:28 -07:00
likes use .js response convention for remote likeke behavior 2011-05-11 11:08:30 -07:00
messages added spec; rtl? -> direction_for 2011-04-03 04:20:08 +02:00
notifications Notifications.js refactor, add specs 2011-04-27 16:22:56 -05:00
notifier Merge branch 'master' into follow 2011-05-12 15:49:51 -07:00
people fixed cucumber with an exception of one step. added dropdowns to tag pages 2011-05-12 14:11:52 -07:00
photos Merge remote branch 'ritchewilson/prev_next' 2011-04-19 17:05:12 -07:00
post_visibilities ms iz, can now undo hiding a post, fixed a bunch of jamine specs 2011-03-31 17:23:54 -07:00
posts PostsController#index -> TagsController#show 2011-03-18 20:57:39 -07:00
profiles do not stress the server too much 2011-04-02 14:42:50 +02:00
publics Finish autocomplete 2011-02-01 11:56:56 -08:00
registrations added dir attribute to html element; made tipsy gravity dependant on that 2011-04-11 18:00:28 +02:00
requests Remove n-query problem from contact_list 2011-01-19 18:06:35 -08:00
services Merge branch 'master' into follow 2011-05-12 15:49:51 -07:00
sessions made dropdown selectors sexi 2011-05-16 16:29:13 -07:00
shared few cucumber steps failing. wip. 2011-05-11 11:08:30 -07:00
status_messages Make photos display inline on StatusMessage#show 2011-04-27 17:06:26 -05:00
tags made dropdown selectors sexi 2011-05-16 16:29:13 -07:00
users Merge branch 'master' into follow 2011-05-12 15:49:51 -07:00