nocebo/diaspora
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions
10319 commits 4 branches 0 tags 121 MiB
Commit graph

53 commits

Author SHA1 Message Date
danielgrippi
bee8aa8bcd remove unused files/methods 2012-01-11 02:26:12 -08:00
Ilyaaaaaaaaaaaaa Zhitomirskiy
8c9a585337 reshares now have notifications, slight refactor of the notification helper 2011-08-25 17:16:09 -07:00
Maxwell Salzberg
0473037d1b fix notification links 2011-08-18 11:12:58 -07:00
Maxwell Salzberg
86e374b8ce add hovercards back to mentions, reorganized some helpers, made getting started view mobile accessible 2011-08-09 16:54:24 -07:00
Raphael Sofaer
9789d1d6cb Fix issue #1579, like.target, not like.post 2011-07-17 21:18:21 -04:00
Raphael Sofaer
14759b2c80 Use person_link in notifications_helper, move hovercard css out to a file 2011-07-12 16:21:03 -07:00
Raphael Sofaer
97ca10ddda Huge commit I know, but move show and destroy routes into PostsController and PostsController#show into PublicsController 2011-07-10 20:06:31 -07:00
danielgrippi
e994c90559 don't show hovercard for current_user in likes field + fixed hovercard styling in likes field 2011-07-06 21:33:59 -07:00
danielgrippi
fdaa44ca9c add hovercards to links in likes 2011-07-06 21:09:24 -07:00
Dan Hansen
05688c2f43 notifications wip 2011-07-01 22:46:54 -07:00
Dan Hansen & Michael Sofaer
46c83a7c7d reset the notifications helper to master's version and monkey patch header 2011-06-27 19:51:35 -07:00
Dan Hansen & Michael Sofaer
8f5358e68f Move some DB logic from helper to controller 2011-06-27 19:51:35 -07:00
Michael Sofaer
d6ba3c970c proof of concept for notifications overlay 2011-06-27 19:51:35 -07:00
Maxwell Salzberg
56644c9d1e use notification people link for likes.... it should now get refactored, but it works nicely now, even with I18n 2011-05-24 21:45:12 -07:00
MrZYX
db22be43a8 really no string concatenation and proper pluralization in notifications helper AKA THE REASON I DIDN'T WANTED TO TOUCH THIS STUFF 2011-05-24 17:03:48 +02:00
Raphael Sofaer
fc7b2cfe3f Take out some of the concatenation from NotificationsHelper. VSO languages will still be impossible, but our Caucasian friends should now be able to have valid sentences here. I don't particularly like passing a translation into a link helper which is passed into a translation. 2011-05-23 23:09:48 -07:00
Maxwell Salzberg
d776105558 grammer nazi cleanup of notification_people_link and refactor + tests 2011-05-22 17:18:44 -07:00
Maxwell Salzberg
59ae829254 there is a dumb bug where likes are targeting themselves 2011-05-22 15:02:01 -07:00
Maxwell Salzberg
77fc40d404 add application helper to notification helper spec, made the link an object_link rather than status_message_link 2011-05-22 14:59:04 -07:00
Maxwell Salzberg
2f6d079635 added failure test for deleted likes 2011-05-22 14:45:16 -07:00
Maxwell Salzberg
66c28c4caf notification page now has links for likes 2011-05-22 14:35:35 -07:00
danielgrippi
60a60733df Merge branch 'master' into follow 
Conflicts:
	app/controllers/aspects_controller.rb
	app/controllers/contacts_controller.rb
	app/controllers/people_controller.rb
	app/controllers/photos_controller.rb
	app/controllers/tags_controller.rb
	app/helpers/notifications_helper.rb
	app/models/notifications/new_request.rb
	app/models/user_preference.rb
	public/javascripts/view.js
	spec/controllers/aspects_controller_spec.rb
	spec/controllers/contacts_controller_spec.rb
	spec/controllers/home_controller_spec.rb
	spec/controllers/post_visibilities_controller_spec.rb
	spec/controllers/requests_controller_spec.rb
	spec/mailers/notifier_spec.rb
	spec/models/user_spec.rb
 2011-05-12 15:49:51 -07:00
Raphael Sofaer
b8d9610877 added translation to the likes popup, made the notification models a little clearer 2011-05-11 13:50:26 -07:00
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
Raphael Sofaer
a5f297d7f7 Don't include every helper everywhere, re-organize helpers 2011-04-28 10:38:33 -07:00
maxwell
62c164e1a4 fixed displays of the days based on locale 2011-04-18 18:29:55 -07:00
danielgrippi
2e5b5e1efe request notification emails -> started sharing notification emails 2011-04-06 13:21:15 -07:00
danielgrippi
b6d5165f2d scroll to post on page if you can see it (via notification popup) 2011-03-23 17:16:30 -07:00
maxwell
eed32f70be add a missing space for notifications with less than 4 people 2011-03-17 10:50:11 -07:00
maxwell
2e72fc09c6 made 3+ plus collapse in notifications index 2011-03-14 18:09:51 -07:00
MrZYX
ed8d4db3a8 some reformatting/refactor of en.yml. This might break some translations but I think I've catched the most ones, at least the most important ones 2011-03-12 03:27:28 +01:00
danielvincent
21fd546cd0 posts now have authors instead of people 2011-03-01 18:05:05 -08:00
Raphael Sofaer
00cca370ad Add translation key method, should be replaced with separate partials. 2011-03-01 11:03:58 -08:00
Raphael Sofaer
1c1fba63e7 Refactor notification to have subclasses, just a start 2011-03-01 10:30:29 -08:00
Raphael Sofaer
736783abd7 You can't call post.person when post is nil. We should probably just reject and delete the invalid notifications in the controller, keeping them in the view is aggravating 2011-02-24 11:13:25 -08:00
zhitomirskiyi
e106ec6a79 added post author to the subject of the also commented email as well as the notification 2011-02-23 13:03:11 -08:00
zhitomirskiyi
d1771bbe17 notifications for mentions 2011-02-10 12:39:05 -08:00
zhitomirskiyi
17a2c9e311 moving over some code migration successful 2011-01-29 23:34:11 -08:00
zhitomirskiyi
be92f3866c IZ MS fix 500 on commnet notificaions 2011-01-17 14:46:38 -08:00
zhitomirskiyi
79b613b0e5 MS IZ notifications now contain helpful test 2011-01-17 14:07:21 -08:00
Raphael
738e8c65c8 Merge almost complete, 4 failures 2011-01-14 16:00:10 -08:00
danielvincent
2e472ded94 new notification/request text on aspects/index 2011-01-08 13:11:54 -08:00
zhitomirskiyi
3fae950905 also commented notification and sending ids into resque so that it works 2011-01-06 15:56:03 -08:00
Raphael
4fec1bf717 1 failure left in mysql specs 2010-12-28 11:38:26 -08:00
maxwell
c2c6c00db8 a bad fix for a 500 on notification show when the post is deleted 2010-12-21 12:55:07 -08:00
maxwell
152670a72b notification badge now in header 2010-12-20 18:05:31 -08:00
maxwell
e0883fb176 remove object_id for notifications thx sarahmei for pointing out my evil ways 2010-12-20 12:06:50 -08:00
maxwell
3c3e03993a make the two links on comment notifications clearer 2010-12-17 11:48:08 -08:00
maxwell
92bbe4cd4c added link to changelog, updated notifications 2010-12-16 18:28:22 -08:00
maxwell
b8a0abd122 updating notification views 2010-12-16 18:07:43 -08:00