Commit graph

45 commits

Author SHA1 Message Date
MrZYX
1746f610b6 if we disable websocket in single process mode, there's no need for the JS 2011-05-17 19:26:37 +02:00
danielgrippi
dfeb4f3a13 use .js response convention for remote likeke behavior 2011-05-11 11:08:30 -07:00
MrZYX
73c96ea8f0 Revert "Clean up WSR, add comment processing to ContentUpdater, add comment fixture, update post processing spec"
This reverts commit bd74ab4acc.

This reproducable breaks functionallity (comments). Please do not push WIP/not working stuff to master. To continue work just revert this revert. Thanks
2011-05-11 11:51:51 +02:00
Dan Hansen
bd74ab4acc Clean up WSR, add comment processing to ContentUpdater, add comment fixture, update post processing spec 2011-05-10 23:19:36 -05:00
Sarah Mei
a904204f46 Content updater refactor complete for posts 2011-05-08 14:22:40 -07:00
Dan Hansen
50e67524c1 content update wip 2011-05-08 15:18:02 -05:00
Dan Hansen
535954dcc2 make incrementing the notification count optional 2011-05-07 07:28:52 -05:00
Raphael Sofaer
94bc18e467 Make websocket closed message less disruptive 2011-05-02 17:12:18 -07:00
Dan Hansen
c1366e0e04 Make photos display inline on StatusMessage#show 2011-04-27 17:06:26 -05:00
Dan Hansen
d28a2cdb1e Show the user that the websocket connection has been closed and posts will no longer socket in 2011-04-27 16:50:23 -05:00
Dan Hansen
4a101f25d9 Notifications.js refactor, add specs 2011-04-27 16:22:56 -05:00
MrZYX
a7a8da2f75 added detection of rtl languages on every user based input 2011-04-03 02:14:35 +02:00
Raphael Sofaer
aed190dc6d cucumber for comment retractions, modified views 2011-03-25 16:26:03 -07:00
danielgrippi
33c013633f fix cucumber, comments 2011-03-23 18:22:43 -07:00
danielgrippi
2a1914a8f2 fixed comment socket bug on posts where there are no new comment areas 2011-03-23 17:55:18 -07:00
MrZYX
1b1a23aa8f likes/dislikes WIP TODO: better icons, better styling, integration on photo show page 2011-03-20 18:10:58 +01:00
Michael Nutt
ead1f80b08 websocket js handler should know about different notification types 2011-03-11 00:31:43 -05:00
Raphael Sofaer
c1844c9be2 Merge remote branch 'lfortin/js-formatting'
Conflicts:
	public/javascripts/web-socket-receiver.js
2011-02-11 11:31:30 -08:00
Raphael Sofaer
a307519e94 Put avatar on cmment form all the time, fix socketed comment form 2011-02-10 11:05:12 -08:00
Raphael Sofaer
f1c63939f9 Revert "added sliding animation to stream elements, shadow on autocomplete box."
This reverts commit dc760f9583.
2011-02-10 10:36:30 -08:00
danielvincent
dc760f9583 added sliding animation to stream elements, shadow on autocomplete box. 2011-02-09 20:07:25 -08:00
maxwell
35bc4e3aad attempt to rebind infield labels on comment form 2011-02-03 18:43:56 -08:00
Dan Hansen
b89a59ca55 update timeago usages 2011-01-29 13:30:32 -08:00
maxwell
f97a9fa017 added timeago jquery plugin. we now need to figure out a js translation scheme 2011-01-13 16:29:13 -08:00
danielvincent
0a07dd16b5 posts are properly socketed on filtered streams 2011-01-08 13:11:52 -08:00
lfortin
62585aa445 more JS formatting 2011-01-02 19:41:20 -05:00
lfortin
efb711963f in JS, avoid global variables as much as possible 2011-01-02 19:24:38 -05:00
danielvincent
055fbe3e00 stream is now a div. generalized some partial extentions for mobile site. 2011-01-01 23:09:18 -05:00
Sarah Mei
a1b92f5224 Merge javascript formatting changes. 2010-12-28 20:31:49 -08:00
danielvincent
30dd11b9fa mark notifications as read and update badge 2010-12-25 16:27:09 -05:00
danielvincent
4ff9622bfc notifications now properly socket (not a hack through comments like before). notification badge updates on new messages. 2010-12-25 16:07:31 -05:00
danielvincent
7cb9760a1e show comments toggle like fb 2010-12-21 16:56:32 -08:00
lfortin
77c102cce6 more JS formatting 2010-12-16 23:46:28 -05:00
maxwell
5f1f28923f fixed a comment counting bug, and the show_all_comments message when the comment count was three 2010-12-08 13:44:57 -08:00
maxwell
23eb192524 double the time that notifications are seen on the page 2010-12-04 17:45:52 -08:00
danielvincent
4251a3a093 prompt to 'get the conversation started' on new aspect page fades out when first message in aspect is posted 2010-12-04 17:02:29 -08:00
Raphael
ed35969084 incorrect onClose in WS js 2010-11-24 18:10:49 -05:00
danielvincent
c24150eca0 socketed posts now show up on home page. delete links are back in the stream. 2010-11-23 11:47:54 -08:00
maxwell
b283f5c579 pulling back needed partial 2010-11-22 17:29:51 -08:00
maxwell
173ec5f73b Revert "remove a duplicate view, hence many files updated, and fixed the js to socket people to the aspect sidebar"
This reverts commit c45893d07d.

Conflicts:

	config/locales/diaspora/en.yml
2010-11-22 17:11:34 -08:00
maxwell
1adf93ace1 Merge branch 'master' of github.com:diaspora/diaspora
Conflicts:
	config/locales/diaspora/en.yml
2010-11-22 16:40:01 -08:00
maxwell
c45893d07d remove a duplicate view, hence many files updated, and fixed the js to socket people to the aspect sidebar 2010-11-22 16:38:10 -08:00
danielvincent
0e7b1f5eb7 status messages and comments made by user will ajax onto the current page, and websocket everywhere else. 2010-11-22 14:52:13 -08:00
danielvincent
752d50a6a9 editing captions on photos uses remote forms. removed photo in album from WSR. 2010-11-21 19:51:20 -08:00
Raphael
6f0d008914 Move WebSocketReceiver out to a js file 2010-11-21 16:14:36 -05:00