nocebo/diaspora
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions
diaspora/app/views
History
danielgrippi 648a10e6d3 Merge branch 'master' into follow 
Conflicts:
	app/controllers/requests_controller.rb
	app/controllers/tags_controller.rb
	app/helpers/aspects_helper.rb
	app/views/notifications/index.html.haml
	config/routes.rb
	public/javascripts/aspect-edit.js
	public/javascripts/contact-list.js
	spec/integration/receiving_spec.rb
	spec/models/user/connecting_spec.rb
	spec/models/user/posting_spec.rb
2011-05-04 11:35: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 green everywhere. 2011-04-08 17:10:43 -07:00
aspects Merge branch 'master' into follow 2011-05-04 11:35:35 -07:00
comments Merge branch 'css-rtl' 2011-04-11 21:52:01 +02:00
contacts specs green after moving ContactController#new to AspectsMembership#new 2011-04-08 11:44:09 -07:00
conversations Fix rendering into json for names with quotes 2011-05-03 10:50:13 -07:00
devise almost done, need to figure out how whats the deal with the controller not being called 2011-03-21 14:56:50 -07:00
home added default development page so it doesnt look so terrible 2011-03-10 20:31:39 -08:00
invitations added dir attribute to html element; made tipsy gravity dependant on that 2011-04-11 18:00:28 +02:00
js Replace APP_CONFIG with lib/app_config.rb so that it's testable. 2010-12-24 12:31:09 -08:00
layouts Notifications.js refactor, add specs 2011-04-27 16:22:56 -05:00
likes likes/dislikes WIP TODO: better icons, better styling, integration on photo show page 2011-03-20 18:10:58 +01: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 request notification emails -> started sharing notification emails 2011-04-06 13:21:15 -07:00
people Merge branch 'master' into follow 2011-05-04 11:35:35 -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 added mutual flag, removed pending from contact, specs are green. wip 2011-04-05 16:12:53 -07:00
sessions autofocus username on login page 2011-03-22 17:43:11 -07:00
shared Fix db seed, refactor aspect-filters a bunch, fix stream_element a little 2011-04-13 18:13:26 -07:00
status_messages Make photos display inline on StatusMessage#show 2011-04-27 17:06:26 -05:00
tags Fix pages after 1 on tag page 2011-04-28 09:28:59 -07:00
users drop requests table wip 2011-04-06 19:01:41 -07:00