2213 commits

Author	SHA1	Message	Date
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
OhaiBBQ	1b7749f282	typo on last commit	2010-12-05 06:21:06 +03:00
OhaiBBQ	05f54e0ebd	Merge branch 'master' of github.com:diaspora/diaspora	2010-12-05 06:18:30 +03:00
OhaiBBQ	78ac693dcd	only tipsy on avatars in left_pane and manage_aspect_zone	2010-12-05 06:17:14 +03:00
Sarah Mei	c3736729c9	removing mobile.css from git	2010-12-04 19:16:14 -08:00
sentientwaffle	b303cf6830	fixed issue with post deletion confirmation for the latest verison of jquery	2010-12-04 18:55:15 -08:00
maxwell	23eb192524	double the time that notifications are seen on the page	2010-12-04 17:45:52 -08:00
danielvincent	105c788bf8	fixed comment js. fadeToggle is only supported in jquery >= 1.4.4	2010-12-04 17:37:57 -08:00
danielvincent	948707ea23	rolling back jquery. <= 1.4.3 has compatability issues with rails js helpers	2010-12-04 17:22:22 -08:00
danielvincent	4251a3a093	prompt to 'get the conversation started' on new aspect page fades out when first message in aspect is posted	2010-12-04 17:02:29 -08:00
OhaiBBQ	c55a867f61	fix build, .remove is the callback, don't call it immediately	2010-12-05 00:26:10 +03:00
OhaiBBQ	75e81577c6	Merge branch 'master' of git://github.com/diaspora/diaspora	2010-12-04 11:55:08 +03:00
OhaiBBQ	ba23bd7a0a	Many JS improvements, moved a few things in view.js to stream.js, moved the clearForm plugin from view.js to rails.js (where we actually use it), refactored view.js and wrote specs	2010-12-04 11:54:59 +03:00
danielvincent	c68ebc1d14	removed comic sans from the entire codebase. marker felt remains on os x.	2010-12-04 00:29:15 -08:00
danielvincent	47b6d66b83	fixed proportions in stream, etc.	2010-12-03 23:38:29 -08:00
danielvincent	5da5ee26bb	two column aspect listing on manage page. made avatars smaller.	2010-12-03 16:22:20 -08:00
danielvincent	7fdbc9015b	swapped new invitation lightbox for a proper page.	2010-12-03 00:57:53 -08:00
danielvincent	30668bf2e6	visual touchups	2010-12-02 23:19:30 -08:00
maxwell	9bd77916a8	Merge branch 'master' of github.com:diaspora/diaspora ... Conflicts: public/stylesheets/sass/application.sass	2010-12-02 19:18:21 -08:00
maxwell	9ad9e205a5	upping zindex on photo button	2010-12-02 19:17:26 -08:00
maxwell	8aaedb4240	upping zindex on photo button	2010-12-02 19:02:33 -08:00
maxwell	38d9d75162	posts now have public permalinks	2010-12-02 18:47:48 -08:00
danielvincent	6c05d01177	enabling dragging and dropping between aspects on aspect manage. removed ability to remove a contact from aspects#manage after removing from a single aspect. fixed notification popup z-index.	2010-12-02 17:36:46 -08:00
Sarah Mei	c7b1fcc806	Merge branch 'master' of https://github.com/OhaiBBQ/diaspora into OhaiBBQ-master	2010-12-01 22:53:58 -08:00
maxwell	e18b918676	MS DG only show three comments by default	2010-12-01 18:09:41 -08:00
danielvincent	ee47a2ffda	fixed diaspora logo asset on landing page	2010-12-01 16:18:13 -08:00
root	5d31a24e9e	fixed spec, jquery event binding doesnt call the function itself, but a 'clone' of the function	2010-12-02 02:54:38 +03:00
root	5cd0a60073	Moved to it's own file, added specs	2010-12-02 02:22:05 +03:00
danielvincent	d392239355	removed brandongrotesque from repo, logos are now assets.	2010-12-01 11:45:54 -08:00
Dan Hansen & Sarah Mei	b2f4e064fc	stream.js now semi-split into functions (still needs work); specs for toggling comments	2010-11-30 16:24:11 -08:00
root	bfcb7b48b3	4realz4realz	2010-11-30 16:24:11 -08:00
root	faf5baf4c5	Remove expand comments from the window namespace	2010-11-30 16:24:11 -08:00
danielvincent	601284a171	make profile photo action uses :remote=>true rails ajax helpers. added photos#make_profile_photo.	2010-11-30 15:58:26 -08:00
Raphael	57485e7093	Move aspect contacts pane js to public	2010-11-30 13:55:37 -08:00
maxwell	0f6b322333	Merge https://github.com/OhaiBBQ/diaspora into OhaiBBQ-06464cb	2010-11-29 17:17:01 -08:00
maxwell	96776f93f9	we need this for socketing... sorry	2010-11-29 16:19:36 -08:00
root	06464cbfe8	Youtube videos now show themselves after the rest of the messages	2010-11-29 23:25:34 +03:00
danielvincent	2c22941e2f	fixed listener for delete action on aspect-edit. scope through a manage_aspect_zones div to avoid confusion on aspects#show.	2010-11-28 20:16:57 -05:00
danielvincent	05174436c0	comments should only be dispatched out to remote people from owner. for local people on the same pod, the comment has already been verified by the comment's authority (post owner).	2010-11-28 18:51:27 -05:00
danielvincent	d7c5e12d64	move photo-show js to assets. remove EM::next_tick from controller#create actions. make photo show pages render again.	2010-11-28 02:30:25 -05:00
danielvincent	3ada121d0b	contact-js as its own file	2010-11-28 00:29:22 -05:00
Raphael	8f67f90307	wtf weird chars in the JS	2010-11-27 22:32:20 -05:00
danielvincent	d65ba2f291	removing contact pictures from contact list re aspects#show	2010-11-27 17:25:40 -05:00
Alexandre DE DOMMELIN	b0a123b270	Fix hidden fields issue in Iceweasel	2010-11-26 23:23:32 +01:00
Sarah Mei	f8229d07e8	Adding copyright to js files	2010-11-26 12:16:10 -08:00
Hexagon	f87ac4cb0b	Adjusting YT-video size for posts	2010-11-26 17:28:08 +01:00
Hexagon	bd204c554e	Fixing errors in application.sass	2010-11-26 16:20:12 +01:00
Hexagon	a520b371e1	Merge branch 'master' of https://github.com/OhaiBBQ/diaspora into OhaiBBQ-master-fix	2010-11-26 16:18:41 +01:00
Dan Hansen & Sarah Mei	257d6f414a	Top-level Diaspora object for js widget management	2010-11-25 22:24:25 -08:00
Dan Hansen & Sarah Mei	84face159d	Removing unused js	2010-11-25 21:44:57 -08:00
Dan Hansen	37c2e52be9	Fixed styling for a video in a comment	2010-11-25 20:53:05 -08:00
danielvincent	7c6d5b8d27	cleaned up right pane on aspects#all. moved edit_contacts_pane out to a partial -- translation locations need updating.	2010-11-25 23:14:45 -05:00
Dan Hansen	21fa3fff8c	Styling for the youtube iframe	2010-11-25 19:54:09 -08:00
danielvincent	b56af997cb	comment streams rendered expanded/collapsed initially by server.	2010-11-25 20:23:33 -05:00
danielvincent	b5dbfc129c	touched up aspect contact manage list, removed some unused sass.	2010-11-25 20:22:59 -05:00
Dan Hansen & Sarah Mei	eb314aa300	Fix application helper specs around youtube links	2010-11-25 16:29:30 -08:00
Dan Hansen & Sarah Mei	e78a86897a	Video links now use data attributes and render in an iframe	2010-11-25 16:07:39 -08:00
Sarah Mei	050918a310	Added link to manage aspects page from sidebar. ... Now you can drag requests from that page, but not existing contacts. d&d interface for moving contacts between aspects needs some thought.	2010-11-25 10:29:35 -08:00
Raphael	eeac6901b9	Revert "Change invite button text" ... This reverts commit d443b15c97.	2010-11-24 21:01:48 -05:00
Raphael	ed35969084	incorrect onClose in WS js	2010-11-24 18:10:49 -05:00
Raphael	d443b15c97	Change invite button text	2010-11-24 16:48:24 -05:00
danielvincent	6a6661d42b	prevent text overflow in stream	2010-11-23 15:58:23 -08:00
danielvincent	03243a277f	took out slide animation on comments due to sluggish performance	2010-11-23 15:20:36 -08:00
danielvincent	c24150eca0	socketed posts now show up on home page. delete links are back in the stream.	2010-11-23 11:47:54 -08:00
danielvincent	9d98afb94f	took out fade on photos#index, because it only displayed all photos half the time.	2010-11-23 09:44:58 -08:00
danielvincent	c9c84794af	fixed build. publisher lights up on hover on aspect#index page. updated login page text.	2010-11-23 03:10:47 -08:00
danielvincent	376d403651	made publisher semi-hidden on home page	2010-11-23 00:34:28 -08:00
danielvincent	97171b3083	resolved press logos	2010-11-22 21:20:03 -08:00
Dan Goldenberg	bfc1fa4da0	added getting_started text and new press logos	2010-11-22 21:07:01 -08:00
danielvincent	f725641eaf	added shadow on diaspora text on landing page.	2010-11-22 20:53:20 -08:00
danielvincent	69cac02ade	landing page fix	2010-11-22 20:35:30 -08:00
maxwell	ffedd9fa77	Merge branch 'master' of github.com:diaspora/diaspora	2010-11-22 17:30:00 -08:00
maxwell	b283f5c579	pulling back needed partial	2010-11-22 17:29:51 -08:00
maxwell	173ec5f73b	Revert "remove a duplicate view, hence many files updated, and fixed the js to socket people to the aspect sidebar" ... This reverts commit c45893d07d. Conflicts: config/locales/diaspora/en.yml	2010-11-22 17:11:34 -08:00
danielvincent	c63319f127	aspect#show cleanup. added 3 icons.	2010-11-22 17:03:33 -08:00
maxwell	1adf93ace1	Merge branch 'master' of github.com:diaspora/diaspora ... Conflicts: config/locales/diaspora/en.yml	2010-11-22 16:40:01 -08:00
maxwell	c45893d07d	remove a duplicate view, hence many files updated, and fixed the js to socket people to the aspect sidebar	2010-11-22 16:38:10 -08:00
Sarah Mei	bedc7ca41b	Made landing page and log in views content-type agnostic. ... Added an un-minified version of jquery-mobile for debugging.	2010-11-22 15:02:25 -08:00
danielvincent	26a11f7ab6	firefox bugfix on photo#show	2010-11-22 14:52:13 -08:00
danielvincent	0e7b1f5eb7	status messages and comments made by user will ajax onto the current page, and websocket everywhere else.	2010-11-22 14:52:13 -08:00
MrZYX	e72f4e1da7	translatable status is good again ... made default aspects translatable fix all the misssing translations I found cleanup en.yml	2010-11-22 22:30:37 +01:00
danielvincent	8c6f3bddc3	added diaspora handle to home page with help text. added email address to account settings page.	2010-11-22 11:19:50 -08:00
danielvincent	857a4b5f11	photo large is now at 300px. a person's profile photo now references the larger size instead of medium.	2010-11-22 10:32:14 -08:00
danielvincent	c7ac90538a	added some spacing between photos and text on stream	2010-11-22 01:57:51 -08:00
maxwell	cdbd9df15e	Merge branch 'master' of github.com:diaspora/diaspora	2010-11-22 01:50:23 -08:00
maxwell	ae2b3d75c2	added some copy to the landing page, and some basic styling	2010-11-22 01:50:15 -08:00
danielvincent	cb837f5fd7	moved photo controls on photos#show to bottom of poloroid. make profile photo action gives feedback while loading.	2010-11-22 01:24:04 -08:00
maxwell	5c2d161146	small changes to mobile	2010-11-22 01:19:11 -08:00
maxwell	f0b9f0f406	making width of checkbox smaller	2010-11-21 23:48:36 -08:00
maxwell	3a99ec3f8c	uploader now shows current file uploading, and progress	2010-11-21 23:44:20 -08:00
maxwell	ce1768d0d3	fixing dropdown, and removing margin on publisher	2010-11-21 22:58:01 -08:00
Sarah Mei	218aa1c0d6	MSSM aspect switcher in mobile interface plus tests; added check for ipad useragent	2010-11-21 19:56:35 -08:00
danielvincent	752d50a6a9	editing captions on photos uses remote forms. removed photo in album from WSR.	2010-11-21 19:51:20 -08:00
danielvincent	069b372c19	photo show links to original post and siblings. status message shows all photos associated with it. youtube player makes http/s call instead of just http.	2010-11-21 16:30:47 -08:00
danielvincent	bd0c21a634	button for adding photos works again. pulled _aspect_nav into _header. fixed all but one cucumber test.	2010-11-21 16:30:46 -08:00
danielvincent	d16a4601c2	contact list on aspect#show is ajaxy	2010-11-21 16:30:46 -08:00
danielvincent	b3ec4d10c2	user can now remove contact from aspects on contact's profile page. a contact's posts are retained in a given aspect reflecting the duration of said contact's inclusion.	2010-11-21 16:30:45 -08:00
maxwell	4742f61925	made the rss button a link to the feed, and aligned correctly	2010-11-21 16:13:03 -08:00
danielvincent	a9a91c436a	user menu is a button. fixed remove aspect button on aspect#show	2010-11-21 16:13:03 -08:00
maxwell	16141bf1ff	removed ... from user name, spread out menu, added a hover state to dropdown elements	2010-11-21 16:13:02 -08:00
maxwell	4ce337bbed	display a users username in the final step	2010-11-21 16:13:02 -08:00
maxwell	0b13168ba2	remove zindex on photo uploader so the dropdown menu is above it	2010-11-21 16:13:02 -08:00
maxwell	f4445a1a0d	removed ... from user name, spread out menu, added a hover state to dropdown elements	2010-11-21 16:13:02 -08:00
danielvincent	6e603bf2af	aspect#show does not display search for contacts if user does not have any. aspect#index displays search box where all contact pictures go if user does not haveany contacts.	2010-11-21 16:13:02 -08:00
maxwell	39f596462e	saying sent on requests via js	2010-11-21 16:13:01 -08:00
maxwell	9b7d2ed0f6	DG MS; status messages can now have photos.	2010-11-21 16:13:01 -08:00
maxwell	7f97b6f812	MS DG form now works reasonably well. still need to limit number of photos	2010-11-21 16:13:00 -08:00
maxwell	fb0dc2db7e	added photos to status messages	2010-11-21 16:13:00 -08:00
danielvincent	f6491816a3	adding a contact on an aspect page does not produce a fancybox anymore. more ui fixing.	2010-11-21 16:13:00 -08:00
maxwell	7fb751b00c	making photo uploader work better	2010-11-21 16:11:55 -08:00
danielvincent	242d0ab9c5	a search yielding exactly one person will redirect to that person's page. hotkey ctrl+f triggers focus on search box.	2010-11-21 16:11:55 -08:00
danielvincent	52cde14221	more touchups	2010-11-21 16:11:54 -08:00
danielvincent	2b54d9a0c5	adjusting more page structure. drafting about there.	2010-11-21 16:10:54 -08:00
danielvincent	7a259d6d53	drafted a basic structure	2010-11-21 16:09:27 -08:00
Raphael	6f0d008914	Move WebSocketReceiver out to a js file	2010-11-21 16:14:36 -05:00
Raphael	7db1da935a	Stream is a class	2010-11-21 13:21:42 -05:00
zhitomirskiyi	9a31d15c92	added icons for the connected services and to indicate the rss feed	2010-11-18 12:19:58 -08:00
maxwell	9882fa183d	Merge branch 'master' of github.com:diaspora/diaspora	2010-11-17 23:19:27 -08:00
maxwell	2ffd2d93e3	made mailchimp form ssl	2010-11-17 23:19:12 -08:00
Sarah Mei	64237534fd	Merge branch 'master' of github.com:diaspora/diaspora	2010-11-17 22:31:21 -08:00
Sarah Mei	c19ebcece3	Request delete now returns head :ok instead of redirecting. On client side, request div is removed.	2010-11-17 22:28:24 -08:00
maxwell	c6778b942f	Merge branch 'master' of github.com:diaspora/diaspora ... Conflicts: app/views/layouts/application.html.haml	2010-11-17 21:57:48 -08:00
maxwell	31d33054ef	added jammit, now js and css compress for production	2010-11-17 21:51:59 -08:00
danielvincent	9041a81fea	cleaned up meta and link tags in layout, added retina iOS icon, fixed error caused in stream_element when socketing	2010-11-17 21:21:00 -08:00
danielvincent	056dc7d3ba	DG MS; added homecontroller to take care of landing page and aspects index redirecting in regards to user's logged in state.	2010-11-17 19:37:08 -08:00
danielvincent	a7c1733093	firefox fixes and added links to press articles on landing page	2010-11-17 19:37:08 -08:00
danielvincent	f59f6be4b0	users#sign_in is the current landing page. 'sign up for an invite' is hooked up to mailchimp.	2010-11-17 19:37:08 -08:00
maxwell	e959e529ff	ga looks like it only likes if the code is pasted...hrmpf	2010-11-17 12:29:58 -08:00
maxwell	ba620e5400	spell vendor correctly	2010-11-17 12:25:09 -08:00
maxwell	643950cf52	added google a	2010-11-17 12:16:44 -08:00
maxwell	6a695479f7	adding updated jquery UI for compatability	2010-11-16 23:58:16 -08:00
maxwell	f55509085a	upgraded jquery, and deleted a second version of both jqueries	2010-11-16 21:41:20 -08:00
Raphael	e2412d2e43	Add error messages for friending from aspect-manage	2010-11-16 18:00:55 -08:00
Raphael	c0414b8184	Make requesting ajaxy, refactor _person request partials, add route for ajaxy webfingering, people now socket to search and _manage_aspect_contacts	2010-11-16 16:18:16 -08:00
Sarah Mei	45e47513c2	AspectEdit#onDeleteRequestSuccess now adds and drops attributes properly	2010-11-14 21:49:36 -08:00
danielvincent	969c668518	translation fix on _person.haml. button tweak	2010-11-13 12:10:09 -08:00
danielvincent	988e2afe3d	resolved missing translation, tweaked button css, commented out mobile_fu in application controller	2010-11-13 00:26:55 -08:00
danielvincent	ed50fe7f1f	Aspect.people -> Aspect.contacts. Fixed diaspora.en to reflect friend -> contact changes.	2010-11-12 20:22:56 -08:00
danielvincent	aa9966ea26	removed the word friend everywhere minus translation files	2010-11-12 20:22:55 -08:00
Sarah Mei	6c439608f0	started specs for AspectEdit.deletePersonFromAspect	2010-11-12 17:04:15 -06:00
Sarah Mei	506d13335a	Finally have complete specs for AspectEdit.onDropMove.	2010-11-12 16:05:17 -06:00
Sarah Mei	b77547e940	Responding to a friend request now only calls RequestsController#delete instead of also calling AspectsController#move_friend	2010-11-12 14:51:16 -06:00
Sarah Mei	feec6d971d	More specs for aspect edit JS	2010-11-12 13:40:23 -06:00
danielvincent	3b303e1cf2	adding fancybox assets back	2010-11-11 19:42:11 -08:00
danielvincent	85e2316280	Add a contact pane on aspects#show altered to also allow removal of existing contact from aspect	2010-11-11 19:41:12 -08:00
Sarah Mei	ca9331970a	Renaming image_picker to image-picker since js likes dashes better than underscores	2010-11-10 10:52:33 -07:00
maxwell	f7cc01ceb2	more work done. much more to go	2010-11-09 15:29:43 -08:00
maxwell	034d7ee2b1	first commit	2010-11-09 15:29:43 -08:00
maxwell	bc0263f16e	added white background for search box, so at least it shows up in opera. thx Pistos	2010-11-09 12:14:46 -08:00
maxwell	7ca6677b33	making publisher submit button have a higher zindex	2010-11-08 10:18:00 -08:00
danielvincent	d7172767ba	moved fancybox assets to vendor/css	2010-11-07 12:24:54 -08:00
danielvincent	58ce81f674	Add a person to aspect contains a searchable list as opposed to a dropdown.	2010-11-07 12:20:33 -08:00
danielvincent	0127c9eb6f	people on manage page are draggable again. took out jquery.cycle. fixed loading issue with tipsy.gif	2010-11-07 11:07:37 -08:00
Sarah Mei	32d953f457	Reorganized public folder - third-party js is now in public/javascripts/vendor. Third-party css is now in public/stylesheets/vendor.	2010-11-06 16:50:07 -07:00
danielvincent	020cd90341	aspect labels on people#show view	2010-11-06 11:09:11 -07:00
danielvincent	ecfcc96f8e	Post a message to aspect dialog will only display if people are present.	2010-11-05 21:14:00 -07:00
danielvincent	9a055b6cba	Photo partial now has a description and a link to view all photos by that person.	2010-11-05 17:27:36 -07:00
maxwell	e4f8f558a0	aspects now have a max length of 20 characters	2010-11-05 17:18:20 -07:00
danielvincent	bd9aa90278	User receives notification on new comment on post on any page.	2010-11-05 14:18:22 -07:00
maxwell	997f9ad8d0	making profile not look so bad	2010-11-05 00:54:09 -07:00
Raphael	aac9080299	smells like... greenery	2010-11-04 19:45:23 -07:00
Raphael	abebd18c98	Move getting_started self link color to a css class	2010-11-04 19:29:15 -07:00
danielvincent	be916384a1	collapsed remove from aspect and remove person into one function on aspects#manage	2010-11-04 17:50:48 -07:00
danielvincent	2c24eba49c	make profile photo button on photos#show works again	2010-11-04 16:04:58 -07:00
Raphael	152025f912	Update flashsocket	2010-11-04 12:01:39 -07:00
Sarah Mei	dbdd6884a7	SM MS jasmine specs for aspect edit	2010-11-03 22:19:20 -07:00
danielvincent	a995d250f1	added white text on grey asset to mailer	2010-11-02 17:19:49 -07:00
danielvincent	fff43bf650	profile defaults key searchable to true. search takes searchable into account.	2010-11-02 16:12:42 -07:00
Sarah Mei	fad9c09212	refactor aspect-edit.js in prep for jasmine testing	2010-11-02 13:37:27 -07:00
Raphael	fd0f3a9a1c	Fix reshare, user_menu	2010-11-01 17:30:10 -07:00
Raphael	47f040f740	Use jquery id selector	2010-11-01 16:45:09 -07:00
OhaiBBQ	a548ab1345	Small optimizations	2010-11-01 14:58:53 -07:00
OhaiBBQ	8b0d20dec7	Small optimizations	2010-11-01 14:45:51 -07:00
OhaiBBQ	94e4c22fcf	Fixed some tabbing ... Removed some more unneeded jQuery object constructors for the button fancyboxes Replaced event.target with the this keyword	2010-11-01 14:23:16 -07:00
OhaiBBQ	175e5bdc30	Added strict equality operator to #publisher and #stream keydown event ... Added caching of the $container jQuery object Added caching of $controls and $this in the .make_profile_photo click event changed the success callback to use this.src = photo_url; instead of creating a new jQuery object	2010-11-01 10:37:07 -07:00
OhaiBBQ	6474f5c5f3	Added more caching of jQuery objects, saved a line by using .toggleClass()	2010-11-01 10:07:41 -07:00
OhaiBBQ	c8e8ef06e7	You don't need to make a new jQuery object to do that. ... Fixed typo in the click param Cache the .edit_photo jQuery object	2010-11-01 05:26:58 -07:00
danielvincent	3cdb48232a	all box-shadows in views rendering in gecko	2010-10-31 17:29:23 -07:00
danielvincent	bfb132280a	reshare button displays dropdown on click	2010-10-31 14:30:03 -07:00
danielvincent	f2b7e4010e	edit profile link on owner's profile page.	2010-10-29 15:02:56 -07:00
danielvincent	79ec02c6ad	photo uploader on edit profile page.	2010-10-29 14:11:59 -07:00
danielvincent	51dd6d32b3	upload a photo button next to publisher	2010-10-29 10:38:53 -07:00
danielvincent	a7df1bca68	photos do not require an album. uploading files on a user's photos#index page will post to all aspects.	2010-10-29 10:38:17 -07:00
danielvincent	2b4e3e3a41	a person now has a photos#index page.	2010-10-29 10:38:17 -07:00
danielvincent	0dcffc6227	made 404 page message clearer.	2010-10-28 14:07:52 -07:00
danielvincent	1d5b7a87f1	Merge branch 'master' into getting-started	2010-10-27 18:14:08 -07:00
danielvincent	db1a753add	major hack on getting_started#2 with aspect javascript. reload the page on ajax success on new aspect creation just to get it working.	2010-10-27 18:08:55 -07:00
danielvincent	05c5e770ee	removed real name from signup process.	2010-10-27 16:25:22 -07:00
danielvincent	cd726c0ba7	users#getting_started route -> getting_started. getting_started is now a mini-template referring to partials in users/getting_started/	2010-10-27 12:21:25 -07:00
danielvincent	4ec11691cd	user has a getting_started flag, set true by default. aspect#index checks to see if getting_started flag is set.	2010-10-27 10:36:13 -07:00
danielvincent	b320f5df72	fixed js for changing a user's profile photo on photos#show	2010-10-27 08:45:43 -07:00
danielvincent	039bf374d8	soft shadow on header	2010-10-26 23:38:12 -07:00
danielvincent	a8086f2990	further refinements. added back buttons, more explanation text.	2010-10-26 23:27:26 -07:00
danielvincent	f1fbb68fd8	added success to getting_started. fixed birthday selectors to display years down to 1930. made buttons rounder. all save and continue buttons step forward.	2010-10-26 18:35:14 -07:00
danielvincent	385e1673ab	Merge branch 'master' into getting-started ... Conflicts: app/controllers/users_controller.rb app/views/users/_account.haml app/views/users/_profile.haml	2010-10-26 16:50:57 -07:00
danielvincent	e62afae045	deselected tabs in top nav, made user drop down a bit clearer	2010-10-26 16:12:58 -07:00
danielvincent	ea46fa8fd8	save and continue buttons on getting_started#1 and getting_started#2. raise fields	2010-10-26 15:03:38 -07:00
danielvincent	ec141a2019	a user can add a person to an aspect from getting_started#2	2010-10-26 13:04:47 -07:00
danielvincent	0c72257c50	aspects can be created/destroyed via ajax on getting_started#2	2010-10-26 13:04:47 -07:00
danielvincent	dd4f46c8b0	repositioning layout on getting started	2010-10-26 13:04:47 -07:00
danielvincent	69b1b71a5d	removed javascript slider. made each getting_started section its own page. added bio to profile (and changed xml_accessors to xml_readers).	2010-10-26 13:04:47 -07:00
danielvincent	f23d199230	added slider to getting started flow	2010-10-26 13:04:46 -07:00
danielvincent	b52afdd93c	changed account and profile partials to better reflect styling changes	2010-10-26 13:04:46 -07:00
danielvincent	31713d9597	html5 placeholder text	2010-10-26 13:04:46 -07:00
danielvincent	278a74f1f9	draft	2010-10-26 13:04:46 -07:00
danielvincent	d8ca91769f	dragging a person to Remove from Aspect on aspect#manage fades person correctly (re: #442)	2010-10-26 13:03:45 -07:00
danielvincent	ff13cad116	names of people display immediately on aspect#manage page	2010-10-26 12:19:32 -07:00
danielvincent	a9451d19b9	another publisher fix (broke aspect#show pages with last fix). changed flash message colors/opacity.	2010-10-24 18:16:38 -07:00
danielvincent	26cada5866	ff 3.6 publisher fix.	2010-10-24 18:01:38 -07:00
danielvincent	7b3f6f66c1	removed second #stream declaration on status_message#show. fixed bug where show pages would get posts as well as comments.	2010-10-24 14:44:43 -07:00
danielvincent	661ad20a02	added delegate, proper finders, and more chaining to stream.js. removed div.comment_set from the DOM.	2010-10-24 14:44:43 -07:00
danielvincent	f8347a3dd4	added tipsy tooltips for user pictures on left pane in aspect#index and aspect#show	2010-10-23 22:21:51 -07:00
maxwell	de04e717c0	made image or default to help with hcard parsing, deleted old default user picture	2010-10-22 16:57:01 -07:00
danielvincent	c0423e5e56	reverting commit manually	2010-10-22 15:57:00 -07:00
danielvincent	829ad6360a	multiple dropzones function. person image does not copy, delete is disabled.	2010-10-22 15:56:28 -07:00
danielvincent	a52870b21c	improved animations	2010-10-22 15:56:28 -07:00
danielvincent	e1f4e12b8f	style. also, made sense of aspect-edit.js	2010-10-22 15:56:28 -07:00
danielvincent	69528b95a3	removed ignore bucket. people now have x's to delete them	2010-10-22 15:56:27 -07:00
danielvincent	ed4c253ea8	show pages now identify content with content creator. publisher now takes a local	2010-10-22 15:32:41 -07:00
Raphael	645685a8fb	Make flash notice CSS less deadly	2010-10-21 23:18:53 -07:00
danielvincent	06e2b43516	252,252,252 rgb for body background. you won't even notice.	2010-10-20 23:46:24 -07:00
danielvincent	8e175be2ba	fixed comments not showing up through websocket on photo show page	2010-10-20 23:40:48 -07:00
ilya	84e19f833a	Merge branch 'master' of github.com:diaspora/diaspora	2010-10-20 18:30:36 -07:00
ilya	30bae4f807	throws an alert if you try to remove person from the last aspect	2010-10-20 18:30:22 -07:00
danielvincent	e880a5a11f	comment submit buttons show again. further changes to show pages.	2010-10-20 18:15:07 -07:00
danielvincent	183ac75c6a	Merge branch 'master' of github.com:diaspora/diaspora	2010-10-20 17:35:35 -07:00
danielvincent	6d8b670150	changed show layouts for album and photos. still needs work.	2010-10-20 17:35:27 -07:00
ilya	6fa82490c9	remove friend from aspect box, with js call to remove the person from the aspect	2010-10-20 17:34:52 -07:00
danielvincent	e9fc086089	users name doesn't overflow in user menu	2010-10-20 14:45:01 -07:00
danielvincent	e9ced7b2e6	changing photo now updates all user images in page	2010-10-20 12:35:16 -07:00
danielvincent	61122b83d0	make profile button on photo show page. (removed clean hash on usercontroller)	2010-10-20 12:19:06 -07:00
danielvincent	98a8fbcfb6	request badge text color fix	2010-10-20 10:37:00 -07:00
Raphael	fd8028db33	Revert "Revert "Merge remote branch 'upstream/master'"" ... This reverts commit 1481056af2.	2010-10-20 09:51:55 -07:00
Alec Leamas	1481056af2	Revert "Merge remote branch 'upstream/master'" ... This reverts commit fb70dc8c99, reversing changes made to 53fef63a9a. Conflicts: pkg/fedora/diaspora-setup pkg/ubuntu/diaspora-setup public/stylesheets/sass/application.sass spec/models/user/attack_vectors_spec.rb	2010-10-20 14:59:55 +02:00
danielvincent	d2945c83dc	status message show is now a real show page. photo partial in stream shouldn't display a slideshow of album.	2010-10-20 00:02:15 -07:00
danielvincent	8751503aa4	header on public explain fancybox	2010-10-19 16:28:45 -07:00
danielvincent	f6303b8fff	reshare dropdown looks nicer. fixed user menu to drop down on click	2010-10-19 16:16:46 -07:00
danielvincent	b218a53bf7	fancyboxes have title bars now, kind of.	2010-10-19 14:06:44 -07:00
danielvincent	ea00d35f1f	padding on stream fix. added add aspect button in aspect nav.	2010-10-19 12:10:22 -07:00
danielvincent	7e9585c5f0	default user picture change. stream link on all aspects page fix. layout view is not fragmented.	2010-10-19 11:29:29 -07:00
ilya	a8bf082e35	The invitation now has an optional personal message	2010-10-18 14:35:41 -07:00
Raphael	3436371a96	Merge remote branch 'archi/332-quickfix'	2010-10-18 11:44:47 -07:00
Raphael	d38316002e	Merging in Hexagon fancybox. TODO: Refactor out fancybox options hash.	2010-10-18 11:24:47 -07:00
danielvincent	d18757b5c1	pushed stream up	2010-10-18 11:00:52 -07:00
danielvincent	4b1516542d	various. fixed publisher in new layout.	2010-10-18 11:00:52 -07:00
danielvincent	54e5fb4abb	add new aspect back on manage page. changed badges	2010-10-18 11:00:52 -07:00
danielvincent	15104cf920	somewhat there	2010-10-18 11:00:52 -07:00
archi	5e97fd3b52	Merge branch 'master' of git://github.com/diaspora/diaspora into 332-quickfix	2010-10-18 11:06:42 +02:00
danielvincent	eca37e1a28	small view cleanups	2010-10-17 21:55:03 -07:00
danielvincent	1139299f42	removed loop and hidden checkboxes from publisher. hidden field passes single aspect id or :all to controller	2010-10-17 20:47:51 -07:00
danielvincent	060767e794	comments submit on enter. design touchup	2010-10-17 19:36:43 -07:00
archi	f2af56f4b2	Youtubelink support :) ... Tested with Firefox, Chrome and Mobile Safari (IE8 is broken anyway)	2010-10-17 20:18:24 +02:00
archi	f676e284f7	Added Youtube links - Still TODO: Caching of titles!	2010-10-17 16:14:01 +02:00
archi	8e753cc073	Youtube proof of concept patch/preview - not done yet (see bug #332)	2010-10-17 12:56:26 +02:00
danielvincent	5ca3570667	added prefetch rels to prev/next links in photo show. fixed shadow bug in header	2010-10-16 02:06:46 -07:00
danielvincent	7611bc1c8f	user dropdown	2010-10-15 17:37:32 -07:00
danielvincent	47be7b1f0a	correct html5 search box	2010-10-15 15:29:57 -07:00
maxwell	e8c49feca4	made the public info link in all aspects publisher	2010-10-15 14:10:10 -07:00
danielvincent	12bdd1712d	share on facebook checkbox instead of broadcast button	2010-10-15 13:56:49 -07:00
Raphael	51c5b73256	Merge branch 'empty-page' ... Conflicts: public/stylesheets/application.css	2010-10-14 17:00:19 -07:00
danielvincent	45d7d54c66	added an empty message for the case of an aspect with no friends	2010-10-14 16:23:29 -07:00
danielvincent	cf2a4c25ae	DG RS; remove empty message from stream upon adding something	2010-10-14 15:19:37 -07:00
danielvincent	5722f85c85	message in aspect if stream is empty	2010-10-14 15:00:47 -07:00
danielvincent	32a0f60a2f	moved photos link to the side bar for now	2010-10-14 14:38:19 -07:00
Raphael	1ab34ab07a	Removing generated CSS from git	2010-10-14 14:05:51 -07:00
Raphael	be8cacdc79	Merge branch 'master' of github.com:diaspora/diaspora	2010-10-14 13:15:38 -07:00
danielvincent	58d5fbfb3e	moved invite link to account#edit on settings page. changed text on person partial.	2010-10-14 10:26:06 -07:00
Robin Nilsson	96219b7360	Making fancybox modal	2010-10-14 00:23:14 +02:00
Shawn McGuire	eaef6bdf04	Issue #272 Fixed color contrast	2010-10-13 11:12:27 -05:00
Raphael	3b82001a42	Step down font size 1px in info	2010-10-12 18:19:31 -07:00
Raphael	900a085124	Merging in bigbash's fixes	2010-10-12 15:09:32 -07:00
Shawn McGuire	b548520591	Changed div.info color and font size to be larger and darker ... Issue #285	2010-10-12 16:42:03 -05:00
danielvincent	be017bfb0a	DG MS; invite is now a lightbox on feed and manage pages	2010-10-11 14:16:24 -07:00
danielvincent	82f526ea23	DG MS; added tooltip	2010-10-11 10:53:00 -07:00
danielvincent	884d7b7dd7	flash message should slide in	2010-10-10 23:13:03 -07:00
danielvincent	b313272ff3	flash messages look nicer	2010-10-09 22:32:39 -07:00
danielvincent	c5affa07e8	tweaked reshare button	2010-10-08 16:19:51 -07:00
danielvincent	9ac13ccb3e	fixed reshare a bit	2010-10-08 15:47:06 -07:00
danielvincent	edd8f0ba6d	links now have active state	2010-10-08 15:35:22 -07:00
danielvincent	154ec95717	killed the public tab. made a broadcast button in everyone tab	2010-10-08 14:06:49 -07:00
danielvincent	a3aab92212	fixed photo partial	2010-10-08 12:25:42 -07:00
danielvincent	3a876770f3	minor tweaks	2010-10-08 00:36:55 -07:00
danielvincent	894d6654b2	only selected nav element should be a tab on aspect_nav, preventing tab overload.	2010-10-07 23:35:55 -07:00
danielvincent	8f741795fb	aspect manage margin fix	2010-10-07 23:27:31 -07:00
danielvincent	5b66a191cd	more stream tweaks	2010-10-07 23:25:49 -07:00
danielvincent	b314ee22ec	intermediate misc ui polish	2010-10-07 22:51:08 -07:00
danielvincent	ed1cb5a0e7	DG MS; moved change password to account page; fixed the styling on password inputs	2010-10-07 18:52:46 -07:00
Raphael	1fd3aeabd9	Add or later to license notice	2010-10-07 16:25:34 -07:00
Alec Leamas	e9252e8aec	After applying known rules in diaspora-bundle.spec, perm-fix patch + *.png	2010-10-07 14:59:13 +02:00
Alec Leamas	a9806ddad0	Fixing bad execute permissions on various *.html, *.js, *.css,*.png etc.	2010-10-06 04:59:46 +08:00
danielvincent	e145cbab5b	tar the app's source and throw it in the public folder on server boot.	2010-09-29 17:42:56 -04:00
danielvincent	fa8cc5b876	moz box shadow does not like negative blur	2010-09-28 23:24:04 -04:00
danielvincent	e0159aaaeb	small visual tweaks	2010-09-28 12:58:34 -07:00
danielvincent	4627c5338e	found placement of all aspects tab confusing; moved it to be the first tab	2010-09-28 12:29:35 -07:00
danielvincent	0a34c24f22	tag fix	2010-09-28 11:51:52 -07:00
danielvincent	577b5545bf	comment blocks slide	2010-09-28 11:50:13 -07:00
danielvincent	b068eaf15c	limit content width to 600px	2010-09-28 10:48:45 -07:00
danielvincent	241ea4559a	gradients on aspect tags on status messages	2010-09-28 10:41:38 -07:00
danielvincent	263615ad14	all status messages have labels	2010-09-27 23:51:20 -07:00
danielvincent	cb7c35af73	fixed thumbnail positioning	2010-09-27 23:15:48 -07:00
danielvincent	bf587be461	public indicator tag on status message partial.	2010-09-27 22:50:11 -07:00
ilya	08b9aa864a	Merge branch 'master' of github.com:diaspora/diaspora into fb ... Conflicts: app/views/layouts/application.html.haml app/views/shared/_publisher.haml app/views/shared/_sub_header.haml app/views/users/edit.html.haml config/deploy_config.yml config/routes.rb	2010-09-27 15:39:50 -07:00
Dorian	6ffc03a4c9	Big clean up: delete trailing whitespace	2010-09-26 12:48:40 -04:00
danielvincent	265753b5fe	user edit is now divided into real sections	2010-09-23 20:13:07 -07:00
Raphael	264555e63b	Update css	2010-09-23 15:15:19 -07:00
Raphael	c6c361b5e6	Add lucida sans, thanks danieleds	2010-09-23 15:14:44 -07:00
danielvincent	955d9130a2	DG IZ; shift+enter in publisher box submits contents	2010-09-22 15:35:23 -07:00
danielvincent	b9be543ef6	DG IZ; reshare redirects to specific page	2010-09-22 15:32:11 -07:00
danielvincent	474cf77708	DG IZ; reposting now works. redirects to a template missing page, though.	2010-09-22 15:05:51 -07:00
danielvincent	b019ade588	minor changes from production	2010-09-20 21:50:06 -07:00
danielvincent	f50b70da9e	DG IZ; removed stray mustache	2010-09-20 18:14:12 -07:00
danielvincent	e588d7ab6a	DG IZ moving friends is now ajaxy	2010-09-20 17:26:20 -07:00
danielvincent	40c96fc619	DG IZ; click to edit rollover text on aspect manage page	2010-09-20 15:53:56 -07:00
danielvincent	5a9b0fbd03	tabs rounded	2010-09-19 22:16:58 -07:00
danielvincent	14ad24ba7e	visual tweaks on header. moved upload a file button to header on album#show	2010-09-19 14:27:20 -07:00
MrZYX	7c62a5adf7	fixed drag & drop on aspect manage page	2010-09-19 09:57:58 +08:00
danielvincent	b5a2971302	search results for people now look like the stream	2010-09-18 17:49:52 -07:00
Rick Waldron	535f6ed334	More clean up to decrementRequestsCounter()	2010-09-18 08:05:51 +08:00
Rick Waldron	fcdc1d914c	Cached all reused match selector sets, moved synchronous functions into callbacks where needed for optimization; Moved all DOM manip into $(function () {} )	2010-09-18 08:04:47 +08:00
Rick Waldron	773839308c	Moved .live(...) into $(function() {}) block - DOM logic should not be left to synchronously execute outside of a DOMContentLoaded closure	2010-09-18 08:03:59 +08:00
danielvincent	292a38e694	DG IZ; arrow keys work in fancybox. removed background color change on close button on hover	2010-09-16 18:55:54 -07:00
danielvincent	755e2a744c	DG IZ; dropzones now light up when dragging on aspect page	2010-09-16 17:30:49 -07:00
danielvincent	d74c4bd117	DG IZ; use focus instead of click	2010-09-16 16:47:10 -07:00
danielvincent	0c7ba49e34	DG IZ; aspect deletion	2010-09-16 16:03:18 -07:00
maxwell	649839567d	MS added pagination to the search page	2010-09-16 11:47:34 -07:00
Raphael	708e9f88a5	Spell our own name right	2010-09-15 17:56:18 -07:00
Daniel Vincent Grippi	c1414c5207	flash messages are now colored on session wall	2010-09-15 16:59:44 -07:00
Daniel Vincent Grippi	fe35d60b13	hack on aspect nav for ff & chrome compatability	2010-09-15 11:44:56 -07:00
Daniel Vincent Grippi	ac7fb673c5	show add new friend links on aspect manage page	2010-09-15 11:25:39 -07:00
Raphael	89ac38f630	Sass licenses changed	2010-09-15 11:00:55 -07:00
Raphael	d9eb3abd9d	Merge branch 'master' of github.com:diaspora/diaspora	2010-09-15 10:59:00 -07:00
Raphael	aa3ebe372c	License notices replaced	2010-09-15 10:58:48 -07:00
Daniel Vincent Grippi	73dab4b3ef	fixed stream elements	2010-09-15 10:17:37 -07:00
Raphael	5d303518c2	Adding in COPYRIGHT, AUTHORS, and blueprint attribution	2010-09-15 10:09:42 -07:00
Daniel Vincent Grippi	1d04c89b48	header tweak	2010-09-15 00:39:48 -07:00
Daniel Vincent Grippi	b77260af6b	Decrement request counter on request action	2010-09-14 21:24:57 -07:00
Daniel Vincent Grippi	12e15ba3a1	forgot a paren	2010-09-14 21:17:27 -07:00
Daniel Vincent Grippi	6c2c3d9157	working?	2010-09-14 21:16:16 -07:00
Daniel Vincent Grippi	aaaa10b7e4	more testing	2010-09-14 21:12:56 -07:00
Daniel Vincent Grippi	509c16d953	debugging js	2010-09-14 21:10:10 -07:00
Daniel Vincent Grippi	8a59f3b26e	aspect manage less rounded	2010-09-14 20:42:08 -07:00
Daniel Vincent Grippi	c763a663ac	z-index fix	2010-09-14 20:37:31 -07:00
Daniel Vincent Grippi	f2c6e7b820	made group manage a little nicer	2010-09-14 20:35:30 -07:00
Daniel Vincent Grippi	0782e0b199	Merge branch 'master' of github.com:diaspora/diaspora	2010-09-13 19:54:56 -07:00
maxwell	15651a7bb6	IZ MS group manage page can now add friends to groups	2010-09-13 18:10:07 -07:00
Daniel Vincent Grippi	5ecbb28dc7	Merge branch 'master' of github.com:diaspora/diaspora	2010-09-13 17:57:59 -07:00
Daniel Vincent Grippi	c059069144	albums don't show publisher, refactored css	2010-09-13 17:57:30 -07:00
maxwell	63b3513a12	MS IZ removed the links to the requests index	2010-09-13 16:53:33 -07:00
Daniel Vincent Grippi	0e5ef9e005	more informative 400 and 500 pages	2010-09-13 15:24:15 -07:00
Daniel Vincent Grippi	94765906e0	forgot licenses on javascript files.	2010-09-13 14:43:24 -07:00
Daniel Vincent Grippi	4c15b1a01c	added license to every single goddamn file. also, put one in the root dir.	2010-09-13 14:23:50 -07:00
Daniel Vincent Grippi	3be86c2b5c	fixed tab bug in ff	2010-09-13 11:51:25 -07:00
Daniel Vincent Grippi	6aeaea1b7d	removed some things. also, comment buttons are now css-ified when they come through the socket	2010-09-13 11:42:41 -07:00
Daniel Vincent Grippi	200b0045f7	Merge branch 'master' of github.com:diaspora/diaspora ... Conflicts: public/stylesheets/application.css public/stylesheets/sass/application.sass	2010-09-13 11:22:05 -07:00
Daniel Vincent Grippi	8c80174e73	removed some unneeded sass	2010-09-13 11:16:59 -07:00
Raphael	1312728b88	Merge branch 'master' of github.com:diaspora/diaspora ... Conflicts: public/stylesheets/application.css public/stylesheets/sass/application.sass	2010-09-13 11:16:45 -07:00
Raphael	aa0a00d9cb	Finish moving to aspects, DB reset required	2010-09-13 11:15:08 -07:00
Daniel Vincent Grippi	7579c0ec50	more cleanup	2010-09-13 11:05:10 -07:00
Daniel Vincent Grippi	f5565025cb	removed glyphish icons	2010-09-13 10:44:20 -07:00
Raphael	9837340eb2	Rename files from group to aspect	2010-09-13 10:43:15 -07:00
Daniel Vincent Grippi	a74e00c159	removed hover user menu	2010-09-13 10:40:09 -07:00
Raphael	44a1f82da9	Rename group to aspect	2010-09-13 10:38:38 -07:00
Daniel Vincent Grippi	ede03fe1d5	added graident back into firefox	2010-09-13 10:23:24 -07:00
ilya	3014c4d057	silly little thing	2010-09-12 23:22:20 -07:00
ilya	0896efa5d6	now requests are called requested people, same css but less hacky selection	2010-09-12 22:54:53 -07:00
ilya	3bd686143f	need to send it without data	2010-09-12 22:10:50 -07:00
ilya	593f620216	a tiny change should make the things fadeout	2010-09-12 21:57:15 -07:00
Daniel Vincent Grippi	1874ebe51d	forgot to map to group ids in retraction	2010-09-12 21:33:39 -07:00
ilya	6b7f0888d0	Testing ignore friend request on remote	2010-09-12 19:56:23 -07:00
ilya	9b07c780c3	the acceptance now works need to do the ignores and unfriend bucket	2010-09-11 23:31:43 -07:00
ilya	b1dcc4cf43	testing request acceptance on remote	2010-09-11 21:58:01 -07:00
Daniel Vincent Grippi	db5d000757	made a sticky request link on the bottom of every page	2010-09-11 12:09:55 -07:00
Daniel Vincent Grippi	7fefdd3753	minor cleanup	2010-09-11 08:59:25 -07:00
Daniel Vincent Grippi	266a896bde	mtweaking comments in stream	2010-09-10 23:55:33 -07:00
Daniel Vincent Grippi	95765139d6	link color less morbid.	2010-09-10 23:37:16 -07:00
Daniel Vincent Grippi	9c7e0e3bcb	minor sass tweaks	2010-09-10 23:16:46 -07:00
Daniel Vincent Grippi	0c5ab4f20e	undo for now	2010-09-10 15:44:36 -07:00
Daniel Vincent Grippi	ef6ce98c12	DG IZ alert on dragging a request, trying to check	2010-09-10 15:41:58 -07:00
Daniel Vincent Grippi	d3a8e27833	DG IZ; selector fix	2010-09-10 15:37:59 -07:00
Daniel Vincent Grippi	8afb590128	small fix	2010-09-10 15:28:11 -07:00
Daniel Vincent Grippi	4770616a26	DG IZ; small fix	2010-09-10 15:19:04 -07:00
Daniel Vincent Grippi	82a31228fa	DG IZ; requests bar added to group/edit	2010-09-10 15:07:55 -07:00
Daniel Vincent Grippi	136eb61b02	DG IZ; groups = relations. now you can rename groups in the manage relation page	2010-09-10 14:52:11 -07:00
Daniel Vincent Grippi	5812bbd1f1	removed group name edit madness from javascript.	2010-09-09 09:35:32 -07:00
Daniel Vincent Grippi	a15bf73287	minor textbox css fix	2010-09-08 23:35:07 -07:00
Daniel Vincent Grippi	1c2bfa64a1	cleaned login page resources	2010-09-08 23:30:08 -07:00
Daniel Vincent Grippi	bb30b69685	Merge branch 'master' of github.com:diaspora/diaspora	2010-09-08 20:52:43 -07:00
Daniel Vincent Grippi	134bdab49d	group header now has a page_title field.	2010-09-08 20:52:35 -07:00
maxwell	3cf7938028	MS fixing pagination numbers and couple of other things	2010-09-08 20:51:46 -07:00
maxwell	2ce4fb27fa	MS; removing some dumb user stuff	2010-09-08 20:39:05 -07:00
maxwell	2a9e988b1f	MS fixing the zindex on the search	2010-09-08 20:03:01 -07:00
Daniel Vincent Grippi	e6114e76f5	MS DG more tweaking	2010-09-08 19:39:24 -07:00
Daniel Vincent Grippi	ca780f3560	DG MS; hide debug info by default. also, made the text lighter.	2010-09-08 16:35:30 -07:00
Daniel Vincent Grippi	1e6b309163	DG MS; tweaking top nav and publisher.	2010-09-08 14:34:42 -07:00
Daniel Vincent Grippi	20d5043e81	DG MS; moved tabs around up top	2010-09-08 12:52:28 -07:00
Daniel Vincent Grippi	f7dd0b10b9	DG MS; changed the gear on top nav to not be a tab	2010-09-08 12:34:08 -07:00
Daniel Vincent Grippi	36730978ca	login page is more elegant	2010-09-08 11:37:54 -07:00
Daniel Vincent Grippi	20d9334ce1	DG IZ; changed the photo uploader to drag and drop. now works in firefox.	2010-09-07 17:20:48 -07:00
Daniel Vincent Grippi	41afd86fe7	DG IZ; fixed photos.	2010-09-07 12:03:43 -07:00
Daniel Vincent Grippi	2daa31b7bf	added a line to the bottom of the publisher	2010-09-06 17:28:09 -07:00
Daniel Vincent Grippi	39c366e2e9	group edit button up top.	2010-09-06 17:22:57 -07:00
Daniel Vincent Grippi	48415b4de8	cleaned up group edit a little	2010-09-06 13:01:24 -07:00
ilya	9a4edc419c	DG IZ first commit from the car, now can change groups a couple of times	2010-08-31 22:55:50 -07:00
Daniel Vincent Grippi	7e909d4034	Merge branch 'master' of github.com:diaspora/diaspora	2010-08-31 16:38:52 -07:00
Daniel Vincent Grippi	f9c2e0e76d	moved publisher down.wn. header is now a dark grey instead of black.	2010-08-31 13:07:11 -07:00
ilya	98db03d36e	the group edit resets the data started to reset the from id attr	2010-08-31 10:46:49 -07:00
ilya	82ff7dc4e4	the person bg color now reset to white, need to reset the original group param and reset the moves var so that one can submit again	2010-08-29 20:38:59 -07:00
ilya	9a5f7b4675	IZ now the bg color of the moved people changes to blue and changes back to white when you move them back, still need to reset to white on submit and make it pretty	2010-08-29 20:23:20 -07:00
ilya	990be921f3	added an switch to reset the data if the thing is moved into the original group	2010-08-27 18:17:08 -07:00
Daniel Grippi & Raphael Sofaer	cf161cb8cf	publisher box back up top	2010-08-27 16:09:10 -07:00
Raphael	5ff1bdae90	Groups can now be batch edited	2010-08-27 12:23:20 -07:00
danielvincent	81438678cd	Refactored more photo js out to photos.js. That should be it for that refactor	2010-08-26 17:10:19 -07:00
danielvincent	a886b8ddbc	made photos for album previews 200x200, small thumbnails now at 50x50	2010-08-26 15:13:33 -07:00
danielvincent	239ae048cc	group names are now editable	2010-08-26 15:02:13 -07:00
Raphael	19e8aa5c35	Refactored view js	2010-08-26 11:06:35 -07:00
maxwell	9b690b863a	droping things	2010-08-25 21:53:04 -07:00
Raphael	6d3d37b7c6	Merge branch 'master' of github.com:diaspora/diaspora	2010-08-25 18:20:37 -07:00
Raphael	2c54fee1af	Adding minified jquery	2010-08-25 18:20:21 -07:00
maxwell	a26229223c	Merge branch 'master' of github.com:diaspora/diaspora	2010-08-25 18:07:49 -07:00
Raphael	e714e0d457	Comment sets now pop open on receiving a new comment	2010-08-25 18:00:53 -07:00
maxwell	22f63a4c44	MS IZ added the move friend method	2010-08-25 16:58:07 -07:00
Raphael	be6dc1d443	Delete tinymce	2010-08-25 13:58:16 -07:00
Raphael	2c89a96e79	Merge branch 'master' of github.com:diaspora/diaspora	2010-08-25 13:56:49 -07:00
Raphael	9d2653ecd4	Move some stuff out of document ready	2010-08-25 13:56:38 -07:00
maxwell	c9e64ae209	Merge branch 'master' of github.com:diaspora/diaspora	2010-08-25 13:54:27 -07:00
maxwell	6a613c3304	addded the draggable javascript	2010-08-25 13:53:53 -07:00
Raphael	f8d63052d4	Remove stream lives from ready block	2010-08-25 13:52:59 -07:00
Raphael	17636f4fd2	View modifications, refactored stream javascript to another file	2010-08-25 13:51:16 -07:00
Raphael	c3b75703ac	Merge branch 'master' of github.com:diaspora/diaspora	2010-08-25 11:35:56 -07:00
Raphael	3121cf57d3	Refactored top nav haml, added non-functional gear link next to group	2010-08-25 11:35:50 -07:00
ilya	ea1c3e10ec	forgotten to add the actual images	2010-08-25 10:19:13 -07:00
ilya	75d5f19a7d	added photos to tom and korth	2010-08-25 10:17:31 -07:00
danielvincent	f4b3a2eb3a	more cleaning up of comment box. javascript stuff.	2010-08-24 20:49:32 -07:00
danielvincent	501f98b9e1	fixed comments from not showing. also, touched them up a bit.	2010-08-24 20:13:37 -07:00
Raphael	d3c10f8777	made left column in layout a little wider	2010-08-24 19:02:00 -07:00
Raphael	5779610659	messed with the views	2010-08-24 18:31:16 -07:00
Raphael	3f5df61810	minor tab tweaks	2010-08-24 16:38:42 -07:00
Raphael	de3044fa0a	Remove publisher selection remnants, fix posting	2010-08-24 15:55:35 -07:00
maxwell	204c910f66	MS fixing small bugs, adding a very dump list of a groups that a friend is in for you	2010-08-24 15:47:44 -07:00
maxwell	de335e7366	MS messed with the temporary group picker thing: whatever, it is less annoying	2010-08-24 14:37:47 -07:00
danielvincent	c3cf135a3f	tabs on top	2010-08-24 11:33:20 -07:00
danielvincent	86146d195f	moving stuff around to the header	2010-08-24 11:07:39 -07:00
danielvincent	a8803a1c0b	fixed flash messages	2010-08-23 17:40:59 -07:00
danielvincent	2b125fdc66	fixed left friends bar a bit	2010-08-23 17:00:40 -07:00
danielvincent	1f59d2ccc4	minor ui tweaks	2010-08-23 15:55:19 -07:00
danielvincent	f9a19e679f	made header shorter	2010-08-23 15:27:34 -07:00
danielvincent	41b3117a41	removed that annoying rollover on diaspora text	2010-08-23 15:13:27 -07:00
danielvincent	4e996f8412	user name darker	2010-08-23 14:30:20 -07:00
danielvincent	60b7c30a8a	Merge branch 'master' of github.com:diaspora/diaspora	2010-08-23 14:17:26 -07:00
danielvincent	d874ba3b38	dropdown menu for user	2010-08-23 14:17:05 -07:00
Raphael	5a02f92448	Merge branch 'master' of github.com:diaspora/diaspora	2010-08-23 13:58:46 -07:00
Raphael	ae6f0fdc51	new photo form now loads through ajax	2010-08-23 13:58:33 -07:00
danielvincent	d9c091d3f8	search box in top nav	2010-08-23 12:43:12 -07:00
Raphael	9ef2008613	Remove tinymce init block	2010-08-23 11:59:58 -07:00
danielvincent	2d21ac0460	moving things around	2010-08-23 11:05:28 -07:00
maxwell	361adda6cd	added group picker. sends the right params, but posts only have one group right now so thats a bummer	2010-08-22 22:20:34 -07:00
ilya	21f70c643d	DG IZ; moved update_profile from Person into User. removed notify_people methods. temporarily broke album pushing	2010-08-18 16:15:10 -07:00
ilya	a7a9a98737	DG IZ; forgot to add image for add friend button	2010-08-18 12:28:15 -07:00
ilya	f5811df5b7	DG IZ; added info text to add new friend button	2010-08-18 11:59:20 -07:00
ilya	6c729b382f	fixed some color on the header	2010-08-17 21:50:18 -07:00
Raphael	08de5caf97	make signup page look better	2010-08-17 17:20:29 -07:00
danielvincent	c81ea5a632	minor changes	2010-08-14 00:21:10 -07:00
danielvincent	a7eab9e50c	minor section header tweaks (album stuff)	2010-08-13 23:20:39 -07:00
danielvincent	f7e43ee3d0	photo fancybox indicates progress. unfortunately, it doesn't reset after you close it right now...	2010-08-12 00:27:26 -07:00
danielvincent	013a6d0849	add photo is now in a fancy-pancy box	2010-08-11 20:45:57 -07:00
Raphael	cc070ba168	RS, DG; Removed fancybox gone mad from photo adder	2010-08-10 18:08:27 -07:00
Raphael	a201390123	DG, RS; Added fancybox, made the contextual panes fancyboxes, photo adding is all broken	2010-08-10 17:59:22 -07:00
Raphael	bd7ce5250f	renamed the route for signup. also, removed the link from the login page: get_to_the_choppa	2010-08-10 17:14:58 -07:00
Raphael	37bf5b45f1	RS, DG; You now can't open the photo upload form while photos are uploading	2010-08-10 16:56:19 -07:00
Raphael	9947a2abb8	RS, DG; latest_status thing now works, started putting signup back in	2010-08-10 12:26:43 -07:00
danielvincent	d207c8b955	fixed way too high z-index in album div	2010-08-09 21:27:17 -07:00
danielvincent	36e3cff1b6	resized default user picture to a square and compressed it.	2010-08-09 21:16:43 -07:00
danielvincent	96fa34ea60	changed the pop-up boxes. going to probably switch to fancybox jquery plugin... also, fixed the user page so viewing it doesn't throw an error.	2010-08-09 21:10:11 -07:00
danielvincent	fd8d92a095	moved next/prev links in photo show to be inline with full size link.	2010-08-09 20:23:01 -07:00
danielvincent	acd00c2a59	fixed top right buttons on album page, etc. also, made the image loader simpler.	2010-08-09 20:14:03 -07:00
Raphael	744693e7fb	RS, DG; There is now a add friend box on the front page that passes group idto the app	2010-08-09 17:33:54 -07:00
Raphael	838fec4921	RS, DG; Working on group nav, fixed some stuff in photo	2010-08-09 16:34:06 -07:00
Raphael	aebe7b97c0	DG RS; added groups. can't delete, but can make new ones	2010-08-09 15:58:53 -07:00
Raphael	d71966476b	Merge branch 'group-top' of github.com:diaspora/diaspora_rails into group-top ... Conflicts: app/views/albums/show.html.haml app/views/authors/show.html.haml app/views/layouts/application.html.haml app/views/photos/show.html.haml	2010-08-09 15:09:05 -07:00
danielvincent	6f1a596dff	small color changes	2010-08-06 00:40:44 -07:00
danielvincent	c54d47337b	updated button style	2010-08-06 00:15:22 -07:00
Raphael	b74438a5dc	Made comments a little easier to see, especially on photo show page	2010-08-04 18:12:12 -07:00
danielvincent	75663b2447	DG MS; user can edit photo caption. also, photos have captions.	2010-08-04 16:00:59 -07:00
danielvincent	7afe8e12a0	DG MS; correctly aligned publisher box submit button	2010-08-04 15:39:19 -07:00
Raphael	8abdcf292e	Hamiltom picture	2010-08-04 15:22:45 -07:00
danielvincent	f3bc651359	stuff fades	2010-08-02 19:16:01 -07:00
danielvincent	5030fbb8b5	Merge branch 'master' into group-top	2010-08-02 17:28:17 -07:00
danielvincent	3d5f27fe5a	javascript gets group param for temp testing... friend pictures on group nav displays all people and authors, also for testing	2010-08-02 17:27:45 -07:00
Raphael	74691228d3	RS, IZ; All relevant controllers now create with user.post	2010-08-02 16:32:52 -07:00
danielvincent	3e5cecd532	Merge branch 'master' into group-top ... Conflicts: public/stylesheets/application.css public/stylesheets/sass/application.sass	2010-08-02 16:09:13 -07:00
Raphael	8658276385	Post button back, but needs moving, did latest_message css change in sass	2010-08-02 11:21:48 -07:00
Raphael	d503c6541f	RS; posted statuses now use the websocket to update latest, time is now styled right	2010-08-02 11:13:21 -07:00
danielvincent	5974bf3571	group nav is now links to nothing	2010-08-01 23:26:24 -07:00
danielvincent	19b633d3a3	top nav for groups partially there.	2010-08-01 22:26:56 -07:00
Raphael	dc1a164b67	Removing unused function	2010-07-30 12:42:39 -07:00
maxwell	7a0db375ab	MS added rails 3rc	2010-07-29 09:59:03 -07:00
ilya	6f3e7bc78b	DG IZ; minor tweaks	2010-07-28 17:31:05 -07:00
ilya	03cf61bd7c	new user top bar	2010-07-28 17:04:56 -07:00
ilya	1700ce8e18	DG IZ; tweaks to album index page	2010-07-28 16:12:49 -07:00
ilya	b5b8e29d6a	DG IZ album view page brush up	2010-07-28 15:33:27 -07:00
ilya	3f27e1f67d	DG IZ photo spacing now works	2010-07-28 14:48:28 -07:00
ilya	5723d91dae	DG IZ; moved some buttons around, added album edit page	2010-07-28 14:00:02 -07:00
maxwell	75fd69bc67	MS; pushing weirdy buble thing	2010-07-28 11:14:27 -07:00
maxwell	eb4262dfc7	MS merged master	2010-07-28 11:13:17 -07:00
danielvincent	ef0a2c465d	fixed photo show comment picture bug	2010-07-28 10:06:20 -07:00
danielvincent	e2b5af35c1	minute changes	2010-07-28 00:04:43 -07:00
danielvincent	d710ff6f4a	shadows on album titles on album/index	2010-07-27 23:08:43 -07:00
maxwell	a57727c1fc	Merge branch 'master' of github.com:diaspora/diaspora_rails	2010-07-27 16:18:59 -07:00
maxwell	c41dea1e8b	MS small profile tweaks	2010-07-27 16:18:46 -07:00
danielvincent	7992b1b0e0	delete photo button on photo show page instead of delete album.	2010-07-27 16:10:42 -07:00
danielvincent	e6d2f51675	more visual recovery	2010-07-27 16:08:28 -07:00
danielvincent	fdd1a5d93b	more recovery	2010-07-27 16:04:59 -07:00
maxwell	92cc48beaf	Merge branch 'master' of github.com:diaspora/diaspora_rails	2010-07-27 15:52:50 -07:00
maxwell	3cecbf1511	MS profile page fixes	2010-07-27 15:52:42 -07:00
danielvincent	34291340b2	trying to get back up to speed	2010-07-27 15:50:44 -07:00
maxwell	86e090bac3	MS figured out moz gradient business	2010-07-27 14:34:16 -07:00
maxwell	9c7b3f0c07	Merge branch 'master' of github.com:diaspora/diaspora_rails	2010-07-27 14:23:44 -07:00
maxwell	bdca2348a6	MS IZ profile page has more useful info, but ultimatly kinda ugly	2010-07-27 14:23:31 -07:00
danielvincent	9b0206df1b	forgot to add ui stylesheet	2010-07-27 12:36:05 -07:00
danielvincent	d4ac19e9ce	all form buttons are now using button definition in UI	2010-07-27 12:23:21 -07:00
danielvincent	dbc8f0112e	some misc design cleanup. album page toggle pending.	2010-07-27 12:12:25 -07:00
danielvincent	97daaf81c2	made custom css3 buttons (pending FF compatability; works in webkit for now.)	2010-07-26 21:48:02 -07:00
maxwell	d73d36f162	MS i had broke atom generation in my refactor. now it is fixed	2010-07-26 17:39:48 -07:00
danielvincent	9afb8beb25	Merge branch 'master' of github.com:diaspora/diaspora_rails	2010-07-26 17:04:00 -07:00
danielvincent	ec59b89e83	DG IZ; few changes to uploader. added prefetching to photo prev/next links on photo show page	2010-07-26 16:57:44 -07:00
maxwell	a9b1954ff6	MS status message now updates the big one on the index page...hooray for jquery	2010-07-26 16:27:10 -07:00
danielvincent	087cf47b3f	DG IZ added the JS file	2010-07-26 15:51:30 -07:00
danielvincent	261a7d177d	fixed for real	2010-07-24 11:09:25 -07:00
danielvincent	9ad8e80982	fixed now?	2010-07-24 11:00:35 -07:00
danielvincent	1a51d99ad7	fixed sidebar?	2010-07-24 10:49:01 -07:00
danielvincent	eb15dcb4ce	fixed images on friend sidebar	2010-07-24 10:35:47 -07:00
danielvincent	03e06cb279	person sidebar has a view all; displays user images with names in tooltips instead of text	2010-07-24 10:24:43 -07:00
maxwell	c9709dd1e7	MS put current status back on page	2010-07-24 01:39:15 -07:00
maxwell	8a174d37c7	MS trying a dan-like thing in the publisher	2010-07-23 23:56:41 -07:00
danielvincent	2646a52cbb	header padding fix	2010-07-23 22:40:23 -07:00
danielvincent	4c3a51833f	user name is bigger	2010-07-23 22:35:12 -07:00
danielvincent	e5d298040d	little things	2010-07-23 21:11:21 -07:00
danielvincent	f6fd6bc9e6	added breadcrumb to albums	2010-07-23 20:28:10 -07:00
danielvincent	d93c331615	moved publisher	2010-07-23 20:12:28 -07:00
maxwell	21bd875a3f	MS DG request bar fix, and some other small tweaks	2010-07-21 16:38:33 -07:00
maxwell	695a93ddad	DG MS added basic album traversal	2010-07-21 14:29:58 -07:00
danielvincent	aece0fc1c7	removed duplications used for testing	2010-07-21 00:32:38 -07:00
danielvincent	c01e9846cf	began album index page. added a larger thumbnail on image upload. also, there is one HUGE memory leak somewhere	2010-07-21 00:24:11 -07:00
maxwell	301343ae01	DG MS added basic album support	2010-07-20 21:28:24 -07:00
ilya	2345975f22	DG IZ; fixed show photo always expanding to 100% width	2010-07-20 13:31:01 -07:00
ilya	715a6ae770	Merge branch 'master' of github.com:diaspora/diaspora_rails	2010-07-20 11:50:45 -07:00
ilya	7901791ee3	DG IZ; added simple image picker for edit profile page. currently displays all images uploaded.	2010-07-20 11:50:36 -07:00
maxwell	453d2ee827	RS MS fail. totally made a new bug and fixed it re: resizing	2010-07-20 11:50:23 -07:00
maxwell	e856945a94	RS MS photos are no longer ginormous, and also a small bug where photos were going to the status message show page.	2010-07-20 11:41:50 -07:00
ilya	e08ed8805f	DG IZ photo upload form now with all the others	2010-07-20 10:00:02 -07:00
danielvincent	04eb66b2e6	user has a image url field for user picture	2010-07-16 23:02:24 -07:00
Raphael	501620e9fb	DG RS; fixed some visual bugs. request link now turns red on new request	2010-07-15 18:40:55 -07:00
maxwell	3a785e24fd	removed old jquery ajax form thing we never used but made it into the repo	2010-07-10 10:42:38 -07:00
Raphael	d00798e982	added preventdefault to publisher	2010-07-06 11:49:54 -07:00
ilya	b1ca01edb4	DG IZ text boxes are round in firefox	2010-07-05 20:18:04 -04:00
ilya	e81412f240	fixed header shadows in firefox	2010-07-05 19:59:54 -04:00
danielvincent	b45a72f41b	Merge branch 'master' into color-change	2010-07-05 16:40:00 -07:00
ilya	a009bb1565	Added the expected behavior of fading out the publisher field(s) if content type is clicked again	2010-07-05 05:37:23 -04:00
danielvincent	20b056586d	warming up the page. colors were too cold and non-human before.	2010-07-05 00:02:16 -07:00
danielvincent	33611abeba	Merge branch 'master' of github.com:diaspora/diaspora_rails	2010-07-03 23:39:20 -07:00
danielvincent	0001797850	moved user's name to the right of their picture	2010-07-03 23:39:05 -07:00
Raphael	0c09445919	RS; blur in clear_form	2010-07-03 23:35:10 -07:00
danielvincent	85cee4064b	Merge branch 'master' of github.com:diaspora/diaspora_rails ... Conflicts: public/javascripts/publisher.js	2010-07-03 22:45:56 -07:00
danielvincent	e709eba243	publisher as a faux nav element.	2010-07-03 22:43:11 -07:00
Raphael	a0cdd7cb0e	RS; Refactored publisher, tested it, it seems to work perfectly, but I could be wrong.	2010-07-03 13:26:11 -07:00
Raphael	cae4f832cf	hover fix	2010-07-02 15:28:32 -07:00
Raphael	6ab9904f25	delete js now applies to new things	2010-07-02 15:19:33 -07:00
danielvincent	6ce0f4464f	reverted publisher javascript refactor. working again in chrome.	2010-07-01 20:04:31 -07:00
danielvincent	1616f5573d	DG MS; fixed position of flash message	2010-07-01 19:55:38 -07:00
Raphael	90b750acb2	Renamed jpegs to jpgs	2010-07-01 18:12:00 -07:00
danielvincent	88f0244353	Merge branch 'master' of github.com:diaspora/diaspora_rails	2010-07-01 17:22:30 -07:00
danielvincent	368f550f65	preview text next to diaspora in header	2010-07-01 17:22:24 -07:00
Raphael	80b69fd3ec	Merge branch 'master' of github.com:diaspora/diaspora_rails	2010-07-01 17:13:17 -07:00
maxwell	2b2864b78d	now its just a message for ie 6, 7	2010-07-01 17:12:21 -07:00
Raphael	d9cff39bed	Merge branch 'master' of github.com:diaspora/diaspora_rails	2010-07-01 17:09:49 -07:00
Raphael	51e36b9659	RS, merged publisher refactor	2010-07-01 17:09:35 -07:00
danielvincent	d0560e6c74	Merge branch 'master' of github.com:diaspora/diaspora_rails	2010-07-01 16:57:58 -07:00
danielvincent	d935db7845	newest message font fix	2010-07-01 16:54:27 -07:00
Raphael	a70fbc6a4a	Changed cap script	2010-07-01 16:54:12 -07:00
maxwell	86c6cdcafa	Merge branch 'master' of github.com:diaspora/diaspora_rails	2010-07-01 16:38:51 -07:00
maxwell	ba984009f8	added chrome frame	2010-07-01 16:38:32 -07:00
danielvincent	b25880f04a	Merge branch 'master' of github.com:diaspora/diaspora_rails	2010-07-01 16:25:11 -07:00
danielvincent	03e7071aae	fixed nav list/link deal for firefox, html compliance	2010-07-01 16:24:51 -07:00
maxwell	6f17e5f28f	added chrome frame for ie lameos	2010-07-01 16:17:32 -07:00
danielvincent	c0a744b2ce	owner picture selector in application helper	2010-07-01 15:34:35 -07:00
maxwell	38465c350c	RS, MS; Forms now clear	2010-07-01 11:19:08 -07:00
Raphael	a7659ae902	Marked the problem area in infieldlabels	2010-06-30 21:53:05 -07:00
danielvincent	df6ea31d3d	Merge branch 'master' of github.com:diaspora/diaspora_rails	2010-06-30 13:36:23 -07:00
Raphael	34400594ec	RS, AML; fixed jumping to top of page on comment toggle	2010-06-30 13:29:20 -07:00
danielvincent	f7e4f1db32	Merge branch 'master' of github.com:diaspora/diaspora_rails	2010-06-30 13:12:09 -07:00
Raphael	2b0659e21d	Comment toggle now applies to socketed posts	2010-06-30 08:28:24 -07:00
danielvincent	74aa0debc8	stupid sans-serif bug finally squashed	2010-06-30 00:30:43 -07:00
maxwell	6bc68fb42e	Merge branch 'master' of github.com:diaspora/diaspora_rails	2010-06-30 00:27:30 -07:00
maxwell	dc5b321b62	sorry for the monster commit.... 4 small chores...1) moved tons of dynamic javascript to haml partials in the new js view folder, and moved some of the js that got put in the application layout into view.js 2. set up a static config prefrence loader in initializers, loaded from yaml 3) fixed the top right login text from being pushed over. 4) fixed a bug when no user is on the node and someone hits the landing page.... you still cant create a new user from there, but now at least it doesnt blow up.	2010-06-30 00:27:11 -07:00
danielvincent	a15cd932b6	nevermind, nevermind	2010-06-29 23:47:39 -07:00
danielvincent	8725ea2d57	high box shadow blur kills the client	2010-06-29 23:28:15 -07:00
danielvincent	cf8c669e83	login screen now black.	2010-06-29 23:24:31 -07:00
maxwell	93a4ac6f9c	added favicon from pubsite	2010-06-29 22:14:39 -07:00
maxwell	448fcf8f89	MS RS fixed real name, now profiles are created with a new friend	2010-06-29 20:33:55 -07:00
danielvincent	984f5f62b6	DG IZ; publisher reflects what type is selected	2010-06-29 19:55:50 -07:00
danielvincent	8ff241cdde	DG IZ; all comments hidden by default. linking anchor issue.	2010-06-29 19:00:54 -07:00
danielvincent	7d6783e446	DG IZ; more little changes to UI	2010-06-29 18:00:01 -07:00
danielvincent	0c16038e2d	Merge branch 'master' of github.com:diaspora/diaspora_rails ... Conflicts: app/views/layouts/application.html.haml public/stylesheets/application.css public/stylesheets/sass/application.sass	2010-06-29 17:30:29 -07:00
danielvincent	acc782d5b2	DG IZ; cool labels fade in	2010-06-29 17:27:09 -07:00
maxwell	eebed9d457	fixed publisher in chrome and broke it out to a seperate js file	2010-06-29 17:04:46 -07:00
danielvincent	39a1874ce3	DG IZ; all input fields are now textareas on dashboard page	2010-06-29 16:28:12 -07:00
maxwell	a0a0b9d0ad	fixed stream bull	2010-06-29 15:05:09 -07:00
maxwell	ee9acc5c82	thanks to dan, GS works great now MS RS	2010-06-29 15:00:30 -07:00
danielvincent	67123c664a	Merge branch 'master' of github.com:diaspora/diaspora_rails ... Conflicts: app/views/layouts/application.html.haml	2010-06-29 14:36:46 -07:00
danielvincent	5193a20458	DG IZ; getting there.	2010-06-29 14:34:33 -07:00
maxwell	6532962c1c	trying to get google analytics working	2010-06-29 13:58:36 -07:00
maxwell	60336bd520	trying to get GS working	2010-06-29 13:45:54 -07:00
maxwell	f9d4eff7b0	Merge branch 'master' of github.com:diaspora/diaspora_rails	2010-06-29 12:32:07 -07:00
danielvincent	260805af64	DG IZ; publisher box & profile picture placeholder	2010-06-29 12:25:36 -07:00
maxwell	a683a2c1aa	RS MS added goog analytics	2010-06-29 11:45:41 -07:00
danielvincent	01f048b0a6	Merge branch 'master' of github.com:diaspora/diaspora_rails ... Conflicts: public/stylesheets/sass/application.sass	2010-06-28 22:18:47 -07:00
danielvincent	08d6a46bd8	login page	2010-06-28 22:18:05 -07:00
maxwell	45a9d9e342	moved the silly destory link over a bit	2010-06-28 22:15:52 -07:00
maxwell	46ab63de36	added will pagination action.	2010-06-28 21:56:58 -07:00
danielvincent	5be5d82eb7	Merge branch 'master' of github.com:diaspora/diaspora_rails	2010-06-28 20:42:12 -07:00
ilya	30667a5bc9	The photo	2010-06-28 23:40:34 -04:00
ilya	775aab996a	DG IZ picture in the profile	2010-06-28 23:39:55 -04:00
danielvincent	ab086e5b0e	Merge branch 'master' of github.com:diaspora/diaspora_rails	2010-06-28 20:39:34 -07:00
maxwell	36b5a90d34	MS figured out how to get comments to come thru the websocket. this is super super super hacky, and kind of terrible, but it works	2010-06-28 17:35:38 -07:00
danielvincent	fd082f52bc	fixed stream's sans font showing up on linux.	2010-06-28 12:35:31 -07:00
danielvincent	462bd96189	ui fixup	2010-06-27 16:17:42 -07:00
danielvincent	5be27f33ec	Merge branch 'master' of github.com:diaspora/diaspora_rails ... Conflicts: app/views/layouts/application.html.haml app/views/status_messages/_status_message.html.haml	2010-06-27 10:32:23 -07:00
danielvincent	39e85754d8	nav should be collapsed into a filter list. comments are more clear.	2010-06-26 00:07:21 -07:00
ilya	a7d46bffab	removed socket.js	2010-06-26 02:08:19 -04:00
ilya	f5ecfebcb9	Merge branch 'master' of github.com:diaspora/diaspora_rails	2010-06-25 23:23:44 -04:00
ilya	d4f528bba8	Removed bookmark new page, moved form to index	2010-06-25 23:23:37 -04:00
maxwell	4d65cfab09	MS^2 Added the friends panel to application layout	2010-06-25 19:22:05 -07:00
maxwell	5cade230ac	added silly debug toggle	2010-06-25 15:33:23 -07:00
maxwell	a673e48317	DG MS fixed js for statusmessage	2010-06-23 12:07:22 -07:00
maxwell	671772f901	MS DG added tinyMCE, now a blog is better than a status messsage	2010-06-23 11:58:46 -07:00
maxwell	fba4ce9e3b	DG MS; fixed flash message visual bug	2010-06-23 11:11:58 -07:00
maxwell	5e5dea85a8	pushing small js fixes	2010-06-23 10:25:49 -07:00
maxwell	60fa7e3ac4	view stuffs	2010-06-23 01:26:00 -07:00
maxwell	94de043862	fixed not hardcoded port for websockets	2010-06-22 17:20:07 -07:00
maxwell	4af10a95fa	oops forgot to add jquery_form	2010-06-22 16:44:41 -07:00
maxwell	3064d208eb	added firefox websocket stuffs, only loads if it is not safari or chrome	2010-06-22 14:31:16 -07:00
maxwell	f696ffc3a6	fixed up some views, but some stuff feels like it broke	2010-06-21 16:46:19 -07:00
maxwell	a0417d13af	fixed merge with master	2010-06-21 14:38:38 -07:00
danielvincent	06271d5821	added dumb partial switcher function in dashboard controller	2010-06-21 14:23:59 -07:00
maxwell	655dd64a54	websockets work	2010-06-21 14:12:05 -07:00
maxwell	7bc165d7a0	added js file	2010-06-20 22:11:37 -07:00
danielvincent	26d675af11	some sass cleanup	2010-06-20 18:36:01 -07:00
danielvincent	c542c08e38	simpler	2010-06-20 17:06:10 -07:00
danielvincent	6647ce34ab	status message and bookmark page	2010-06-20 14:52:04 -07:00
danielvincent	aee5f7f04f	took out filler elements	2010-06-20 11:49:05 -07:00
danielvincent	df2b9d6ad4	more shuffling	2010-06-19 14:44:08 -07:00
danielvincent	0c392a0cce	moved nav to bottom header	2010-06-19 03:01:39 -07:00
danielvincent	d1630b6c45	shrink that header	2010-06-19 00:53:42 -07:00
maxwell	8019fc8d31	working websocket	2010-06-19 00:09:58 -07:00
danielvincent	1223011a4f	more semi-drastic changes.	2010-06-19 00:01:25 -07:00
danielvincent	de8d8d5cb5	in the shit	2010-06-18 23:32:47 -07:00
danielvincent	c63eac0fd9	added line delimiters for post stream on dashboard	2010-06-15 22:34:08 -07:00
maxwell	408c2c719d	swaped out js for jquery	2010-06-15 09:53:19 -07:00
maxwell	3eef53892c	DG MS; Dashboard shows the user's most recent update	2010-06-14 17:48:21 -07:00
danielvincent	63f5fe15d6	nav includes users and status messages	2010-06-14 11:55:52 -07:00
danielvincent	5d273ef049	removed stray rails.png file	2010-06-14 11:51:03 -07:00
danielvincent	98abb75097	added blueprint	2010-06-14 11:50:17 -07:00
danielvincent	eaeafd3240	added authentication via devise	2010-06-12 21:56:50 -07:00
maxwell	e068707158	added nifty templates, and started a user model. session model is next	2010-06-12 15:26:37 -07:00
Raphael Sofaer	0390bbde8a	Activerecord this time\!	2010-06-11 10:40:49 -07:00