2214 commits

Author	SHA1	Message	Date
Maxwell Salzberg	c66b7d584d	Merge branch '1305-full-markdown' of https://github.com/brianwisti/diaspora into brianwisti-1305-full-markdown ... Conflicts: Gemfile.lock	2011-08-27 14:13:15 -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
Maxwell Salzberg	8dfb278509	Merge pull request #1795 from lksnyder0/admin_nav ... Admin nav	2011-08-25 16:35:09 -07:00
Maxwell Salzberg	b70f684efc	fix css for hovercards in notifications, and people with long names	2011-08-25 12:16:03 -07: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
Gonzalo Rodriguez	43d6acd868	Support green login page flash message for password change success	2011-08-23 00:51:00 -03: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
Luke Snyder	f9fc55823b	finished styling	2011-08-21 13:07:04 -04: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
Maxwell Salzberg	947dfaacf7	make profile photo auto so it does not get smooshed	2011-08-18 14:09:50 -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
danielgrippi	fca2be5c5d	facebox overlay dark again, with a faint spotlight	2011-08-17 22:43:58 -07:00
Brian Wisti	03127cd592	basic support for Redcarpet Markdown	2011-08-16 21:48:48 -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
Luke Snyder	b62801bd64	Initial styling and links	2011-08-14 22:10:56 -04: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
danielgrippi	a8d37fb3fc	Move Facebook inviter view into the contacts layout, rather than a facebox	2011-08-12 17:05:01 -07:00
danielgrippi	190332308b	started on the real stats page	2011-08-11 17:15:33 -07:00
Andrej Kacian	8296b8ca1a	Tag unfollow and aspect edit icons are now made more opaque on mouseover	2011-08-12 00:51:29 +02:00
Maxwell Salzberg	0981f04c77	smooth scroll like a smooth criminal	2011-08-11 15:19:16 -07:00
Maxwell Salzberg	c67b2a5e93	be back later page. this is not auto added, as you need your server to point to it	2011-08-11 14:10:34 -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
danielgrippi	db645e8da8	merged publics/show and posts/show	2011-08-10 18:07:38 -07:00
Raphael Sofaer	091cdd6f94	Basic contacts index page on the mobile site	2011-08-10 16:23: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
Maxwell Salzberg	6406c59bc7	move back to top to bottom	2011-08-09 18:36:49 -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	e9d993b8f6	throw 404s when the person is no found	2011-08-09 13:03:45 -07:00
Raphael Sofaer	23ea0ed462	Keep robots out of the user pages	2011-08-09 11:50:26 -07: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
Sarah Mei	ccf843b486	Merge pull request #1745 from ticho/unread-message-count-css-fix ... Correctly space unread and total message counts in conversations list	2011-08-07 20:40:53 -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	6b64d7f55a	Correctly space unread and total message counts in conversations list	2011-08-07 04:06:26 +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	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	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	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
behrooz shabani (everplays)	ae72a9382d	make comments to accept rtl direction by making spans blocked	2011-07-31 19:50:03 +04:30
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
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
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
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
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
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
Ilya Zhitomirskiy	a03423309d	fixed the getting started step 3, ignore the CA certs in developement is now in initializer, changed the 'login' -> 'connect' [to facebook] png	2011-06-09 15:12:35 -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
Maxwell Salzberg	de55a1cbb3	remove remember aspects feature	2011-06-03 17:35:27 -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
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
Maxwell Salzberg	5cbbdf2949	initial post to tumblr support	2011-06-01 22:30:22 -07: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	b1bbfbac32	Merge branch 'master' of github.com:diaspora/diaspora	2011-05-31 15:52:59 -05:00
Dan Hansen	0edc160007	Clean up stream.js, make the comments step selector more sane	2011-05-31 15:52:17 -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	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	20cc3f0c7d	change the smiley for a heart.... the smiley looked sad at that size..	2011-05-23 23:53:18 -07: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
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
MrZYX	331aa1ff60	you know the facepalm smiley? Here it is: m(	2011-05-19 20:10:35 +02:00
Shane Becker	910cc52387	rename config/app_config.yml to config/app.yml in accordance to The Redundant Rendundacy Act of 2011	2011-05-18 11:46:45 -07: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	0405b72477	removed some unused defs	2011-05-17 15:00:49 -07:00
MrZYX	79a684d072	copy crossdomain.xml to public	2011-05-17 22:59:40 +02: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
MrZYX	f916f3a3e0	remove the width from the share button, thanks artem	2011-05-15 00:49:35 +02:00
danielgrippi	01be909e38	well, that was dumb. (fix cucumber)	2011-05-14 00:58:39 -07:00
danielgrippi	b89dd900cc	misc visual cleanup on mobile	2011-05-13 23:33:16 -07:00
danielgrippi	666fb76bfc	login as its own js file. accounted for the autofil state	2011-05-13 22:27:08 -07:00
danielgrippi	0e72a91d1b	update login page	2011-05-13 22:05:35 -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
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
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
danielgrippi	d34774f4e5	png favicon	2011-05-09 16:24:24 -07:00
danielgrippi	29c3f7f1d4	make cursor a question mark on welcome page info text	2011-05-09 15:55:24 -07:00
danielgrippi	645d685c58	Merge branch 'welcome-page'	2011-05-09 15:45:05 -07:00
danielgrippi	cfa9e6cf29	some polish on the welcome page	2011-05-09 15:39:44 -07:00
danielgrippi	68601e392e	halfway to a better welcome/getting started page. wip.	2011-05-08 22:15:26 -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
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
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
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
Raphael Sofaer	abde3244b5	InfiniteScroll#options doesn't need to be a function	2011-05-03 14:54:49 -07:00
danielgrippi	77372b2f08	update robots.txt to only exclude /people/	2011-05-03 10:32:50 -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
Raphael Sofaer	5dcfff104a	Merge remote branch 'ritchewilson/prev_next' ... Conflicts: public/stylesheets/sass/mobile.sass	2011-04-19 17:05:12 -07: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
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	9df8f83276	fixed specs for me and serveral others (thanks @jrichardlai); fixed cucumber	2011-04-17 21:28:09 +02: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
Dan Hansen	7216c8d5cb	DRY up timeago.js, add license to i18n.js & timeago.js	2011-04-15 23:37:17 -05:00
Dan Hansen	7ed21930b4	make infscroll, publisher, stream use pub/sub to listen for the stream being reloaded, random cleanups and fix aspect-filters.js spec	2011-04-15 18:49:31 -05:00
Dan Hansen	296824c92b	add basic pub/sub functionality to WidgetCollection	2011-04-15 18:29:48 -05:00
Dan Hansen	c0cd8fafff	make a widget's start method optional	2011-04-15 18:14:38 -05:00
Dan Hansen	0b85600e0a	diaspora.js cleanup; don't pollute global namespace in spec	2011-04-15 17:31:19 -05:00
danielgrippi	a16e83df9e	touched up notifications page	2011-04-15 10:42:21 -07:00
MrZYX	b25e634be1	fixed #1011	2011-04-15 16:18:59 +02:00
Raphael Sofaer	4870ffb944	Fix db seed, refactor aspect-filters a bunch, fix stream_element a little	2011-04-13 18:13:26 -07:00
Raphael Sofaer	9969dbd109	Start refactoring aspect-filters.js	2011-04-13 15:55:10 -07:00
Raphael Sofaer	f13304073b	The specs are green on my dev machine, let's see if CI is still red	2011-04-13 15:19:17 -07:00
Raphael Sofaer	efe79eb351	Fix stream on pages other than 1, rename raw_visible_posts to visible_posts	2011-04-13 14:35:20 -07:00
Raphael Sofaer	5afe5f667e	Move js out of notifications index, fix reference to notifications badge	2011-04-12 17:15:02 -07:00
Raphael Sofaer	d5ecce7ca6	Merge branch 'limit_similar_contacts' ... Conflicts: app/controllers/people_controller.rb	2011-04-12 11:48:41 -07:00
Dan Hansen	425fee0653	fix #839	2011-04-12 12:00:33 -05:00
danielgrippi	106ae983d5	Merge branch 'master' into follow. all specs green. ... Conflicts: app/controllers/application_controller.rb app/controllers/people_controller.rb app/models/person.rb config/assets.yml db/schema.rb public/javascripts/aspect-edit.js spec/controllers/aspects_controller_spec.rb spec/models/user/querying_spec.rb spec/spec_helper.rb	2011-04-11 17:48:37 -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
MrZYX	2413b3c4bd	Merge branch 'css-rtl' of https://github.com/everplays/diaspora into css-rtl	2011-04-11 18:01:09 +02:00
MrZYX	cf61bb756d	added dir attribute to html element; made tipsy gravity dependant on that	2011-04-11 18:00:28 +02:00
behrooz shabani (everplays)	cddeafee74	rtl UI for aspects implemented	2011-04-11 00:21:14 +04:30
danielgrippi	1c9ca738ae	green everywhere.	2011-04-08 17:10:43 -07:00
Raphael Sofaer	fa59be2353	Another bit of JS cleanup	2011-04-08 16:11:13 -07:00
Raphael Sofaer	0b9575af5d	JS cleanup	2011-04-08 16:11:13 -07:00
MrZYX	f194166841	moar garbage for you aka fixed #1005	2011-04-08 17:46:45 +02:00
MrZYX	75629018db	you want the id in aspect_memberships#destroy to be garbage? There you go… (btw. fixed #1006)	2011-04-08 17:40:59 +02:00
Raphael Sofaer	c7dc6ce817	Fix jasmine specs	2011-04-07 18:30:29 -07:00
Raphael Sofaer	d23ac3468b	rename widgetCollection#ready to widgetCollection#initialized	2011-04-07 18:23:24 -07:00
Raphael Sofaer	ea932c8706	Fix infieldLabels in infiniteScrolled comment forms. We were initing every widget twice?	2011-04-07 18:21:28 -07:00
Raphael Sofaer	75d514c448	Fix infieldLabels on new aspect box	2011-04-07 17:53:07 -07:00
Raphael Sofaer	d8ac8d1329	Fix infinite scroll javascript in jammed js	2011-04-07 15:22:03 -07:00
Raphael Sofaer	157b117469	Just style links directly	2011-04-07 15:13:37 -07:00
Raphael Sofaer	d12ec38736	Fix mobile infinite scroll	2011-04-07 15:00:57 -07:00
Raphael Sofaer	bbf1bf00cb	Render less stuff, set fewer things, make AspectsController#index more horrifying. Maybe Vanna could help with this? Mustache definitely would.	2011-04-06 12:11:49 -07:00
MrZYX	95de299e6e	fixed #953	2011-04-06 14:18:33 +02:00
MrZYX	21b5f7932f	fixed #997 by turning cancel link into a reset button	2011-04-06 13:31:56 +02:00
Raphael Sofaer	9454c3a1b9	Working on fixing infinite scroll, in particular for aspects with the number 2 in their id.	2011-04-05 19:28:40 -07:00
Raphael Sofaer	59334dfaf5	Remove extra js, fix mobile view	2011-04-05 16:18:04 -07:00
Raphael Sofaer	746a0c38b3	Take another shot at fixing pagination	2011-04-05 13:59:15 -07:00
danielgrippi	590e1fd93f	All green except invite connecting +2 misc.	2011-04-04 15:16:19 -07:00
MrZYX	100d705c2f	fixed #992	2011-04-03 14:57:30 +02:00
MrZYX	92bf8444a7	added spec; rtl? -> direction_for	2011-04-03 04:20:08 +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
maxwell	f3a62bf76b	update jquery to latest	2011-04-02 15:03:41 -07:00
MrZYX	2ba1198b90	fixed embedder (again)	2011-04-02 17:19:56 +02:00
danielgrippi	bdff036cda	remove spacing from stream elements	2011-04-01 11:26:04 -07:00
danielgrippi	8b8ea03582	high res logo on mobile site	2011-04-01 11:12:41 -07:00
maxwell	4bd0cbfdc8	publisher now can handle services, and is on seperate page	2011-04-01 01:18:01 -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	f99b724e0b	ms iz, can now undo hiding a post, fixed a bunch of jamine specs	2011-03-31 17:23:54 -07:00
danielgrippi	ed202b61d3	scroll to top before content loads for smoother feedback	2011-03-31 01:56:06 -07:00
danielgrippi	b22b13d73f	Revert "popstate now in aspect-filters. back button now actually works on aspect/index." ... This reverts commit 326155af54.	2011-03-31 01:30:02 -07:00
danielgrippi	d1c3326867	Revert "fix wacky aspect filtering bug (tabs being selected seemingly at random" ... This reverts commit 14f14d005b.	2011-03-31 01:29:48 -07:00
zhitomirskiyi	bb4c2ee85d	added a character count to the publisher	2011-03-30 19:11:24 -07:00
danielgrippi	14f14d005b	fix wacky aspect filtering bug (tabs being selected seemingly at random	2011-03-30 18:26:56 -07:00
danielgrippi	326155af54	popstate now in aspect-filters. back button now actually works on aspect/index.	2011-03-30 17:39:08 -07:00
zhitomirskiyi	5a9ec82597	can now hide posts	2011-03-30 16:43:28 -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
Raphael Sofaer	4b795cc719	Stop bad call to users/update	2011-03-30 13:16:26 -07:00
zhitomirskiyi	cd7cced9c0	renamed the js to indicate custom	2011-03-29 17:25:35 -07:00
zhitomirskiyi	0aaaefeba2	fix tag plugin	2011-03-29 16:53:48 -07:00
zhitomirskiyi	ba15ea940b	autosuggest on tags now works, bumped up the version of the autocomplete plugin	2011-03-29 15:03:09 -07:00
MrZYX	68b2e47b87	go away robots, we don't want you\!	2011-03-29 20:34:20 +02: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
MrZYX	315fdabd76	let the user upload an image without touching the textarea, improved check in Photo#process to not yield no method on nil error in some cases	2011-03-27 21:08:30 +02:00
MrZYX	55417cf9e3	AspectsController#move_contact -> AspectMembershipsController#update	2011-03-27 13:29:36 +02:00
MrZYX	b689d4695b	refactor of routes.rb done so far; further refactor needs design decisions	2011-03-27 00:05:35 +01:00
Raphael Sofaer	aed190dc6d	cucumber for comment retractions, modified views	2011-03-25 16:26:03 -07:00
maxwell	310f529914	dumb api console	2011-03-25 15:06:22 -07:00
MrZYX	56a6f0e43b	cleaned up craziness in users and likes routing, fixed #961	2011-03-24 03:02:14 +01:00
danielgrippi	33c013633f	fix cucumber, comments	2011-03-23 18:22:43 -07:00
danielgrippi	2a1914a8f2	fixed comment socket bug on posts where there are no new comment areas	2011-03-23 17:55:18 -07:00
danielgrippi	b6d5165f2d	scroll to post on page if you can see it (via notification popup)	2011-03-23 17:16:30 -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	e4e8d7ada4	fixed aspect selector bug in header	2011-03-23 11:59:09 -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
maxwell	5570182e69	use autoresize extraSpace to kill the bug where the comment box is not big engough for the comment, still could use some love	2011-03-22 11:59:10 -07:00
maxwell	35bc86f6a6	dont auto embedd images, untill we think of something better to do	2011-03-22 10:55:41 -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
zhitomirskiyi	aa5bef0c3f	calls the job on login does a sync call if the cache friends was not called before, fixed the views	2011-03-21 14:56:50 -07:00
maxwell	970e9bee04	Revert "make image width max out at 100%" ... This reverts commit 32efbeb903.	2011-03-21 11:40:52 -07:00
Maxwell Salzberg	32efbeb903	make image width max out at 100%	2011-03-21 10:10:03 -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	25aadebf46	fixed #946 with a solution that doesn't break the links	2011-03-19 21:50:40 +01:00
MrZYX	6fe4b5bc56	fixed 946	2011-03-19 14:21:06 +01:00
William Theaker	1b4827bc7b	16px wrench icon	2011-03-19 02:16:24 -04:00
MrZYX	1885909e30	quickfix for image embedding image size	2011-03-18 13:38:56 +01:00
maxwell	2bd15bf3e6	embed images, and make sure they are activated on a new message is posted	2011-03-17 22:03:47 -07:00
maxwell	275098a309	embed images, and make sure they are activated on a new message is posted	2011-03-17 21:48:11 -07: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
zhitomirskiyi	6cc085d64e	addded slideToggle	2011-03-17 14:32:07 -07:00
zhitomirskiyi	2b6165d8ea	wip	2011-03-17 14:32:07 -07:00
maxwell	14ff1e0143	ms dg improved styling, fixed delete	2011-03-17 13:59:53 -07:00
maxwell	bca184eaf3	photos are now successfully delayed	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
MrZYX	73f852c6c2	fixed video embedding in comments	2011-03-15 17:48:28 +01:00
MrZYX	21d0fcf47a	fixed some 500 on mobile site	2011-03-15 17:02:04 +01:00
maxwell	a419ddac11	make sure audio player does not delete sm text	2011-03-14 18:20:03 -07:00
Raphael Sofaer	4b4654a408	Changing message to text, partway done, deleted data conversion	2011-03-14 11:39:31 -07:00
maxwell	d91fda656c	Revert "js hack to see bigger version of photo thumbnails in the stream without being abnoxious" ... This reverts commit ab997e2d21.	2011-03-14 09:51:06 -07:00
MrZYX	e8bb4c2d66	added preload='none' to the audio tag (#928)	2011-03-14 13:07:27 +01:00
William Theaker	67affa2f5f	wrench	2011-03-12 02:57:15 -05:00
maxwell	ab997e2d21	js hack to see bigger version of photo thumbnails in the stream without being abnoxious	2011-03-11 17:16:43 -08: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
Raphael Sofaer	fbfd46a506	change peoplecontroller order, fix grammar in public default	2011-03-11 10:12:37 -08:00
MrZYX	c502e4591a	do not confuse the terminology again, link #diaspora, not #diaspora-dev channel, link user mailing list	2011-03-11 15:46:12 +01:00
Maxwell Salzberg	14033e7b5f	ajk ms or is a single pipe	2011-03-11 00:16:17 -08:00
Maxwell Salzberg	e2903a1251	get rid of the period, it might be screwing stuff up	2011-03-11 00:12:48 -08:00
Maxwell Salzberg	189b7fb5ac	ajk ms only grab stream links	2011-03-11 00:01:01 -08:00
Maxwell Salzberg	2b38fe820f	ajk ms escape period in ogg... also replace the parent so it is not inside an a tag	2011-03-10 23:52:22 -08:00
Maxwell Salzberg	cdab6a1a84	ajk ms add ogg to the audio tag linker	2011-03-10 23:33:20 -08:00
danielgrippi	29d23d9f43	make audio tags display block in the stream	2011-03-10 21:54:29 -08:00
maxwell	5748639c08	sm ms audio tag	2011-03-10 21:33:42 -08:00
Michael Nutt	c7362707b3	fix js error; stream ajax success handler should expect json	2011-03-11 00:31:43 -05:00
Michael Nutt	ead1f80b08	websocket js handler should know about different notification types	2011-03-11 00:31:43 -05:00
Dan Hansen	d448436376	this refers to the dom element, not Embedder	2011-03-10 23:11:06 -06:00
Dan Hansen	b50217c98c	clean up default.html	2011-03-10 23:06:34 -06:00
maxwell	ffa6b9879f	added default development page so it doesnt look so terrible	2011-03-10 20:31:39 -08:00
Dan Hansen	d7c7775b6c	fallback gracefully, break build if videos can't embed	2011-03-10 18:26:55 -06:00
danielgrippi	1f3261b2ef	make photos larger in the stream	2011-03-10 15:17:41 -08:00
Raphael Sofaer	0416fa14b2	Just use /users/me to update open aspects	2011-03-10 13:03:45 -08:00
Raphael Sofaer	f2cc51dd0d	Take current user id out of avatar	2011-03-09 17:50:46 -08:00
danielgrippi	ee6932a3f7	added title to padlock on aspect edit pane	2011-03-09 12:15:23 -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	6e7bdf7cad	don't change photos while commenting	2011-03-07 10:32:31 -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	ac2c50b33f	denote that fileuploader has been modified	2011-02-28 20:37:41 -05:00
Michael Nutt	1bfbb4b605	make mention helper text and file upload status line up	2011-02-27 12:45:32 -05:00
Michael Nutt	208a47162c	add onAllComplete event to fileupload.js; hide mention helper during upload	2011-02-27 12:44:56 -05:00
Michael Nutt	b6dc32959c	place thumbnails inside status message form and add spacing	2011-02-27 02:04:43 -05:00
Michael Nutt	43e10307a6	fix broken jquery autoresize plugin	2011-02-27 02:03:55 -05:00
Dan Hansen	c9af2e87aa	service icons and public icon use pointer cursor	2011-02-25 16:48:13 -06:00
zhitomirskiyi	ec93faa2c4	added the post to services icon on every page added a manage icon and moved the RSS link to the public explain	2011-02-24 17:31:54 -08:00
zhitomirskiyi	adfcc59631	can now select individual services to be added	2011-02-24 17:31:54 -08:00
maxwell	e446dcaeb5	make sm_controller show the error in the js	2011-02-22 22:21:48 -08:00
Raphael Sofaer	17f41f1291	Make login-error shadow more readable	2011-02-22 18:08:46 -08:00
Dan Hansen	801382714a	remove jquery 1.4.2, we never use it	2011-02-22 13:59:10 -06:00
MrZYX	166f75d883	I think I fixed #882	2011-02-20 22:10:27 +01: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
zhitomirskiyi	1e6bf9c80e	MS IZ the cucumber now passes	2011-02-17 18:05:21 -08:00
maxwell	7ace73b84b	iz ms wip fixing contactController destroy	2011-02-17 18:05:21 -08:00
maxwell	8c2e6dd8cb	aspect membership refactor complete	2011-02-17 18:05:21 -08:00
maxwell	c6eb5d0340	IZ MS; refactored aspect_membership_controller, moved and updated views accordingly	2011-02-17 18:05:21 -08: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
MrZYX	ba439b9413	Merge branch '559-posting-empty-messages' of https://github.com/grzuy/diaspora into sharebutton	2011-02-15 13:08:59 +01:00
Gonzalo Rodriguez	2b3926c629	Disable share button when whitespaces on status message input.	2011-02-15 09:50:39 -02:00
Dan Hansen	42fd9a19da	now sarahmei can watch revolution OS too! will write tests soon	2011-02-14 23:59:03 -06:00
danielvincent	164fe1c1b5	adjust column width, leading, serifs, etc. in stream for better readability.	2011-02-13 15:27:14 -08:00
zhitomirskiyi	9f239789b9	can remote the person from the last aspect from edit contact pane	2011-02-11 12:58:01 -08:00
Raphael Sofaer	c1844c9be2	Merge remote branch 'lfortin/js-formatting' ... Conflicts: public/javascripts/web-socket-receiver.js	2011-02-11 11:31:30 -08:00
Raphael Sofaer	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
zhitomirskiyi	1da965616b	added an option to remove a contact from the last aspect, after a prompt	2011-02-09 17:47:27 -08:00
Raphael Sofaer	bd38d1436e	Today we learned about the order of operations	2011-02-09 16:07:25 -08:00
Raphael Sofaer	7409cd8a27	remove extra sass rule, add db:seed	2011-02-09 16:07:25 -08:00
Raphael Sofaer	c11ffe93c0	Actually close the publisher on and with Publisher.close()	2011-02-09 16:07:25 -08:00
Raphael Sofaer	99f84de368	Javascript for mentions is functional	2011-02-09 16:07:24 -08:00
Raphael Sofaer	70c61270dc	Fix up and down arrows	2011-02-09 16:07:24 -08:00
Raphael Sofaer	0ec2d918bb	adding keycodes file, moving keyup stuff to keydown	2011-02-09 16:07:24 -08:00
danielvincent	2b25823253	autocomplete wip. separated keyup and keydown. wip.	2011-02-09 16:07:24 -08:00
danielvincent	6eafd73d2c	publisher does inline mentions and sets the cursor to the end of the newly inserted result	2011-02-09 16:07:24 -08:00
danielvincent	3efc31c68f	mention js working minus tracking keypresses with the hidden message field.	2011-02-09 16:07:24 -08:00
danielvincent	7d21f7bfdd	publisher autocomplete correctly adds name into status_message_fake textarea	2011-02-09 16:07:24 -08:00
danielvincent	77403596aa	mentions in publisher autocomplete within context	2011-02-09 16:07:24 -08:00
Raphael Jedidiah Sofaer	150f676332	Do a bunch of work on publisher autocompletion JS	2011-02-09 16:07:23 -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
zhitomirskiyi	df4ebb286d	accept invitation feature passing ... wip, added a form to add aspect to the contact list added files typo render the partial remote friend specifying the provider for the route refactored local person person friend finder functionality to use the partial typo trying to use the stream	2011-02-08 16:40:28 -08:00
zhitomirskiyi	7241177421	translating the warning about removing the person from the last aspect	2011-02-08 15:44:12 -08:00
danielvincent	bf20e5a9e8	remove some js assets from mobile	2011-02-06 23:09:04 -08:00
danielvincent	42993de739	added back to comments; avatar.	2011-02-06 09:26:24 -08:00
zhitomirskiyi	59f0dca7c7	Revert "publisher is now a hot widget" ... This reverts commit 8039ab312a.	2011-02-05 15:24:20 -08:00
Dan Hansen	8039ab312a	publisher is now a hot widget	2011-02-05 16:47:43 -06:00
Dan Hansen	d533f46cd7	update widget regardless of scroll count	2011-02-04 15:21:42 -06:00
maxwell	ce010c24ec	update jquery mobile to a3	2011-02-03 20:41:38 -08:00
maxwell	35bc4e3aad	attempt to rebind infield labels on comment form	2011-02-03 18:43:56 -08:00
Dan Hansen	22c1743886	only use more button have inf scroll happens 3 times	2011-02-03 20:38:49 -06: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
Raphael	cd8d9989cf	Refactor publisher JS, use hidden field for submitting	2011-02-02 14:27:14 -08:00
Dan Hansen	286dcef0f0	only hide pagination in #main_stream divs	2011-02-02 14:14:47 -06:00
Raphael	3fb6b0e072	Fix saved state cucumber feature	2011-02-02 11:52:56 -08:00
maxwell	d040380e57	fix data conversion spec, ILYA	2011-02-01 22:27:07 -08:00
maxwell	d4f99ca080	move search init to search.js, because mobile does not have search to init	2011-02-01 22:13:52 -08:00
zhitomirskiyi	21e3c2ae73	Merge branch 'open-aspects' ... Conflicts: app/controllers/aspects_controller.rb app/controllers/home_controller.rb app/helpers/application_helper.rb db/migrate/20110201013408_add_open_aspects_to_user.rb spec/controllers/aspects_controller_spec.rb spec/controllers/home_controller_spec.rb	2011-02-01 17:32:08 -08:00
zhitomirskiyi	7f026e8271	now updating the open aspects in js	2011-02-01 16:58:33 -08:00
Raphael	06a6cf7fac	Adjust autocomplete options and css	2011-02-01 15:07:03 -08:00
Raphael	bbe47fbb55	Correct limit on search autocomplete	2011-02-01 14:35:14 -08:00
MrZYX	15329af94d	made "Search for" translatable	2011-02-01 21:55:28 +01:00
Raphael	7d18e2bcd8	Finish autocomplete	2011-02-01 11:56:56 -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
MrZYX	d8f5607509	updated locales	2011-02-01 16:56:29 +01:00
Dan Hansen	cdb5cf37e7	show publisher if it was closed when you select another aspect	2011-02-01 00:40:11 -06:00
Dan Hansen	13608fbdad	hide pagination links, deja vu, max?	2011-01-31 23:13:23 -06:00
Dan Hansen	2e03c7f9f6	forgot to remove these files from my previous commit	2011-01-31 15:23:04 -06:00
Dan Hansen	3746d296b0	fix dom traversing for embedder	2011-01-31 15:15:30 -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	6dffdd8152	don't remove these methods	2011-01-29 18:58:34 -08: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
Dan Hansen	7417dc5923	remove debugging statement, fix youtube phrasing	2011-01-29 16:41:28 -06:00
Dan Hansen	099e0a6e24	i18n is the first widget to be loaded, add video locales, embedder uses i18n, only render mustache template with i18n if the views are passed	2011-01-29 16:40:10 -06:00
Dan Hansen	4b1b7591a6	load diaspora.js and widgets right after vendor/*, return empty string if the value is not found	2011-01-29 16:07:12 -06:00
Dan Hansen	5040a37a31	whoops, missed a semicolon	2011-01-29 15:59:39 -06:00
Dan Hansen	4484bf33fa	fix javascript i18n specs	2011-01-29 13:31:45 -08:00
Dan Hansen	b89a59ca55	update timeago usages	2011-01-29 13:30:32 -08:00
Dan Hansen	ee218ecd44	get rid of the hacky callbacks	2011-01-29 13:28:43 -08:00
Dan Hansen	3078156dbb	javascript i18n wip	2011-01-29 13:28:43 -08:00
Dan Hansen	7089782ba1	things having to do with publisher belong in publisher.js not stream.js	2011-01-29 14:42:59 -06:00
Dan Hansen	d03119f7e9	Embedder is now a widget, show videos before comments	2011-01-29 13:22:34 -06: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
Raphael	91bfdf0e75	Roll back infinite scroll plugin	2011-01-26 10:33:08 -08:00
maxwell	4e60d2b92e	update inf. scroll; fix pagniation showing/not showing in all the wrong places	2011-01-25 17:38:29 -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
maxwell	8b3beba93f	adding login page to mobile, and adding timeago WIP	2011-01-24 17:36:47 -08:00
zhitomirskiyi	4217aa75e0	swapped back icon in mobile header for list icon	2011-01-24 12:45:30 -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	161759b99a	fix 789	2011-01-24 02:40:24 -06:00
Dan Hansen	8293016348	make the footer not so useless	2011-01-23 23:53:17 -06:00
Dan Hansen	ace9e8c3d8	whoops, add license to embedder.js and it's spec	2011-01-22 23:43:48 -06:00
Dan Hansen	bdf559bb2b	remove video embedding from stream.js, use embedder.js	2011-01-22 23:40:08 -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
Dan Hansen	45444316cb	Merge branch 'master' of github.com:diaspora/diaspora	2011-01-22 12:40:36 -06:00
Dan Hansen	b209fd0c2c	our spec would complain about the data of the ajax request not being there, move it into the callback instead	2011-01-22 12:40:20 -06:00
MrZYX	cadcc3e7c3	some browers (Firefox for example) have no pushState, so disable it for those for now	2011-01-22 16:43:34 +01:00
Dan Hansen	8619a2035c	green for the night	2011-01-22 01:16:52 -06:00
Dan Hansen	a3bc8932d4	fixes for the alert widget, widgets.init didn't execute correctly because of the context	2011-01-21 20:09:34 -06:00
Dan Hansen	c23811e1ab	flash the user whether or not that person was moved to a different aspect	2011-01-21 20:02:42 -06:00
zhitomirskiyi	01a4327c2b	use google API instead of highcharts due to licensing	2011-01-21 13:00:08 -08:00
zhitomirskiyi	41993fe5da	use highcharts.js for stats	2011-01-21 12:19:05 -08:00
danielvincent	c5bf7b523f	use history.pushstate to preserve filters on page refresh	2011-01-21 11:11:00 -08:00
danielvincent	8af2fc7bcc	fix in calculating selected states on aspect filters	2011-01-21 01:16:34 -08:00
danielvincent	22d4083c8c	use history.pushstate to preserve filters on page refresh	2011-01-21 01:10:29 -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
zhitomirskiyi	a00fbb1717	Merge branch 'master' of github.com:diaspora/diaspora	2011-01-14 16:11:37 -08:00
Raphael	738e8c65c8	Merge almost complete, 4 failures	2011-01-14 16:00:10 -08:00
maxwell	bc8821fdc5	Revert "some fixes for the alert widget" ... This reverts commit 4e40c19342.	2011-01-14 14:28:03 -08:00
Dan Hansen	4e40c19342	some fixes for the alert widget	2011-01-14 15:13:09 -06:00
Dan Hansen	8103e66ea3	didn't mean to commit some changes in aspect-edit.js	2011-01-14 14:57:26 -06:00
Dan Hansen	d4f30ded1b	Diaspora.js 2.0, added an official widget, don't use native alerts anymore	2011-01-14 14:54:44 -06:00
zhitomirskiyi	aba03ed5b0	added the locales for timeago	2011-01-14 11:46:38 -08:00
Dan Hansen	4ccf51b3d3	fix real time aspect name changing	2011-01-14 13:29:55 -06:00
maxwell	a0489112b7	made show page times smaller	2011-01-14 10:21:38 -08:00
maxwell	f509367a40	fix the 404 page to show the dun goofed guy	2011-01-13 17:31:18 -08:00
maxwell	f97a9fa017	added timeago jquery plugin. we now need to figure out a js translation scheme	2011-01-13 16:29:13 -08:00
maxwell	b4fae58f12	just say no to 404 facebox errors	2011-01-13 14:48:30 -08:00
maxwell	8c0a8c6af8	increase header zindex so things don't fly over it	2011-01-13 13:31:43 -08:00
maxwell	c002692657	Merge branch 'master' of github.com:diaspora/diaspora	2011-01-13 09:45:56 -08:00
Dan Hansen	f807bc25d1	whitelist certain keyCodes, e.g. tab, fixes #795	2011-01-13 01:24:05 -06:00
Dan Hansen	ce4fe1938c	remove references to fancybox, we use facebox	2011-01-13 00:24:10 -06:00
Dan Hansen	61512ef7b0	youtube videos shove above comments and under the status -- i'm back\!	2011-01-12 23:05:20 -06:00
zhitomirskiyi	9b6faa5644	added a notificaions read button	2011-01-12 16:24:14 -08:00
maxwell	c29ebdabba	pending photos now stick to the publisher when adding or removing aspects... the home page however is a full reload, and some weird things happen when you switch from home	2011-01-12 15:47: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
Alec Leamas	1e3d70f98b	Add public/well-known dir for the moment.	2011-01-10 20:47:20 +01: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	9cf1f5a023	fixed reshare with filters	2011-01-08 13:11:55 -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	71ca93720b	contact lists functional on aspects/index. edit panes facebox in from header	2011-01-08 13:11:53 -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	f44b3cbe3d	contacts now ajax in on aspect filtering on aspect/index. fixed missing partial error on aspect_badge.	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	14ca5e1cc1	stricter url fix in aspect-filters	2011-01-08 13:11:53 -08:00
danielvincent	0a07dd16b5	posts are properly socketed on filtered streams	2011-01-08 13:11:52 -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	f02c13ee73	filters are now working in ajax. inf. scroll and publisher pending ajax.	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	6342dff96d	fixed enter js bug on comments. removed enter hotkey on publisher completely.	2011-01-07 15:53:39 -08:00
danielvincent	3363f84161	fixes photo overflow issue on photos/show	2011-01-05 16:00:00 -08:00
Raphael	429087ef83	Merge remote branch 'tomk/729-retain-input-on-failure'	2011-01-04 16:39:07 -08:00
Raphael	8d5dc5d27b	Merge remote branch 'tomk/ui-cosmetics'	2011-01-04 16:02:11 -08:00
lfortin	62585aa445	more JS formatting	2011-01-02 19:41:20 -05:00
lfortin	efb711963f	in JS, avoid global variables as much as possible	2011-01-02 19:24:38 -05:00
danielvincent	055fbe3e00	stream is now a div. generalized some partial extentions for mobile site.	2011-01-01 23:09:18 -05:00
Thomas R. Koll	367d2756be	Fixes #713: Set a pointer cursor for "add photos" input field	2010-12-30 00:17:59 +01:00
Sarah Mei	a1b92f5224	Merge javascript formatting changes.	2010-12-28 20:31:49 -08:00
Thomas R. Koll	06d80d0e57	Issue #729: Failed posts and comments don't retain text ... The forms were cleared on a submit event instead of a ajax:success	2010-12-28 23:46:34 +01:00
Nick van der Burgt	13b33ee864	Added ie.js file	2010-12-27 17:29:10 +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	30dd11b9fa	mark notifications as read and update badge	2010-12-25 16:27:09 -05:00
danielvincent	4ff9622bfc	notifications now properly socket (not a hack through comments like before). notification badge updates on new messages.	2010-12-25 16:07:31 -05:00
Sarah Mei	de502bf67c	Convert aspect-edit-spec.js to use actual DOM fixtures generated by AspectsControllerSpec.	2010-12-24 18:39:20 -08:00
Sarah Mei	9c50f900ed	Merry Christmas! I got you someting green. ... Remove callback to decrementRequestCounter in aspect-edit.js, since we don't have a request counter on that page anymore. The callback was failing, so the ajax request was never officially completing. Cucumber hates that. I am going to add jasmine fixture generation in the controller specs, so that next time, a jasmine test will fail in this situation. Also: clean up manages_aspects.feature.	2010-12-24 14:14:24 -08: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
Julian Osman	42c602df2f	Issue #735: Image link fixed and CSS corrected	2010-12-20 12:09:30 -08:00
danielvincent	6c12a4c562	photo show page shows more photo.	2010-12-19 21:53:57 -08:00
maxwell	533ff2fc39	improve selector for inf. scroll	2010-12-19 19:30:33 -08:00
maxwell	d5819e3c9e	fix the ajax-loader for scroll on non root page	2010-12-19 19:15:16 -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
lfortin	0393ac5a6f	more JS formatting	2010-12-19 00:15:00 -05:00
danielvincent	01e557ba7a	put ajax:success for publisher where it belongs	2010-12-18 20:31:02 -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	7b4da22617	shift+enter for a newline, enter for submission. inversion of current implementation.	2010-12-18 18:49:10 -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	bcca61af6b	infinate scroll	2010-12-18 01:33:33 -08:00
maxwell	84c041ba6a	aspects streams now ajax	2010-12-17 19:41:42 -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
lfortin	77c102cce6	more JS formatting	2010-12-16 23:46:28 -05: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
Laurent	4515ba631f	some JS refactoring	2010-12-15 19:25:35 -05: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
zhitomirskiyi	1212b34706	fadeOut on delete	2010-12-15 11:58:38 -08:00
maxwell	d75084c8d0	remove GS from 500 page	2010-12-15 10:16:33 -08:00
Raphael	d44df7e977	put remove contact link under aspect membership	2010-12-13 16:40:05 -08:00
Raphael	02d76441e4	Merge branch 'aspect-list-on-profile'	2010-12-13 16:12:29 -08:00
Raphael	baa04ceac7	Add aspect list to contact page	2010-12-13 15:58:08 -08:00
maxwell	42c22cedf9	Merge branch 'master' of github.com:diaspora/diaspora	2010-12-13 14:38:47 -08:00
maxwell	d73ce4d8cf	making image names more generic	2010-12-13 14:02:20 -08:00
maxwell	8eb9ab1781	making image names more generic	2010-12-13 14:02:11 -08:00
Mark Schmale	9a873aa760	added fix for Bug #695 to email-validation	2010-12-13 15:54:35 +01:00
Mark Schmale	d163875577	added email validation. The border of the input field becomes red if the input seems to be invalid.	2010-12-13 15:46:19 +01:00
Mark Schmale	f5038cdc3c	replaced charCode by keyCode. On every browser, keyCode is filled ... with the Unicode Character Code when used in keypress. charCode is only supported in some browsers.	2010-12-13 11:55:54 +01: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	02bb2fa19f	hide reshare menu if you click somewhere it's not	2010-12-12 01:38:28 -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
Dan Hansen	55b16b00f4	Firefox sends charCode 0 when backspace is pressed	2010-12-12 01:09:47 -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
danielvincent	6c4ead4ac7	make favicon more like apple-touch-icon	2010-12-11 21:00:34 -08:00
danielvincent	b4170dc991	badges on stream elements. say 'all aspects' instead of listing out all user's aspect names	2010-12-11 20:28:40 -08:00
maxwell	91c331d630	fix to limit size of request box	2010-12-11 16:28:37 -08:00
danielvincent	fd2cbc1cf4	added invite link to search page	2010-12-10 18:28:51 -08:00
danielvincent	2c5d5d9328	show already invited users on invitation#new	2010-12-10 18:05:08 -08:00
danielvincent	8de5c5babd	fixing request bar on aspects#manage	2010-12-10 10:12:30 -08:00
danielvincent	624cb45ee2	fixed aspect nav FF bug	2010-12-09 20:09:21 -08:00
danielvincent	eaeb55f65b	make aspect tabs look less cluttered	2010-12-09 19:04:03 -08:00
Raphael	3a4caca397	Fix photo uploading in profile photos, style photo upload button better	2010-12-09 13:06:31 -08:00
danielvincent	fa9caf00ca	added tooltip text to public icon	2010-12-08 19:07:08 -08:00
danielvincent	aa628c090d	highlight public posts in the stream	2010-12-08 18:59:02 -08:00
danielvincent	46793179db	people#show displays shows public posts for non-contacts as well	2010-12-08 16:53:24 -08:00
maxwell	5f1f28923f	fixed a comment counting bug, and the show_all_comments message when the comment count was three	2010-12-08 13:44:57 -08:00
maxwell	efee7682e2	aspect rename now works	2010-12-08 13:11:13 -08:00
danielvincent	b94e6ae4a0	shift+enter submits new messages/comments	2010-12-07 21:30:29 -08:00
danielvincent	9891577fa5	500 page now shows a getsatisfaction pane defaulted to problem tab	2010-12-06 16:03:02 -08:00
OhaiBBQ	4bbbbf6bb1	tipsy on sidebar avatars	2010-12-05 09:44:10 +03:00
Sarah Mei	9da69a4b01	Mobile log in form is usable. Also, added mixins for sass.	2010-12-04 20:45:52 -08:00
Sarah Mei	fea6884acc	Mobile homepage looks decent.	2010-12-04 19:30:14 -08:00