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

1037 commits

Author SHA1 Message Date
Ilya Zhitomirskiy
d36da2a266 ms iz made the aspect stream ajax in 2011-09-26 19:34:35 -07:00
John Edmonds
8a44b384c0 Add CSRF token to forms generated by fileuploader. 
Diaspora added an X-CSRF-Token header to XHR made by fileupload.
Since fileupload doesn't think Opera supports XHR, it builds a form and submits that instead.
By adding a hidden authenticity_token to the form, Opera can submit the form without logging the user out.
 2011-09-25 11:09:01 -04:00
danielgrippi
91e649977c MS DG update copyright 2011-09-14 11:23:12 -07:00
alda519
2d47658b08 removes underline in tag search form on getting started page 2011-09-13 08:14:20 +02:00
Gonzalo Rodriguez
4f17dbf36e Reuse abortAjax function on aspectNavigation widget 2011-09-11 22:49:57 -03:00
Gonzalo Rodriguez
37c67c23cf Add aspectLis to aspectNavigation widget 2011-09-11 22:46:45 -03:00
Gonzalo Rodriguez
04786bc43e Improvements on aspect navigation rework 2011-09-08 02:13:15 -03:00
Gonzalo Rodriguez
6131d5d29d Merge branch 'master' into aspect_nav_rework 2011-09-08 01:54:49 -03:00
Maxwell Salzberg
a7602c4fd1 update jquery mobile 2011-09-05 10:51:36 -07:00
Dan Hansen & Gonzalo Rodriguez
2057c8fcf1 Aspect navigation rework started.. 
ToDo:
  * Fix failing posts cuke, seems to be timing issue
  * Populate stream title when no aspects selected
  * All aspects selected by default?
 2011-09-05 02:02:07 -03:00
danielgrippi
66836e53d2 Aspect dropdowns read 'All Aspects' if all aspects are selected 2011-09-03 18:38:12 -07:00
Maxwell Salzberg
fd68915461 MS DH fix tag show page comments 2011-09-03 14:47:52 -07:00
Maxwell Salzberg
13ba4eb3b2 update jquery expander, but disable use until we flution to working with <p> tags 2011-09-03 13:03:00 -07:00
Maxwell Salzberg
722a2a86ea remove console.log; instantiate a page for jasmine tests 2011-09-03 12:21:09 -07:00
Maxwell Salzberg
eb6263084e MS DH fix liking of posts and comment js; instansiate streamElement widgets when they are socketed 2011-09-03 12:09:34 -07:00
vcuculo
9072de5096 fixed bookmarklet 2011-09-02 10:25:34 +02:00
danielgrippi
af569204b8 Revert "Merge pull request #1874 from vcuculo/1785-fix-bookmarklet" 
This reverts commit e278b39421, reversing
changes made to d0f21cb444.
 2011-09-01 16:31:49 -07:00
vcuculo
6518a89302 fixed bookmarlet 2011-09-02 00:44:56 +02:00
Maxwell Salzberg
e6d1617268 added timeago to notifications page. @ohaibbq, this is getting annoying :P 2011-09-01 10:52:07 -07:00
maxwell
f5fbaaadcf added timeago and stream to the tag page 2011-08-31 21:54:14 -07:00
Dan Hansen
818af38bdf autoresize inputs 2011-08-31 17:13:24 -05:00
Maxwell Salzberg
197dcc1a61 Merge pull request #1856 from vcuculo/fix-search-user 
Previous fix for avatars doesnt work on FF
 2011-08-31 09:29:52 -07:00
vcuculo
5b0ce6b2a9 fix for mobile site 2011-08-31 14:11:51 +02:00
vcuculo
3832f24a02 previous fix for avatars doesnt work on FF 2011-08-31 09:25:39 +02:00
Dan Hansen
cbc168fc27 only request comments once 2011-08-30 23:12:17 -05:00
Dan Hansen
3bed2ac834 only pass in the post's likes container to the likes widget, comments have likes widgets 2011-08-30 22:53:47 -05:00
Daniel Grippi
50e7d2a254 Merge pull request #1852 from vcuculo/fix-search-user 
fixed user search + avatar
 2011-08-30 20:44:55 -07:00
Dan Hansen
7e20cece42 remove stray console.logs, set $.fx.off to true to make the failing likes spec pass in firefox 2011-08-30 21:44:43 -05:00
Dan Hansen
f788de17fd allow the user to see who has liked a specific comment. 2011-08-30 21:13:12 -05:00
Dan Hansen
dc947e449b fix issues with comment stream, fix likes, merge comment stream and comment toggler widgets. 
make timeago widget a simple wrapper for $.fn.timeago (we don't really need this.)
 2011-08-30 21:07:40 -05:00
vcuculo
640408b166 fixed user search + avatar 2011-08-30 22:38:39 +02:00
Maxwell Salzberg
51ace97323 fix youtube embedding. camelCase is such a bummer 2011-08-30 11:55:51 -07:00
Andrej Kacian
e1cfd59dce Move bindings for post hiding/deleting effect from old stream.js to StreamElement 2011-08-30 01:18:51 +02:00
Andrej Kacian
4d666e3f5b Fix back-to-top scroller widget. 2011-08-29 22:50:28 +02:00
Gonzalo Rodriguez
5dcff46d0b Fixing expand likes ajax call that was broken. Related jasmine still red. 2011-08-29 04:06:55 -03:00
danielgrippi
b7f9400a9f Moved post/comment text collapsing into respective widgets; removed from stream.js. Removed an unused function in stream.js (image hotlinking). 2011-08-28 22:04:06 -07:00
Andrej Kacian
f0b8114738 Show friendly timestamps when expanding all comments on a post. 2011-08-28 18:46:19 +02:00
danielgrippi
802dd989a8 remove javascript in lieu of css; feature is still failing 2011-08-27 22:04:30 -07:00
Sarah Mei
60c8a0d00b Use different mouse events to fix tag unfollow icon hovering 2011-08-27 21:54:05 -07:00
Dan Hansen
20b4304f23 fix cucumber failures 2011-08-26 15:32:13 -05:00
Dan Hansen
27d4fd8176 fix retractions, fix likes, backfill likes widget tests, remove typo from jasmine.yml, remove unneeded js files 
require confirmation for comments in js, get rid of rails helper
 2011-08-26 15:24:07 -05:00
Andrej Kacian
2d45a4287f Fix tipsy tooltips in stream elements 2011-08-26 21:19:52 +02:00
Dan Hansen
07beb3c1fb add a basepage that is instantiated on all pages. remove meaningless pages 2011-08-26 12:30:28 -05:00
Dan Hansen
d75ef8d020 made backtotop a widget, added jquery-debounce 2011-08-26 12:30:28 -05:00
vcuculo
d90f38bb38 fix live stream 2011-08-26 18:54:30 +02:00
Ilyaaaaaaaaaaaaa Zhitomirskiy
2708b0b695 added back the tooltip explaining username constatrains on the accept invite flow 2011-08-24 17:35:27 -07:00
Dan Hansen
121c0c97f8 optimize infinite scroll widget instantiation. don't instantiate timeago widgets for StreamElement and Comment widgets 2011-08-24 19:23:39 -05:00
Maxwell Salzberg & Sarah Mei
c1c622ff52 Viewing more comments rebinds javascript 2011-08-23 23:39:56 -07:00
Maxwell Salzberg & Sarah Mei
a7d05756db Infinite scroll now provokes stream refresh 2011-08-23 23:00:55 -07:00
Maxwell Salzberg
b7d6d511df pass in the class for signifing 'in aspects' 2011-08-23 13:58:05 -07:00
Maxwell Salzberg
2a5155fd4d IZ MS fixed facebook inviter for people you are already friends with to use the normal aspect membership dropdown, and created some nuiaces in the seed script between bob, alice and eve and their fb status" 2011-08-23 13:50:03 -07:00
Maxwell Salzberg
3366aa62dc add a bunch of boilerplate js pages so the header works. would be great to get a baseclass, or some sort of 'run this on all pages' kinda thang 2011-08-23 10:52:37 -07:00
Dan Hansen
049efae1a6 instantiate StreamElement widget after a post has been added to the stream by a user. time to clean publisher.js up. gross. 2011-08-22 20:11:56 -05:00
Dan Hansen
6b040c7b4a clean up websocket receiver, add specs to content updater 2011-08-22 20:03:38 -05:00
Andrej Kacian
59ba3f85e6 Moved live() bindings for post hide icon from Stream.initialize to Stream.initializeLives 2011-08-22 20:18:02 +02:00
Dan Hansen
4a64a172d1 Merge branch 'master' of github.com:diaspora/diaspora into js-refactor-merged 
Conflicts:
	spec/javascripts/stream-spec.js
 2011-08-21 20:57:01 -05:00
Dan Hansen
545611fffa green? 2011-08-21 20:45:51 -05:00
Andrej Kacian
bd3683d0d1 Fix selector in the hide undo click handler. 2011-08-22 01:15:43 +02:00
Andrej Kacian
50f32ce5ac Show ajax loader and hide the hide icon when hiding a post. 2011-08-22 00:38:34 +02:00
Dan Hansen
3ed50cab94 Merge branch 'master' of github.com:diaspora/diaspora into js-refactor-merged 
Conflicts:
	app/views/status_messages/bookmarklet.html.haml
	config/assets.yml
	db/schema.rb
	public/javascripts/contact-edit.js
	public/javascripts/publisher.js
	public/javascripts/view.js
 2011-08-20 14:40:56 -05:00
Maxwell Salzberg
735a37ffe0 really basic preventivie mesures for facebook friending. we need to GO ALL THE WAY and proxy facebook users to be in many aspects 2011-08-19 15:57:10 -07:00
Maxwell Salzberg
bb5ada6533 create a wrapper class for devise mailer, both so we can resquify it and so we can inject helpers 2011-08-19 15:57:10 -07:00
Maxwell Salzberg
e4062bf5fd now functionally correct 2011-08-19 15:56:32 -07:00
Maxwell Salzberg
70fe2cf10f wip 2011-08-19 15:56:31 -07:00
Ilyaaaaaaaaaaaaa Zhitomirskiy
2c47262d54 manually pulled in manuels latest commits 2011-08-18 16:49:26 -07:00
Ilyaaaaaaaaaaaaa Zhitomirskiy
c3bcb9c962 Revert "Revert "Merge branch 'issue1586-aspectdropdown-when-posting'"" 
This reverts commit a407f12463.
 2011-08-18 16:48:20 -07:00
Ilyaaaaaaaaaaaaa Zhitomirskiy
a407f12463 Revert "Merge branch 'issue1586-aspectdropdown-when-posting'" 
This reverts commit 2777f16f4f, reversing
changes made to 8b278adff6.
 2011-08-18 16:16:14 -07:00
Ilyaaaaaaaaaaaaa Zhitomirskiy
2777f16f4f Merge branch 'issue1586-aspectdropdown-when-posting' 2011-08-18 16:02:09 -07:00
Andrej Kacian
e033eda5d1 Use live binding for tipsy tooltips within stream elements, so that elements loaded by the infiniscroll get them too 2011-08-18 22:28:36 +02:00
Andrej Kacian
f59275adb4 Actually add the comment delete link to list of tipsified elements 2011-08-18 22:22:47 +02:00
Andrej Kacian
f5e93c3e83 Comment delete icon should also have a tipsy tooltip 2011-08-18 22:12:09 +02:00
Ilyaaaaaaaaaaaaa Zhitomirskiy
b1e95def4a Merge branch 'master' into issue1586-aspectdropdown-when-posting 2011-08-18 12:59:00 -07:00
Raphael Sofaer
97ab077e04 Abort old aspectFilters requests, close issue 1759. 2011-08-16 15:31:02 -07:00
Raphael Sofaer
cc3eeac98e Merge the aspect dropdown in the publisher with master, some things are still broken 2011-08-16 14:59:53 -07:00
Raphael Sofaer
a2f7fed8f4 Fix syntax error in WSR, move tipsy from views into stream.js, fix stream element delete tipsy. 2011-08-14 17:45:50 -07:00
Andrej Kacian
b7b20b241f Do not mangle href in the show/hide comment toggle link when posting new comment. 2011-08-15 01:39:55 +02:00
Raphael Sofaer
d228f50557 Acceptable ajax loader for the aspect dropdown. 2011-08-13 12:45:17 -07:00
danielgrippi
1c5f61fb78 dropdown images as embedded assets and not 2 separate image tags 2011-08-12 18:18:58 -07:00
danielgrippi
75f3accd37 moved facebook friend inviter/finder into contacts layout & re-added search 2011-08-12 17:05:01 -07:00
Maxwell Salzberg
0981f04c77 smooth scroll like a smooth criminal 2011-08-11 15:19:16 -07:00
Dan Hansen
2e9040e227 merged with master, 7 cukes failing. jasmine is green. need to remove rails.js helpers so things suck less 2011-08-10 23:57:33 -07:00
Sarah Mei
0b02653f44 Merge pull request #1694 from ticho/tag-list-has-unfollow-icon 
Add a "unfollow" icon to each tag in followed tags listing
 2011-08-09 21:44:21 -07:00
Raphael Sofaer
902edb6745 Make the tag autocomplete on the getting started page less broken 2011-08-09 18:55:34 -07:00
Raphael Sofaer
cdfaa83e97 Let mobile users see getting_started, fix profile page infinite scroll on the mobile site 2011-08-09 16:55:22 -07:00
Raphael Sofaer
58384f82c8 Don't hide the sign in button and remember me box on the sign in page 2011-08-09 15:10:27 -07:00
Andrej Kacian
2a970145c8 Added icon to directly unfollow a tag to listing of followed tags. 2011-08-09 22:45:06 +02:00
Maxwell Salzberg
a4e6a019a7 make the scroll to top a bit more subtle 2011-08-09 11:33:47 -07:00
Maxwell Salzberg
72b734e3e8 scroll to top like a boss 2011-08-09 01:04:54 -07:00
Manuel Schölling
d9484e3dd5 Added a JS notification if the aspect the user posted to is not visible 2011-08-07 12:51:32 +02:00
Manuel Schölling
fead6032f7 Issue 1586: added a aspect drop down next to the submit button in the publisher 2011-08-07 12:51:32 +02:00
Andrej Kacian
4efff1cd77 Use Tipsy functions to update the onscreen tooltip instead of mouseover() 2011-08-07 00:44:02 +02:00
Andrej Kacian
6cf42fb8ba Better stab at the jasmine test. 2011-08-06 23:37:21 +02:00
Andrej Kacian
077d8fd2fe Fixes #1587 by changing globe icon tooltip when switching between public and limited post in publisher. 2011-08-06 23:37:21 +02:00
danielgrippi
49e745c449 remove stray console.log 2011-08-05 17:14:06 -07:00
Raphael Sofaer
52eeeb254e Fix embedder after changing aspects or posting 2011-08-05 16:56:57 -07:00
danielgrippi
8a3e0727c1 fix compressing of comments in stream 2011-08-05 16:29:22 -07:00
danielgrippi
5cea922cb8 fixed & updated facebox (1.3) 2011-08-05 14:32:58 -07:00
Raphael Sofaer
c38c744156 Fix contact search in the facebook friend finder. 
It was looking for #contact_list_search instead of .contact_list_search.
 2011-08-05 12:34:48 -07:00
Isaac Sanders
a1dab2546d Issue #1483 fix 2011-08-03 17:47:52 -07:00
Raphael Sofaer
168ccc11b0 Call collapseText on stream initialize 2011-08-03 12:47:48 -07:00
Raphael Sofaer
0b1ef41838 Scope stream scrolled events to new elements 2011-08-03 12:36:07 -07:00
Raphael Sofaer
a469f09c01 Fix hovercard conflict with vanity urls 2011-08-01 18:22:29 -07:00
Sarah Mei
7f81892245 For some reason, firefox doesn't like the outerHTML property of this div - it's always undefined. This was manifesting itself as ajax requests never completing in the cucumber feature due to a js error. 2011-07-31 13:32:05 -07:00
Maxwell Salzberg
7956eb7d51 update the jquery (only for mobile site) as jquery mobile requires jquery 1.6. why this did not break yesterday when I did it is beyond me 2011-07-30 09:36:28 -07:00
Raphael Sofaer
0873ad5828 Test and fix contacts index page 2011-07-29 17:01:45 -07:00
Ilyaaaaaaaaaaaaa Zhitomirskiy
16bd3e4c2f less delay on search; start on 2 chars instead of 3 2011-07-29 12:26:04 -07:00
Maxwell Salzberg
b2bce9e1b2 update jquery mobile to beta1 2011-07-28 23:32:41 -07:00
Raphael Sofaer
8ce5e72519 Use data-aspect_id, because integer html ids freak me out. 2011-07-28 15:51:00 -07:00
danielgrippi
ee95def580 removed js from the view. added grabbing hand while moving aspects 2011-07-28 15:34:01 -07:00
Raphael Sofaer
ddd4424df8 Merge remote branch 'manuels/842-sortable-aspects' 
Conflicts:
	app/models/user.rb
	db/schema.rb
 2011-07-28 14:36:41 -07:00
Dan Hansen
d94f806a50 close the lightbox when a user clicks on the backdrop 2011-07-26 20:43:35 -07:00
Raphael Sofaer
f74bf04798 Fix infieldLabels selector 2011-07-22 16:44:24 -07:00
Raphael Sofaer
bf59bf1c72 Delete old jqueries 2011-07-21 18:13:49 -07:00
Raphael Sofaer
caf26a5c64 Upgrade rails.js, add CSRF token manually in the photo uploader. 2011-07-21 17:49:33 -07:00
Raphael Sofaer
a58a06a010 Fix youtube embedder, scale it down into the stream 2011-07-21 15:18:09 -07:00
Raphael Sofaer
1ba49caeca Fix like socketing to use GUIDs 2011-07-21 13:59:02 -07:00
Raphael Sofaer
8eea37cbdb Fix people socketing 2011-07-21 13:41:46 -07:00
Raphael Sofaer
333e56b4d9 Fix post socketing 2011-07-21 13:26:48 -07:00
Raphael Sofaer
a5fd01cc09 Fix comment socketing 2011-07-21 13:21:48 -07:00
Raphael Sofaer
f60a748c21 Ajax in the contacts for mentioning after page load 2011-07-15 14:23:44 -04:00
Dan Hansen
10026dd100 indentation fixes for public/javascripts/widgets 2011-07-14 13:35:45 -07:00
Dan Hansen
ca2413ff6b Widgets now subscribe to a widget/ready event. Apply change to all widgets, added some tests & lots of cleanup. 2011-07-13 22:23:31 -07:00
danielgrippi
039b65b5cc a little js cleanup for post.js 2011-07-12 00:12:08 -07:00
danielgrippi
0fbf366ef1 prevent default on lightbox close button 2011-07-11 23:31:18 -07:00
danielgrippi
75115ccbb3 lower hovercard mouseout timeout to basically zero 2011-07-11 20:05:54 -07:00
Raphael Sofaer
8f50c622fa Fix contentUpdater spec, adjust migration and fix a couple of the js viwes 2011-07-11 16:17:11 -07:00
danielgrippi
d364f158b8 cache counters in for likes. pending Diaspora::Likeable module... 2011-07-11 15:05:55 -07:00
danielgrippi
e0bbde4ce2 comment likes wip. need to backfill some tests, make views nicer 2011-07-11 15:03:28 -07:00
danielgrippi
797a6f5ca9 like comments js response wip 2011-07-11 15:02:46 -07:00
Raphael Sofaer
39ff51a9d7 Make comments index ajaxy 2011-07-11 14:03:59 -07:00
danielgrippi
776368d45e added left/right arrow events to the lightbox; lightbox only on stream element images for now 2011-07-10 21:09:00 -07:00
danielgrippi
e09ddef361 DH DG; lightboxin wip 2011-07-10 21:08:34 -07:00
danielgrippi
7b7f3fc086 fix up aspects/edit popup a little 2011-07-10 18:34:47 -07:00
Manuel Schölling
0855144a0a Issue #842: Sortable aspects 
Signed-off-by: Manuel Schölling <manuel.schoelling@gmx.de>
 2011-07-10 20:37:11 +02:00
Raphael Sofaer
8cf0fa8446 Don't get tags in the publisher 2011-07-07 10:48:07 -07:00
danielgrippi
4c380b4edf fix hashtags in hovercard 2011-07-06 13:57:04 -07:00
danielgrippi
fd015129c4 final touchups to hovercard 2011-07-06 13:51:19 -07:00
danielgrippi
d51e9431a6 fixed some styling/positioning. don't display a hovercard for the current user's person links 2011-07-06 12:45:16 -07:00
danielgrippi
a96b77555e DHHHHHHHHHHHHHHHHHHHHHHHHHH hovercard caching with subscription on state change 2011-07-06 12:45:16 -07:00
danielgrippi
f28bb76755 hovercards cache both dropdown and person responses 2011-07-06 12:45:16 -07:00
Ilyaaaaaaaaaaaaa Zhitomirskiy
1c79c2c6f0 made aspect_dropdown ajax in (created route), in the process of removing aspect_membership js responses 2011-07-06 12:45:16 -07:00
danielgrippi
675d9d7485 wip. Person#as_json is breaking right now 2011-07-06 12:45:16 -07:00
Dan Hansen
8f31e99535 missed hovercard.js 2011-07-06 12:45:16 -07:00
Raphael Sofaer
4a9900dff6 Fix some ui bugs on the post show page 2011-07-05 18:52:00 -07:00
Raphael Sofaer
4f056dca8e Ajax in likes in stream 2011-07-04 22:10:30 -07:00
danielgrippi
403d18bac4 fixed content expander in comments; comments have a smaller limit than posts 2011-07-03 22:06:58 -07:00
Michael Sofaer
d2b7168195 Use an explicit per_page param instead of switching on format 2011-07-03 21:16:58 -07:00
danielgrippi
9ec905560c visual touchups, show loading gif right away 2011-07-02 17:53:07 -07:00
Dan Hansen
eb0fbe519c remove read/unread state, always mark notifications as read, only return 5 notifications for json requests 2011-07-02 16:39:01 -07:00
Dan Hansen
0b56ade468 basic unread/read states 2011-07-02 15:14:02 -07:00
Dan Hansen
3941d562a8 clean up notifications-badge.js 2011-07-02 14:57:17 -07:00
Dan Hansen & Daniel Grippi
b48b182c73 STYLIN' 2011-07-02 00:04:14 -07:00
Dan Hansen
05688c2f43 notifications wip 2011-07-01 22:46:54 -07:00
danielgrippi
8bf6ad45a5 various bugfixes, added missing translations, made all tests pass (rspec, cucumber, jasmine) 2011-07-01 22:04:36 -07:00
danielgrippi
f90dc0996a More visual cleanup; top nav; edit aspects 2011-07-01 16:12:14 -07:00
danielgrippi
41773cb29e Almost done with left-nav, added link to aspect edit facebox, colored share button 2011-07-01 14:22:38 -07:00
danielgrippi
cd9be3904b publisher rework 2011-07-01 10:51:45 -07:00
danielgrippi
60077bd70a minor visual changes, more or less. facebox headers are now white. 2011-07-01 10:51:45 -07:00
danielgrippi
238e859dbe add contact images to aspect index, removed comment background color, add vertical rule to people pages 2011-07-01 10:49:20 -07:00
danielgrippi
ca76db4550 DG RS left nav almost there. touched up publisher, among other things 2011-07-01 10:49:19 -07:00
danielgrippi
4e48db23f0 aspect dropdown shows name of aspect if contact is only in one; green 2011-06-30 12:18:41 -07:00
Dennis Collinson & Michael Sofaer
f9e8e7a041 notifications tests pass 2011-06-27 19:51:35 -07:00
Dan Hansen & Michael Sofaer
bc874e92cd close link for notifications ajax 2011-06-27 19:51:35 -07:00
Dan Hansen & Michael Sofaer
cba7a1a577 timeago for ajax notifications 2011-06-27 19:51:35 -07:00
Dan Hansen & Maxwell Salzberg
37aeb2fa36 add CSS and refactor to new file 2011-06-27 19:51:35 -07:00
Michael Sofaer
2c4a75f6a6 Handle multiple notification objects correctly 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
danielgrippi
f9a23b8120 added inf scroll to contacts index page 2011-06-27 15:54:03 -07:00
Raphael Sofaer
137181e07f Fix autoresizing after infscroll and aspect change, inflabels after aspect change 2011-06-26 20:09:21 -07:00
Raphael Sofaer
5884a900a2 Get rid of manage 2011-06-24 16:55:40 -07:00
Raphael Sofaer
02739259b6 Don't hide the forgot password link 2011-06-22 13:19:54 -07:00
Maxwell Salzberg
de55a1cbb3 remove remember aspects feature 2011-06-03 17:35:27 -07:00
Dan Hansen
bc465848c9 MS DH fixed like sizes, everywhere 2011-06-02 17:45:45 -05:00
Dan Hansen
864233eb63 fix status message show page and break out Post to it's own javascript widget 2011-06-02 17:45:45 -05:00
Dan Hansen
0f0c033c26 MS DH; add context to timeago events 2011-06-02 16:32:41 -05:00
Dan Hansen
7363bf3499 MS DH; update timeago if a timeago element on the page exists. 2011-06-02 12:09:06 -05:00
Raphael Sofaer
0770d6e8fd Most of the stream.js stuff needs to be live, unfortunately. 2011-05-31 16:00:57 -07:00
Raphael Sofaer
62977e1d15 Don't initialize the stream if there is no stream. 2011-05-31 15:18:59 -07:00
Raphael Sofaer
203e05bf3a Remove console.logs 2011-05-31 14:32:07 -07:00
Dan Hansen
0edc160007 Clean up stream.js, make the comments step selector more sane 2011-05-31 15:52:17 -05:00
Raphael Sofaer
cfd077a90d Fix the thing that I broke in the build, fix syntax error in the build that disabled stream-spec 2011-05-28 20:37:12 -07:00
Raphael Sofaer
503de3efe1 Fix facebox close button and loading gif 2011-05-28 18:18:22 -07:00
MrZYX
406622eeed prevent timing issue when autosuggest is too slow 2011-05-25 13:32:11 +02:00
Maxwell Salzberg
4c535f3eb4 hackity hack to fix notifciation page decrementing 2011-05-24 20:41:28 -07:00
MrZYX
d6e9e9cca5 fixed comment count update on comment posting 2011-05-24 21:03:24 +02:00
Maxwell Salzberg
ff1168a6ba comment out the websocket notice. it was my idea to put it there, and it was a bad idea 2011-05-23 11:55:44 -07:00
MrZYX
331aa1ff60 you know the facepalm smiley? Here it is: m( 2011-05-19 20:10:35 +02:00
MrZYX
a3c287ca9a fixed #1023 (again) 2011-05-18 14:26:08 +02:00
MrZYX
66380fd33f fixed some translations 2011-05-18 13:55:50 +02:00
Raphael Sofaer
c942f76d29 Turn off user collapse and turn up status messages to over 9000 2011-05-17 18:14:35 -07:00
Raphael Sofaer
f409ace067 Merge remote branch 'evant/354-long-post' into evant_log_post_merge 
Conflicts:
	config/assets.yml
 2011-05-17 18:02:36 -07:00
Raphael Sofaer
2953cc8497 Move infinite scroll out of vendor, because it has been edited 2011-05-17 15:06:21 -07:00
danielgrippi
775e7b6b2b Merge branch 'master' into follow 
Conflicts:
	features/step_definitions/user_steps.rb
 2011-05-17 11:33:35 -07:00
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
8d7b0b2c4c take out animations in inf scroll. 2011-05-16 16:55:24 -07:00
danielgrippi
d70f10b609 made dropdown selectors sexi 2011-05-16 16:29:13 -07:00
danielgrippi
7eaca0346c Merge branch 'master' into follow 
Conflicts:
	config/assets.yml
	public/stylesheets/sass/_mixins.scss
	spec/models/user/posting_spec.rb
 2011-05-16 14:56:28 -07:00
MrZYX
e338886910 fixes to login page: removed not needed login.sass; removed fixed string length assumption; fixed login button not showing up in Chrome when the form is pre-filled 2011-05-16 15:16:01 +02:00
Ilya Zhitomirskiy
709ac44da3 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
danielgrippi
01be909e38 well, that was dumb. (fix cucumber) 2011-05-14 00:58:39 -07:00
danielgrippi
666fb76bfc login as its own js file. accounted for the autofil state 2011-05-13 22:27:08 -07:00
danielgrippi
402e84708b ms iz; everything is green, the sharewith is translated in js, fixed the clicking on the checkbox bug 2011-05-13 16:05:37 -07:00
danielgrippi
a9a1280e17 one cuke failing. wip 2011-05-12 20:41:56 -07:00
Evan Tatarka
5f406b18d5 Updated code to work with lastest master. Tests should now pass. 2011-05-12 20:38:05 -04: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
danielgrippi
47cf614996 sneaky fixed header 2011-05-11 18:53:59 -07:00
danielgrippi
4280417e41 broke out dropdown into its own partial. aspect dropdown on person show. user menu fixed 2011-05-11 18:33:17 -07:00
danielgrippi
7893129435 prevent user from hitting aspectmemberships controller before response on dropdowns 2011-05-11 17:07:58 -07:00
danielgrippi
c67d143719 dropdown in ContactsController#sharing now works 2011-05-11 15:47:13 -07:00
danielgrippi
9f3044838d Views for contactscontroller#sharing almost done, cuke for editing aspect memberships started 2011-05-11 14:53:43 -07: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
Raphael Sofaer
ab1f29c339 Working on styling the ContactsController#sharing 2011-05-10 14:17:43 -07:00
Raphael Sofaer
9d2849d851 Move publisher ajax stuff into publisher.js 2011-05-08 20:40:35 -07:00
Raphael Sofaer
ffd96d989c Update publisher callback to use ContentUpdater 2011-05-08 20:31:13 -07: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
fc25c9bedb Flash message handling is now a widget 2011-05-08 10:53:09 -05:00
Dan Hansen
535954dcc2 make incrementing the notification count optional 2011-05-07 07:28:52 -05:00
Maxwell Salzberg
7a2f6dae10 fixed js error on new comments on statusmessage show page 2011-05-06 15:29:39 -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
abde3244b5 InfiniteScroll#options doesn't need to be a function 2011-05-03 14:54:49 -07:00
Raphael Sofaer
94bc18e467 Make websocket closed message less disruptive 2011-05-02 17:12:18 -07:00
Raphael Sofaer
83a3655bfe Don't infinitescroll undefined 2011-05-02 15:28:42 -07:00
Raphael Sofaer
2abb592833 Destroy old infinite scrollers to keep event bindings from piling up 2011-05-02 14:08:41 -07:00
Raphael Sofaer
bc8b6097bc Update infinite scroll plugin for $.fn.infinitescroll.destroy 2011-05-02 14:08:41 -07:00
Raphael Sofaer
38e44b13aa Test and fix pagination on profile, tag and aspect streams 2011-04-30 10:26:16 -07:00
Sarah Mei
09ac4c789e Remove debugging statements 2011-04-29 21:00:39 -07:00
MrZYX
6623dbb1f1 fixed #1039 2011-04-29 23:38:10 +02: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
78585f5a65 Add license to specs and notifications.js 2011-04-27 16:34:30 -05:00
Dan Hansen
6a9df590d0 add show more functionality to notifications. don't scroll to the top of the page when clicked 2011-04-27 16:29:08 -05:00
Dan Hansen
4a101f25d9 Notifications.js refactor, add specs 2011-04-27 16:22:56 -05:00
Dan Hansen
49183f8f3d Have the context of infinitescroll.initialize be infinitescroll 2011-04-26 21:39:13 -05:00
Dan Hansen
e8a1ca70e3 WidgetCollection#subscribe now accepts a parameter that will be the context of the callback 2011-04-26 21:37:19 -05:00
Raphael Sofaer
948725b946 Fix infinite scroll after changing aspects 2011-04-26 18:26:12 -07:00
Raphael Sofaer
2517653d34 Red feature for infinite scroll after changing aspects 2011-04-26 17:28:42 -07:00
Raphael Sofaer
24ea518b6f Fix some JS bugs, delegate doesn't work if you remove the element 2011-04-25 16:15:33 -07:00
Raphael Sofaer
9940f19962 Test and fix embedder after changing aspects 2011-04-25 12:24:38 -07:00
MrZYX
a09150e4e0 fixed #1023; display close icon on diaspora alert faceboxes 2011-04-24 15:40:30 +02:00
Dan Hansen
3d11b402e0 Infinite scroll is now a widget, remove InfiniteScroll#postScroll, use DiasporaJS pub/sub instead, remove timeago.js hacks 2011-04-22 20:33:21 -05:00
Dan Hansen
d28e7e70b8 use typeof operand instead of object#hasOwnProperty 2011-04-22 20:02:54 -05:00
Raphael Sofaer
830cbf0876 I'm blaming that one on the vicodin 2011-04-21 15:13:17 -07:00
Raphael Sofaer
bad0d9f4ea Merge branch 'master' of github.com:diaspora/diaspora 
Conflicts:
	public/javascripts/keycodes.js
 2011-04-21 12:49:49 -07:00
Raphael Sofaer
804b6cc490 Clean up some JS 2011-04-21 12:48:31 -07:00
MrZYX
45d621a9e6 fixed embedder the hacky way (?) and added cucumber feature for youtube feature so you'll notice if you breakt it again the next time 2011-04-21 15:42:28 +02:00
MrZYX
89c3e30663 apply suggested fix in/for #1026 2011-04-21 13:31:30 +02:00
maxwell
14bfdbd4a9 hack to fix the timeago for other languages. ohaibbq can you find why this broke in the first place? 2011-04-18 18:11:03 -07:00