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

829 commits

Author SHA1 Message Date
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