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

1481 commits

Author SHA1 Message Date
danielgrippi
8a3e0727c1 fix compressing of comments in stream 2011-08-05 16:29:22 -07:00
danielgrippi
0cceb4fdd3 fixed people/contacts layout; pulled person sub-header into its own partial 2011-08-05 15:51:18 -07:00
danielgrippi
5cea922cb8 fixed & updated facebox (1.3) 2011-08-05 14:32:58 -07:00
danielgrippi
75c3107035 made signing up and accepting an invitation look a little nicer 2011-08-05 12:36:53 -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
Maxwell Salzberg
001d4ceaff fix friend finder styling 2011-08-03 18:55:26 -07:00
danielgrippi
9b24af717f fix styling on featured users on getting started; added hovercards 2011-08-03 18:22:52 -07:00
danielgrippi
23c2eaf1c5 added a real profile description on the welcome tab 2011-08-03 18:02:58 -07:00
danielgrippi
b8b4ad3d84 added helpers for each of the getting started steps; make step sections dull if completed 2011-08-03 18:02:56 -07:00
danielgrippi
303b23883d added featured users, left nav, and search boxes into getting started 2011-08-03 18:02:56 -07:00
danielgrippi
c9eeeb6150 ms dg; profile (step 1) finished 2011-08-03 18:02:56 -07:00
Ilyaaaaaaaaaaaaa Zhitomirskiy
c2dc5fde08 dg iz reworked the getting started into a tab, need to remove the getting started steps 2011-08-03 18:02:56 -07:00
Maxwell Salzberg
1ae7b80c56 some tweaks for friend finder styling 2011-08-03 18:00:38 -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
5885d18a39 Expand the comment box on post show pages 2011-08-02 11:10:43 -07:00
Jakob Kramer
f1cee54e6a fix sass, so hidden fields don't show up in old fx versions 2011-08-02 13:02:25 +02:00
Raphael Sofaer
a469f09c01 Fix hovercard conflict with vanity urls 2011-08-01 18:22:29 -07:00
danielgrippi
6daf7f5ad9 add prompt to add more contacts if user has less than 2 contacts on aspect index 2011-08-01 15:31:13 -07:00
Maxwell Salzberg
aede25fd11 make overflow of status messages scrollable 2011-07-31 22:19:02 -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
Ilyaaaaaaaaaaaaa Zhitomirskiy
e42d7273a8 featured users section 2011-07-29 19:00:15 -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
Ilyaaaaaaaaaaaaa Zhitomirskiy
00571b84cd completed donate option 2011-07-29 11:33:30 -07:00
Ilyaaaaaaaaaaaaa Zhitomirskiy
24fed68247 added the buttons 2011-07-29 11:33:29 -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
87d0f9d6fd Merge branch 'master' of github.com:diaspora/diaspora 2011-07-28 14:42:02 -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
danielgrippi
6e25a6a0f1 touched up reshare view 2011-07-28 13:46:16 -07:00
Raphael Sofaer
4442319560 Merge remote branch 'ticho/followed-tags-header-bold' 2011-07-28 13:15:44 -07:00
Dennis Schubert
bbf28f9072 That fixes the mobile-interface for now 2011-07-28 21:45:42 +02:00
Raphael Sofaer
7ca1d313d6 Merge remote branch 'manuels/issue1596-Make-hashes-of-hashtags-in-text-shinier' 2011-07-28 12:20:28 -07:00
Andrej Kacian
cc3ba8b076 Display unread post count for conversations in inbox, if appropriate. 2011-07-27 22:33:13 +02:00
Andrej Kacian
0f6f9a4b0a Darken the background of a conversation with unread posts in inbox, instead of lightening it (since default background color is white now). 2011-07-27 22:32:15 +02:00
Manuel Schölling
f3491c34ef issue 1594: make tags more readable 2011-07-27 22:23:00 +02:00
Dan Hansen
d94f806a50 close the lightbox when a user clicks on the backdrop 2011-07-26 20:43:35 -07:00
Andrej Kacian
26e0442f46 Display followed tags header in bold in aspects view. 2011-07-26 19:09:37 +02:00
Raphael Sofaer
dfa6539ef2 Merge branch 'repost' 2011-07-22 18:00:02 -07:00
Raphael Sofaer
f74bf04798 Fix infieldLabels selector 2011-07-22 16:44:24 -07:00
Anass Ahmed
eaef931703 final commit 2011-07-22 09:34:19 +02:00
Anass Ahmed
3c8d21fde5 Edited RTL conversations stylesheet 2011-07-22 09:20:55 +02:00
danielgrippi
f3a515eef1 DG IZ reshare retractions is WIP 2011-07-21 18:22:17 -07:00
danielgrippi
d1bbbdbc4c fixed all specs; rebased. 2011-07-21 18:22:17 -07:00
Maxwell Salzberg
fa9269541f wip removed some generated specs 2011-07-21 18:22:17 -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
Anass Ahmed
d650845161 Edited RTL CSS SASS style sheet 2011-07-21 04:42:20 +02: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
f4bdf17c4a expand hoverhard a few pixels to suit the longest aspect names 2011-07-13 10:21:34 -07: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
danielgrippi
dba8a6598c don't constrain photos to squares on photo index 2011-07-12 00:21:44 -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
58e844eb1f fade in like action for comments 2011-07-11 16:53:14 -07:00
Raphael Sofaer
be5f3bf95e Merge branch 'like-comments' 2011-07-11 16:18:19 -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
Ilyaaaaaaaaaaaaa Zhitomirskiy
ee0ecc790c making the service users badge wider, added a commented out seed step for having some service user data 2011-07-11 16:05:07 -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
danielgrippi
2e15b6a61e Likes in comments, cache counter disabled for now. 2011-07-11 15:00:48 -07:00
Ilyaaaaaaaaaaaaa Zhitomirskiy
18a0a492fb made the badges slightly wider on the facebook friend finder 2011-07-11 14:49:07 -07:00
Raphael Sofaer
eafe6a7c85 Merge branch 'ajaxy-comments' 2011-07-11 14:05:45 -07:00
Raphael Sofaer
39ff51a9d7 Make comments index ajaxy 2011-07-11 14:03:59 -07:00
Maxwell Salzberg
ae8f75eae9 some cleanup for the tags field on the getting started step one 2011-07-10 23:01:11 -07:00
danielgrippi
2ea64658ec fix margin bottom on lightbox 2011-07-10 22:00:05 -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
6a165c0e3d made show pages wider for status messages. made names blue in comments for easier reading 2011-07-10 18:54:38 -07:00
danielgrippi
7b7f3fc086 fix up aspects/edit popup a little 2011-07-10 18:34:47 -07:00
danielgrippi
aa8ae9cca6 remove red background on photos index 2011-07-10 17:12:59 -07:00
danielgrippi
e84635dae2 constrain in the image uploader, don't crop 2011-07-10 17:03:38 -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
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
f3d185fe41 hovercard on comments 2011-07-06 17:13:11 -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
Dan Hansen
e852940382 HOVERCARD 2011-07-06 12:45:16 -07:00
danielgrippi
d74942877f touch up message inbox view 2011-07-06 00:38:25 -07:00
Raphael Sofaer
4a9900dff6 Fix some ui bugs on the post show page 2011-07-05 18:52:00 -07:00
danielgrippi
41be7a37b0 hide aspect dropdowns on tag show temporarily 2011-07-05 16:42:32 -07:00
danielgrippi
ecaf7974e3 removed fixed sidebar for tag following 2011-07-05 16:27:41 -07:00
Ilyaaaaaaaaaaaaa Zhitomirskiy
c3e477f2c5 Color the follow tag button 2011-07-05 15:03:26 -07:00
danielgrippi
632eacc51f css fix on followed tags nav 2011-07-05 15:03:26 -07:00
danielgrippi
b2f580c39e user dropdown height 100% 2011-07-05 14:24:30 -07:00
danielgrippi
ecd79766ce remove aspect badges 2011-07-04 22:36:21 -07:00
Raphael Sofaer
162f035c62 Merge branch 'ajaxy-likes' 2011-07-04 22:12:12 -07:00
Raphael Sofaer
4f056dca8e Ajax in likes in stream 2011-07-04 22:10:30 -07:00
danielgrippi
1aed8e7e16 testing fixing left nav on aspect/index 2011-07-04 21:55:04 -07:00
danielgrippi
d75a682199 compress png 2011-07-04 17:26:34 -07:00
danielgrippi
85d6eb70e7 fix cubbies info page (removed reference to token, changed infographic) 2011-07-04 16:14:05 -07:00
Dan Goldenberg
39ef006aef Revert "Changed ajax spinners to an asterix (both sizes) to look like login page. I made them in Flash so I can adjust the speed or whatever" 
This reverts commit 3467c8d996.
 2011-07-04 13:33:36 -07:00
Dan Goldenberg
fa01b4f09d Revert "Also replaced facebox loading GIF" 
This reverts commit 2e10643d00.
 2011-07-04 13:33:02 -07:00
Dan Goldenberg
2e10643d00 Also replaced facebox loading GIF 2011-07-04 12:14:36 -07:00
Dan Goldenberg
3467c8d996 Changed ajax spinners to an asterix (both sizes) to look like login page. I made them in Flash so I can adjust the speed or whatever 2011-07-04 12:00:14 -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
8a8f8db9ad Merge branch 'notifications' 2011-07-02 17:53:55 -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
danielgrippi
689bde2e5f take out useless 'reshare' 2011-07-02 15:41:50 -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
1a2ba034ab added edit links in aspect_nav; removed ununsed icons; fixed facebox duplication on aspect/index 2011-07-01 17:23:58 -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
Ricardo
24e3617c66 correct reference to application config file 
The page that is initially shown after starting diaspora for the first
time tells the administrator to customize ./config/app.yml.example,
which doesn't exist. The file is actually called
./config/application.yml.example.
 2011-07-01 20:34:56 +08:00
danielgrippi
4e48db23f0 aspect dropdown shows name of aspect if contact is only in one; green 2011-06-30 12:18:41 -07:00
danielgrippi
b8ea8e9e75 start a conversation with an aspect from contact index page 2011-06-28 23:09:11 -07:00
danielgrippi
2c3e403bc0 muted the headers colors a bit, refined buttons 2011-06-28 21:09:15 -07:00
Raphael Sofaer
0eb31e3ba7 added jwt to the chubbies bundle, made the asterisk black 2011-06-28 17:52:38 -07:00
Raphael Sofaer
1af945de11 Merge branch 'master' into oauth 
Conflicts:
	Gemfile
	Gemfile.lock
	app/models/app_config.rb
	app/models/post.rb
	db/schema.rb
	public/stylesheets/sass/application.sass
	spec/lib/webfinger_spec.rb
 2011-06-28 17:13:38 -07:00
Dennis Collinson & Michael Sofaer
f9e8e7a041 notifications tests pass 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
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
73fe74c834 updated selenium driver to work with FF5; added translations to contacts/index; fixed cucumber 2011-06-27 18:58:29 -07:00
danielgrippi
00ffade884 sub menu for people only sharing with you on contacts page 2011-06-27 17:22:36 -07:00
danielgrippi
44b77c58a3 just have a remove from aspect icon when viewing an aspect in contacts index 2011-06-27 16:26:54 -07:00
danielgrippi
f9a23b8120 added inf scroll to contacts index page 2011-06-27 15:54:03 -07:00