1626 Commits

Author	SHA1	Message	Date
Raphael	441f75203a	Add autolink and sanitize to show page	2010-09-20 17:33:05 -07:00
danielvincent	9c334e24e4	Merge branch 'master' of github.com:diaspora/diaspora	2010-09-20 17:26:35 -07:00
danielvincent	e588d7ab6a	DG IZ moving friends is now ajaxy	2010-09-20 17:26:20 -07:00
maxwell	24ca139241	MS remove some stray puts	2010-09-20 17:11:07 -07:00
maxwell	2be0cca2cd	MS adding downcase to webfinger lookup	2010-09-20 16:51:02 -07:00
maxwell	e2fc48c9ff	MS being slightly more proper with application helper, and fixing the person search page	2010-09-20 16:44:35 -07:00
danielvincent	b80d75c382	Merge branch 'master' of github.com:diaspora/diaspora	2010-09-20 15:54:07 -07:00
danielvincent	40c96fc619	DG IZ; click to edit rollover text on aspect manage page	2010-09-20 15:53:56 -07:00
maxwell	d8c5541e12	Merge branch 'master' of github.com:diaspora/diaspora	2010-09-20 15:32:26 -07:00
maxwell	cb0f0b72eb	MS removed a log and trying to be slightly more pedantic	2010-09-20 15:32:18 -07:00
danielvincent	fb2f027b24	DG IZ; escape regex characters in Person.search	2010-09-20 15:25:19 -07:00
danielvincent	9787c45159	Merge branch 'master' of github.com:diaspora/diaspora	2010-09-20 15:15:53 -07:00
danielvincent	5bb4ee5d36	DG IZ; posting now ensures aspect ownership.	2010-09-20 15:15:37 -07:00
maxwell	5e2fdedf8b	MS removed another logging of encrypted data....	2010-09-20 15:07:30 -07:00
danielvincent	4fe4326ed1	DG IZ photo uploading now works	2010-09-20 15:00:02 -07:00
danielvincent	aa2ea3f300	Merge branch 'master' of github.com:diaspora/diaspora	2010-09-20 13:18:21 -07:00
danielvincent	af9cda52af	DG IZ; always query through the current_user in the controllers.	2010-09-20 13:18:11 -07:00
Arnaud Delcasse	eeb132d825	Writing "Already friends" instead of proposing to add people that we already added successfully or accepted in the search results.	2010-09-21 03:20:06 +08:00
danielvincent	b097f93bf5	Merge branch 'master' of github.com:diaspora/diaspora	2010-09-20 11:39:17 -07:00
maxwell	5d1fdcaf3a	MS fixing bug #67. stripping whitespace from search	2010-09-20 11:38:24 -07:00
danielvincent	fe306b37ab	DG IZ; mass-assignment quick-fix in controllers	2010-09-20 11:30:27 -07:00
maxwell	64d371d9d6	MS added a warning for account	2010-09-20 11:30:08 -07:00
Ariel Zavala	db7ad16503	Added localization to comments views	2010-09-21 02:03:51 +08:00
Ariel Zavala	6501974f30	added more translations missing on views	2010-09-21 01:43:54 +08:00
TJ Peden	e6c8cf20d3	Fixed receive_url problem	2010-09-21 01:26:51 +08:00
maxwell	5bf6d358a4	MS added small log for when user is found from webfinger	2010-09-19 20:40:03 -07:00
maxwell	07d2de6646	removed an annoying log of encrypted salmon.	2010-09-19 20:36:39 -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
danielvincent	b40b81e447	aspect manage tab now reads 'manage aspects'	2010-09-19 10:11:41 -07:00
Ariel Zavala	e9f74675e9	Merged with diaspora; fixed conflicts; only 2 red	2010-09-19 11:16:00 -04:00
danielvincent	cc4e9f8d39	description text for all boxes in manage page. search box text defaults to query on people#index.	2010-09-18 17:56:26 -07:00
danielvincent	b5a2971302	search results for people now look like the stream	2010-09-18 17:49:52 -07:00
danielvincent	08f833ba7a	case insensitivity on search	2010-09-18 17:21:18 -07:00
danielvincent	e9a3f46fbd	fixed query function to go through mongomapper instead of custom	2010-09-18 16:42:07 -07:00
Aria Stewart	45b6ff53f1	Ruby 1.9 fixes	2010-09-18 16:35:48 -06:00
mishudark	c46ad0d7fa	photo description with ajax request	2010-09-18 12:33:22 -05:00
mishudark	b7bc4b8615	prevent next prev when youre add writting	2010-09-18 04:14:44 -05:00
mishudark	910bd71c78	prevent photho redirect next,prev if textarea has focus	2010-09-18 03:32:37 -05:00
Ariel Zavala	58c2d0dd28	merged with diaspora master; this fork has spanish, german and french translations (need some help with the last two)	2010-09-18 02:21:45 -04:00
Don Park	2d16289e46	use photos_path to generate the correct POST destination for photo uploads	2010-09-18 07:50:12 +08:00
Patrick Aljord	182c6228f3	show comments ordered by created_at, they are showing up at random order without that	2010-09-18 07:36:21 +08:00
Ariel Zavala	4558f9901e	Added translations to photos and registrations controllers	2010-09-17 18:25:36 -04:00
Raphael	84789f64c9	scope album queries through user	2010-09-17 14:57:14 -07:00
Ariel Zavala	ce3284f1a1	Merge branch 'master' into i18n	2010-09-17 17:28:55 -04:00
Ariel Zavala	7bb3d9c87a	Merge branch 'master' of http://github.com/diaspora/diaspora	2010-09-17 17:21:29 -04:00
Ariel Zavala	c1c20e14f7	Added translations to requests controller	2010-09-17 17:05:54 -04:00
Ariel Zavala	f95cebcb8b	Added translations to new requests view and aspects controller	2010-09-17 16:38:50 -04:00
Raphael	b3549c79f4	Give slightly more specific error message	2010-09-17 12:49:49 -07:00
Ariel Zavala	cb145c346a	Added I18n translations to helpers	2010-09-17 15:30:02 -04:00
Ariel Zavala	0014024870	Added I18n translations to helpers	2010-09-17 15:26:31 -04:00