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

1092 commits

Author SHA1 Message Date
Maxwell Salzberg
72b734e3e8 scroll to top like a boss 2011-08-09 01:04:54 -07: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
6b64d7f55a Correctly space unread and total message counts in conversations list 2011-08-07 04:06:26 +02:00
danielgrippi
3655ea22a6 missing 'important' flag 2011-08-05 17:39:58 -07:00
danielgrippi
ff1882387d wrong margin 2011-08-05 17:35:22 -07:00
danielgrippi
5e1d1428d0 fix styles 2011-08-05 17:29:57 -07:00
danielgrippi
afe2bc37cc fix stylesheet for remote friend 2011-08-05 17:26:50 -07:00
danielgrippi
cd62064846 touched up aspect/edit and friend finder popups 2011-08-05 17:14:07 -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
75c3107035 made signing up and accepting an invitation look a little nicer 2011-08-05 12:36:53 -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
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
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
behrooz shabani (everplays)
ae72a9382d make comments to accept rtl direction by making spans blocked 2011-07-31 19:50:03 +04:30
Ilyaaaaaaaaaaaaa Zhitomirskiy
e42d7273a8 featured users section 2011-07-29 19:00:15 -07:00
Maxwell Salzberg
b2bce9e1b2 update jquery mobile to beta1 2011-07-28 23:32:41 -07:00
danielgrippi
ee95def580 removed js from the view. added grabbing hand while moving aspects 2011-07-28 15:34:01 -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
Manuel Schölling
350752269f added underlining for hovered tags 2011-07-28 18:20:30 +02: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
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
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
a58a06a010 Fix youtube embedder, scale it down into the stream 2011-07-21 15:18:09 -07:00
Anass Ahmed
d650845161 Edited RTL CSS SASS style sheet 2011-07-21 04:42:20 +02: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
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
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
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
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
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
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
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
danielgrippi
1aed8e7e16 testing fixing left nav on aspect/index 2011-07-04 21:55:04 -07:00
danielgrippi
85d6eb70e7 fix cubbies info page (removed reference to token, changed infographic) 2011-07-04 16:14:05 -07:00
danielgrippi
403d18bac4 fixed content expander in comments; comments have a smaller limit than posts 2011-07-03 22:06: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 & 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
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
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
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 & Maxwell Salzberg
37aeb2fa36 add CSS and refactor to new file 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
9e92230cf7 make contact listings more compact on contact index (we don't need to know their tags here) 2011-06-27 15:32:39 -07:00
danielgrippi
f839714646 added aspect filtering to contact index. fixed rspec 2011-06-27 15:03:39 -07:00
danielgrippi
1fe4c3c3de don't group by 2011-06-27 14:06:03 -07:00
danielgrippi
85da6d340f sort contacts by last name on contacts page 2011-06-27 14:00:15 -07:00
danielgrippi
a2609f7dac simple filter on contacts index page (my/all contacts) 2011-06-27 12:12:50 -07:00
danielgrippi
a9b7cd1254 nicer auth prompt. wip. 2011-06-23 12:40:47 -07:00
Raphael Sofaer
2276f2d4a6 Fix color of via link on mobile site 2011-06-22 18:51:35 -07:00
Raphael Sofaer
02739259b6 Don't hide the forgot password link 2011-06-22 13:19:54 -07:00
Raphael Sofaer
7fd86924ee Fix pagination in AppsController 2011-06-09 16:23:15 -07:00
Raphael Sofaer
d9d66a5c31 WIP auth form and more oauth stuff 2011-06-08 11:55:11 -07:00
danielgrippi
b8a6bf9f51 trying something different on app show page. worth a shot. 2011-06-06 22:59:31 -07:00
Nahir Acosta
e2d2db202a Added CSS3 rotation for Gecko (Firefox). 2011-06-03 19:55:43 -07:00
Maxwell Salzberg
d35970a0ab make like font bigger 2011-06-03 17:50:48 -07:00
danielgrippi
01edfeee03 Chubbies now sends manifest data to create a client 2011-06-03 16:24:12 -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
Sebastian
d9f23b5e2a fixed #1018 - aspects width on /aspects/manage 2011-05-31 18:29:24 +02:00
Nicolas Berens
c9417ec93f optimized images (safes a few bits and makes pagespeed shut the fuck up ) 2011-05-31 17:34:22 +02:00
Raphael Sofaer
503de3efe1 Fix facebox close button and loading gif 2011-05-28 18:18:22 -07:00
danielgrippi
8e3149ca01 better page explaining cubbi.es and why we're promoting it on diaspora 2011-05-23 01:14:33 -07:00
Maxwell Salzberg
90d62f3c8a small ui tweak for mobile login page 2011-05-22 15:43:39 -07:00
danielgrippi
0391795f80 better right pane sections 2011-05-21 14:52:59 -07:00
MrZYX
e79ef29a39 fixed that super annoying bug on the notificaitons page 2011-05-20 21:36:06 +02:00
danielgrippi
f2259e5e25 put link in via link translation, add via link to mobile site 2011-05-19 16:06:29 -07:00
danielgrippi
177061d1c5 added via links 2011-05-19 13:13:08 -07:00
danielgrippi
0405b72477 removed some unused defs 2011-05-17 15:00:49 -07: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
MrZYX
f916f3a3e0 remove the width from the share button, thanks artem 2011-05-15 00:49:35 +02:00
danielgrippi
b89dd900cc misc visual cleanup on mobile 2011-05-13 23:33:16 -07:00
danielgrippi
0e72a91d1b update login page 2011-05-13 22:05: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
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
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
danielgrippi
8b081a48b4 likes controller now has destroy method. commented out dislikes from views. unlike links not functional. 2011-05-11 11:08:29 -07:00
Raphael Sofaer
ab1f29c339 Working on styling the ContactsController#sharing 2011-05-10 14:17:43 -07:00
Maxwell Salzberg
d0381b913d remove the hidden rule for the status message show page submit button. thx dangoldenberg for debugging 2011-05-06 13:30:43 -07:00
MrZYX
3d1c208fc2 added a bit space to checkbox labels, thanks 21echoes 2011-05-05 21:38:43 +02:00
MrZYX
f6e4be35a1 white-space: nowrap; for buttons 2011-05-04 17:53:22 +02:00
MrZYX
1dcb0e4863 fixed #1038 2011-05-04 16:22:24 +02:00
Dan Hansen
4a101f25d9 Notifications.js refactor, add specs 2011-04-27 16:22:56 -05:00
MrZYX
a09150e4e0 fixed #1023; display close icon on diaspora alert faceboxes 2011-04-24 15:40:30 +02:00
Raphael Sofaer
5dcfff104a Merge remote branch 'ritchewilson/prev_next' 
Conflicts:
	public/stylesheets/sass/mobile.sass
 2011-04-19 17:05:12 -07:00
MrZYX
c06b885aa7 fixed #1027 2011-04-19 00:27:31 +02:00
maxwell
1fc01c3980 basically fixed 2011-04-18 15:10:47 -07:00
maxwell
2223c562c0 first fix of notification page 2011-04-18 15:10:47 -07:00
maxwell
5050307179 Revert "Revert "touched up notifications page" because it completly breaks the page (in matter of style and localization [dates!])" 
This reverts commit 981d39d220.
 2011-04-18 15:10:46 -07:00
MrZYX
981d39d220 Revert "touched up notifications page" because it completly breaks the page (in matter of style and localization [dates!]) 
This reverts commit a16e83df9e.
 2011-04-16 14:03:24 +02:00
danielgrippi
a16e83df9e touched up notifications page 2011-04-15 10:42:21 -07:00
Raphael Sofaer
d5ecce7ca6 Merge branch 'limit_similar_contacts' 
Conflicts:
	app/controllers/people_controller.rb
 2011-04-12 11:48:41 -07:00
MrZYX
93be252b59 Merge branch 'css-rtl' 
Conflicts:
	public/javascripts/application.js
	public/javascripts/inbox.js
 2011-04-11 21:52:01 +02:00
behrooz shabani (everplays)
69eb27cbe9 moved comments textarea to left so it wont disappear avatar in RTL UI 2011-04-12 00:12:39 +04:30
behrooz shabani (everplays)
60371c8981 swapped horizontal margins on links of #conversation_controls in RTL UI 2011-04-12 00:03:56 +04:30
behrooz shabani (everplays)
426c1b28b6 minor fixes on conversations list & sign up stuff 2011-04-11 23:58:33 +04:30
behrooz shabani (everplays)
22b0fca124 small fixes on settings & notifications pages in RTL UI 2011-04-11 23:13:38 +04:30
behrooz shabani (everplays)
e076f89ccd fixed comment box in RTL UI 2011-04-11 22:56:22 +04:30
behrooz shabani (everplays)
ad34a7f6f7 implemented RTL UI for settings/conversations/notifications 2011-04-11 22:44:55 +04:30
MrZYX
440fd26c14 hopefully finally fix #946 2011-04-11 19:15:14 +02:00
behrooz shabani (everplays)
cddeafee74 rtl UI for aspects implemented 2011-04-11 00:21:14 +04:30
Raphael Sofaer
157b117469 Just style links directly 2011-04-07 15:13:37 -07:00
MrZYX
21b5f7932f fixed #997 by turning cancel link into a reset button 2011-04-06 13:31:56 +02:00
MrZYX
a7a8da2f75 added detection of rtl languages on every user based input 2011-04-03 02:14:35 +02:00
MrZYX
e4db8c7a36 fixed #589, no CSS! 2011-04-03 02:10:41 +02:00
danielgrippi
bdff036cda remove spacing from stream elements 2011-04-01 11:26:04 -07:00
maxwell
569fb66e9e bunch of small mobile ui fixes 2011-03-31 23:38:38 -07:00
maxwell
bb59df46f9 updating jquery mobile, fix the menu page a bit 2011-03-31 18:19:51 -07:00
zhitomirskiyi
bb4c2ee85d added a character count to the publisher 2011-03-30 19:11:24 -07:00
danielgrippi
5fa2a7a6f3 use popState in message inbox 2011-03-30 16:22:25 -07:00
danielgrippi
0c15e74420 remove extra right padding on stream elements 2011-03-30 14:53:33 -07:00
maxwell
8b7dc0a2cc translated bookmarklet, added post to main page 2011-03-28 19:57:06 -07:00
Ritchie Wilson
a1b07d84e1 Next and Previous arrows for mobile photos 2011-03-28 16:04:29 -04:00
Raphael Sofaer
aed190dc6d cucumber for comment retractions, modified views 2011-03-25 16:26:03 -07:00
Raphael Sofaer
555a774668 Initial contacts_of_contact page 2011-03-23 16:42:53 -07:00
danielgrippi
363c5f4dae fix gradient direction on add/remove buttons 2011-03-23 12:42:07 -07:00
danielgrippi
2b8b824230 fixed private mention popup in firefox 2011-03-22 17:25:32 -07:00
danielgrippi
a44ca157e6 added text to private message notification; user picture in popup 2011-03-22 17:14:37 -07:00
Sarah Mei
631163ec02 "Add contact" buttons on tag page are smaller and don't appear on top of names. 
Moved some logic from view into user model.
 2011-03-22 13:16:58 -07:00
danielgrippi
cc01beb3d0 cross-browser opacity mixin 2011-03-22 12:40:44 -07:00
danielgrippi
48598a9942 added linear-gradient mixin. 2011-03-22 12:35:03 -07:00
danielgrippi
557b5393c2 fix sass error 2011-03-22 12:14:50 -07:00
danielgrippi
cb533c8675 added box-shadow and border-radius mixins. changed _mixins.sass to _mixins.scss 2011-03-22 12:02:54 -07:00
zhitomirskiyi
4517c7c1b1 move service icons to right on publisher. swap out RSS for world icon 2011-03-21 16:23:27 -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
Sarah Mei
0b1fa4d014 You can now add contacts from tags#show. Also, a CSS change to help us start refactoring: there's now a class to the body that you can set with content_for :body_class. This lets you scope CSS to a particular page. Started breaking out smaller CSS files. 2011-03-19 20:53:55 -07:00
MrZYX
1885909e30 quickfix for image embedding image size 2011-03-18 13:38:56 +01:00
maxwell
562c0d40ac profile tags now federate 2011-03-17 16:28:17 -07:00
maxwell
2ed6cc673a fixed css bug 2011-03-17 15:31:06 -07:00
maxwell
b2c0cfb173 remove stray br in stream_element 2011-03-17 15:24:00 -07:00
zhitomirskiyi
43fc2c4d63 fixed the style on the share with list element 2011-03-17 15:19:12 -07:00
maxwell
14ff1e0143 ms dg improved styling, fixed delete 2011-03-17 13:59:53 -07:00
maxwell
b987b47f5f there is a job to process photos and it is called from the controller 2011-03-17 13:59:53 -07:00
maxwell
516b620148 gif and delayed processing wip 2011-03-17 13:59:53 -07:00
zhitomirskiyi
6a33ae7795 fixed the css, added a space 2011-03-16 19:20:24 -07:00
danielgrippi
e9c094fc2f add styling on tag header 2011-03-16 17:53:25 -07:00
danielgrippi
55ac4c8054 show tags under names in people partials 2011-03-16 17:46:09 -07:00
zhitomirskiyi
abbf949fe1 publishing from a person profile page wip 
mentioning a person from their profile page, added js & jasmine, still need to add the mention style, and prevent deselecting the last one

a tiny sass add

publishing from the profile works, need js translation

added the translation

made the hover state consistant

need to fix the cucumber spec

specs are green need to add a button

added the buttion to mention people

moved the publisher to the facebox

fixed the cucumbers for the modal window
 2011-03-16 16:35:30 -07:00
danielgrippi
20b5ca7570 added tag helper text on profile, edit on hover 2011-03-15 22:10:20 -07:00
danielgrippi
4943531013 Add stream class to side_stream 2011-03-15 15:20:02 -07:00
danielgrippi
c608c70ca7 tagging profiles complete 2011-03-15 13:21:36 -07:00
Angjoo
5582c2b5f3 revert max width commit 2011-03-11 15:20:12 -08:00
Angjoo
2ff4af6800 fixed tab to spaces 2011-03-11 14:36:07 -08:00
Angjoo
6e78d6f6c5 ajk ms css fix for header .container width 100% 2011-03-11 14:02:49 -08:00
danielgrippi
29d23d9f43 make audio tags display block in the stream 2011-03-10 21:54:29 -08:00
danielgrippi
1f3261b2ef make photos larger in the stream 2011-03-10 15:17:41 -08:00
danielgrippi
d0569fb881 simplified functionality on aspect edit faceboxes 2011-03-09 12:00:49 -08:00
danielgrippi
1f5edb1d92 Merge branch 'private_messages' 
Conflicts:
	app/controllers/status_messages_controller.rb
	app/models/data_point.rb
	app/models/status_message.rb
	db/schema.rb
	lib/fake.rb
	public/stylesheets/sass/application.sass
	spec/models/mention_spec.rb
 2011-03-08 21:23:41 -08:00
danielgrippi
d38e3a6b29 added translations to all conversation/message views. tweaked css 2011-03-08 15:51:46 -08:00
danielgrippi
78e30ff459 update unread count in conversation visibility when hitting conversationscontroller#show 2011-03-08 11:43:58 -08:00
danielgrippi
fb5e5cc341 cleaned up new message facebox 2011-03-07 20:14:22 -08:00
danielgrippi
fca5310c77 dispatch the conversation in ConversationsController 2011-03-07 17:54:25 -08:00
danielgrippi
97aff09140 added autocomplete on message 'to' field, minor css tweaks to inbox 2011-03-07 11:22:59 -08:00
Raphael Sofaer
8c1cb0d6e8 Comment button needs to be moved into comment box line 2011-03-07 10:27:54 -08:00
danielgrippi
8fafc48d32 more private message wip. 2011-03-04 18:17:49 -08:00
danielgrippi
5f55dfa1bc private message inbox wip 2011-03-03 17:32:26 -08:00
zhitomirskiyi
2522ab7ee4 refactoring the conversation views, wip 2011-03-03 10:39:32 -08:00
zhitomirskiyi
9d7611f8d8 addedthe controllers and the views for the message and the conversation inbox, going to pull in some left nav styling 2011-03-02 12:27:57 -08:00
Michael Nutt
1bfbb4b605 make mention helper text and file upload status line up 2011-02-27 12:45:32 -05:00
Michael Nutt
b6dc32959c place thumbnails inside status message form and add spacing 2011-02-27 02:04:43 -05:00
Dan Hansen
c9af2e87aa service icons and public icon use pointer cursor 2011-02-25 16:48:13 -06:00
Raphael Sofaer
17f41f1291 Make login-error shadow more readable 2011-02-22 18:08:46 -08:00
MrZYX
da244f8438 reintroduced remember me on the login page 2011-02-20 21:49:08 +01:00
MrZYX
ab706f4127 fixed sort by css for languages different from english 2011-02-20 19:00:13 +01:00
MrZYX
5ac91d771a fixed #507 2011-02-20 13:55:54 +01:00
MrZYX
17c3f0a0ee fixed last bug from #544 2011-02-19 14:41:37 +01:00
MrZYX
11f95ee596 fixed broken css for other languages at account settings page 2011-02-19 14:27:45 +01:00
MrZYX
a13a7ad5c1 fixed some css glitches at the #share_with popup 2011-02-19 13:17:21 +01:00
MrZYX
17daf3c7ca fixed the position of the share button 2011-02-19 13:05:24 +01:00
danielvincent
fc9d9a4c55 make the invite friends dialog more obvious 2011-02-17 15:58:37 -05:00
Gonzalo Rodriguez
11e431f640 Add flash message above the login form 2011-02-16 23:37:28 -02:00
danielvincent
a636ceec7f search does not wildcard on both sides of search term; is less dumb. 2011-02-16 12:41:45 -05:00
danielvincent
164fe1c1b5 adjust column width, leading, serifs, etc. in stream for better readability. 2011-02-13 15:27:14 -08:00
Raphael Sofaer
7a6d1d3378 add shadow/transparency to autocompletion. removed a hide()/show() from publisher hide and show functions. 2011-02-10 11:09:14 -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
Raphael Sofaer
7409cd8a27 remove extra sass rule, add db:seed 2011-02-09 16:07:25 -08:00
zhitomirskiyi
eecf1d5d82 fixed cucumber, localization, and css 2011-02-08 17:14:37 -08:00
zhitomirskiyi
4e96d11cd0 Revert "refactored local person person friend finder functionality to use the partial" 
This reverts commit 9f4035ab019803fc53844e70884b0519142deb18.

Conflicts:

	app/views/services/_remote_friend.html.haml
	app/views/users/getting_started/_step_3.html.haml

refactored invitations, added them to the last page

fixed styling on adding an aspect to the aspect list

added a facebook for person edit aspect memberships

touched up and simplified sign-up flow

fix styling on step 3
 2011-02-08 16:40:33 -08:00
danielvincent
42993de739 added back to comments; avatar. 2011-02-06 09:26:24 -08:00
maxwell
ce010c24ec update jquery mobile to a3 2011-02-03 20:41:38 -08:00
danielvincent
8269e4b300 touched up photo show and status message show pages 2011-02-03 13:05:25 -08:00
danielvincent
9922c42f5e corrected searchbox autocomplete width 2011-02-03 12:59:03 -08:00
Dan Hansen
286dcef0f0 only hide pagination in #main_stream divs 2011-02-02 14:14:47 -06:00
Raphael
06a6cf7fac Adjust autocomplete options and css 2011-02-01 15:07:03 -08:00
Raphael
7be232e33e autocomplete wip 2011-02-01 11:56:56 -08:00
Raphael
9080649180 Starting work on an autocomplete feature 2011-02-01 11:56:56 -08:00
Dan Hansen
13608fbdad hide pagination links, deja vu, max? 2011-01-31 23:13:23 -06:00
Dan Hansen
0c94660806 Merge branch 'master' of github.com:diaspora/diaspora 2011-01-30 11:43:31 -06:00
Dan Hansen
313f87ebb9 make the ajax loader appear in a box 2011-01-30 11:43:17 -06:00
maxwell
348ae0b61d small hack to add some feedback when links are tapped on the mobile site. 2011-01-29 18:42:50 -08:00
danielvincent
e3f4ae1cc7 fixed button styling 2011-01-28 17:42:04 -08:00
MrZYX
1c344f97f8 Merge branch 'fix-signin-button' of https://github.com/lfortin/diaspora 2011-01-27 18:25:50 +01:00
zhitomirskiyi
9bd6b11ddf made facebox wider, remove disable with, added default profile photo for those not connected to diaspora 2011-01-26 17:50:49 -08:00
maxwell
43fa30248c show the pagination, because we like, need it. 2011-01-25 17:05:17 -08:00
maxwell
cef10c1228 added public button to the mobile publisher. make status message mobile redirect to back; also, include minifiyed jququery mobile css 2011-01-24 23:18:24 -08:00
maxwell
bc82dac61c make the more button work in the mobile site, also, i finally fixed the timeago stuff in the scroll 2011-01-24 19:09:37 -08:00
zhitomirskiyi
7bec92b7bf mobile sass 2011-01-24 12:36:30 -08:00
zhitomirskiyi
2c230fb80d added menu notifications page aspect name header. 2011-01-24 12:23:52 -08:00
danielvincent
7ac0e9eb49 wip 2011-01-24 12:22:18 -08:00
danielvincent
383876ddf4 mobile stream sass tweaks 2011-01-24 12:22:18 -08:00
danielvincent
1631452669 added in link to search page 2011-01-24 12:22:18 -08:00
danielvincent
b983746888 force all links to not be bold. 2011-01-24 12:22:17 -08:00
danielvincent
39c5189c1f everything ported from pre-mysql mobile stuff. things missing: search page, aspect switcher, notification badge. 2011-01-24 12:22:17 -08:00
Dan Hansen
8293016348 make the footer not so useless 2011-01-23 23:53:17 -06:00
danielvincent
77042f9d47 publisher always shows textarea. outline publisher textarea in blue 2011-01-22 18:49:50 -08:00
zhitomirskiyi
b7f78335e1 mousedown and fixed sass 2011-01-22 13:48:25 -08:00
zhitomirskiyi
ff375b71cb works need a middle stage 2011-01-22 13:48:25 -08:00
lfortin
a07430c088 fixed 'sign in' button width 2011-01-22 15:32:46 -05:00
danielvincent
8af2fc7bcc fix in calculating selected states on aspect filters 2011-01-21 01:16:34 -08:00
danielvincent
abfd9c355c make login seem faster. 2011-01-20 22:55:44 -08:00
danielvincent
db32074439 underline a:hover, remove active state for touch devices 2011-01-19 23:34:12 -08:00
danielvincent
3d89e1f203 login page cleanup. totally simple. changed link color to something less jarring 2011-01-19 23:06:54 -08:00
maxwell
934f56b553 make description text darker and more readable on getting started 2011-01-19 13:31:25 -08:00
Raphael
36781481bb Pulling in changes from master 2011-01-17 11:41:15 -08:00
danielvincent
e2fdad02f1 css fixes, incl. timeago style fix on stream_element 2011-01-14 22:12:31 -08:00
Raphael
738e8c65c8 Merge almost complete, 4 failures 2011-01-14 16:00:10 -08:00
maxwell
a0489112b7 made show page times smaller 2011-01-14 10:21:38 -08:00
maxwell
8c0a8c6af8 increase header zindex so things don't fly over it 2011-01-13 13:31:43 -08:00
Dan Hansen
ce4fe1938c remove references to fancybox, we use facebox 2011-01-13 00:24:10 -06:00
zhitomirskiyi
9b6faa5644 added a notificaions read button 2011-01-12 16:24:14 -08:00
maxwell
f8d524c983 fix infield labels not rebinding on stream filter, and changed padding to margin for the user badge so the bottom boder does not go over the new request message 2011-01-12 13:50:55 -08:00
danielvincent
f2f3059d72 fixed aspects/manage css/js bug. aspect listings on aspects/index show at max 2 lines of ppl 2011-01-08 17:17:37 -08:00
danielvincent
6cc5d6e3ab fixed all rspec/cucumber 2011-01-08 16:53:16 -08:00
danielvincent
6ca0b0014b fade in aspect badges on stream 2011-01-08 15:24:03 -08:00
danielvincent
55fa1646c7 swapped out delete text for 'x' on stream_elements. controls fade in on hover 2011-01-08 15:06:25 -08:00
danielvincent
cadba3f2b7 fixed specs with a reload. added header gradient for firefox 2011-01-08 13:11:55 -08:00
danielvincent
c5e0c616b5 share with pane styles fixed 2011-01-08 13:11:54 -08:00
danielvincent
98ceb1ca6b fixups on people/show. make photos scroll over header on show pages. 2011-01-08 13:11:54 -08:00
danielvincent
c74dc120df fixed all cucumber tests 2011-01-08 13:11:54 -08:00
danielvincent
98bcad5c59 visual fixes on people/show. contact count on aspect filters. contact list searches again. 2011-01-08 13:11:54 -08:00
danielvincent
2e472ded94 new notification/request text on aspects/index 2011-01-08 13:11:54 -08:00
danielvincent
c9307305b3 collapsed aspect_listing and contact_listing on aspects/index 2011-01-08 13:11:53 -08:00
danielvincent
3ff4b67ff0 touched up stream_element and comment partial 2011-01-08 13:11:53 -08:00
danielvincent
422f17a648 switched out fancybox for facebox (THANK GOD). added aspect edit panes to aspects/index. removed some partials. 2011-01-08 13:11:53 -08:00
danielvincent
e1b6f4f074 aspect filters shown selected on photo and statusmessage show pages 2011-01-08 13:11:53 -08:00
danielvincent
8c82a5974a aspect badge links work across all pages, ajax stream on index. aspect info lightbox placeholder 2011-01-08 13:11:53 -08:00
danielvincent
b029475421 aspects now have edit pages accessible through the top nav 2011-01-08 13:11:52 -08:00
danielvincent
44d3c4bacd fixed inf scroll on filters issue. one spec failing in AspectsController. 2011-01-08 13:11:52 -08:00
danielvincent
d0b25814b1 publisher retains text when filtering stream 2011-01-08 13:11:52 -08:00
danielvincent
e6ae5e13e2 publisher works through ajax filters 2011-01-08 13:11:52 -08:00
danielvincent
c64865d32e header touchup 2011-01-08 13:11:51 -08:00
danielvincent
a9195d7730 aspect filters now functional on aspects/index 2011-01-08 13:11:51 -08:00
danielvincent
3363f84161 fixes photo overflow issue on photos/show 2011-01-05 16:00:00 -08:00
Raphael
8d5dc5d27b Merge remote branch 'tomk/ui-cosmetics' 2011-01-04 16:02:11 -08:00
danielvincent
055fbe3e00 stream is now a div. generalized some partial extentions for mobile site. 2011-01-01 23:09:18 -05:00
Thomas R. Koll
367d2756be Fixes #713: Set a pointer cursor for "add photos" input field 2010-12-30 00:17:59 +01:00
danielvincent
3e9cce2a4b bigger avatars in stream. 2010-12-25 19:32:48 -05:00
danielvincent
0fb102a2ec right/left arrow keys functional on photo#show 2010-12-25 19:14:24 -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
zhitomirskiyi
7796776135 vimeo works, does not yet fetch the title 2010-12-23 15:36:29 -08:00
danielvincent
7cb9760a1e show comments toggle like fb 2010-12-21 16:56:32 -08:00
danielvincent
a6c5f420fa giving more pixels to photos on their show pages 2010-12-21 12:39:37 -08:00
maxwell
6d4696faf0 MS DG notifications are now pretty decent 2010-12-20 18:05:31 -08:00
maxwell
152670a72b notification badge now in header 2010-12-20 18:05:31 -08:00
danielvincent
6c12a4c562 photo show page shows more photo. 2010-12-19 21:53:57 -08:00
danielvincent
bb0375d2f8 uploaded photos show in the publisher textarea instead of outside and above. fixed comment textarea on show pages. 2010-12-18 22:40:42 -08:00
danielvincent
d5916c9287 removed comment button from sight 2010-12-18 20:26:27 -08:00
danielvincent
a42a773d3d dim service icons when not public. remove 'make public' label, now checkbox title. 2010-12-18 20:00:13 -08:00
danielvincent
ee9e187e5c fixed build, add photos has a solid border 2010-12-18 19:45:50 -08:00
danielvincent
78a50756c6 publisher collapsed by default on all pages. removed button styling from add photos button. publisher only collapses on ajax success. comment buttons use show() instead of fadeIn(). 2010-12-18 18:28:00 -08:00
maxwell
2e85a9fe66 notifications now can be read 2010-12-17 17:06:49 -08:00
maxwell
c749d81fe9 putting a link to notifications, make them unread in the controller when you view the index 2010-12-17 17:06:48 -08:00
danielvincent
f821f49db1 added similar contacts to contact pages 2010-12-16 11:49:08 -08:00
Raphael
3b727dc887 Add share_with fancybox on search page, fix a couple of queries 2010-12-15 17:45:12 -08:00
Raphael
80a9b97f8d add_person_to_aspect is now add_contact_to_aspect, some methods now take models rather than ids 2010-12-15 14:48:14 -08:00
Raphael
d44df7e977 put remove contact link under aspect membership 2010-12-13 16:40:05 -08:00
Raphael
baa04ceac7 Add aspect list to contact page 2010-12-13 15:58:08 -08:00
Dan Hansen
390587777f more vendor prefix fixes 2010-12-13 01:21:54 -05:00
Dan Hansen
7c7254bf64 Vendor prefix police 2010-12-13 01:08:03 -05:00
Dan Hansen
6353f5f035 in firefox if you clicked the A with your handle and didnt hover over it it'd turn black because of screen.css:39 2010-12-12 01:49:13 -05:00
Dan Hansen
8b1c8d6a1b moz vendor prefix typo fix for .circle 2010-12-12 01:33:38 -05:00
Dan Hansen
c843b508c9 add vendor prefixes for the border radius on #new_request_pane 2010-12-12 01:29:05 -05:00
Dan Hansen
be9a7edf4d vendor prefixes for border radius on #new_request_pane 2010-12-12 01:17:20 -05:00
danielvincent
52a3996ad0 textareas auto expand 2010-12-11 22:18:03 -08:00
Dan Hansen
3b5ee72ed8 added that in the wrong place 2010-12-12 00:09:15 -05:00
Dan Hansen
20e2c2ed25 Merge branch 'master' of github.com:diaspora/diaspora 2010-12-12 00:06:10 -05:00
Dan Hansen
aa40af24c9 fix http://bit.ly/fQLxaK ugliness 2010-12-12 00:05:55 -05:00