1626 Commits

Author	SHA1	Message	Date
Dorian	6ffc03a4c9	Big clean up: delete trailing whitespace	2010-09-26 12:48:40 -04:00
Stephen Caudill	fd69f0201f	User creates an aspect	2010-09-26 12:05:39 -04:00
Guillermo	86cbce288b	Isn't necessary prepare URL if file is saved in S3	2010-09-26 11:05:17 -05:00
Guillermo	8a92f15948	storage isn't required here since is set in initializer	2010-09-26 11:04:19 -05:00
Uiri	151a57cc93	well, that explains why it was adding the url variable. Fixed so that now new pictures work too.	2010-09-26 11:47:34 -04:00
Sarah Mei	17757a2e2d	Merging upstream changes	2010-09-25 15:57:59 -07:00
Uiri	e8d6fb26e7	Merge branch 'master' of git://github.com/diaspora/diaspora	2010-09-25 18:30:15 -04:00
Uiri	0b19b77b5f	A fix for the image breaking if you don't change anything on the edit profile page but hit update profile instead of cancel	2010-09-25 17:34:13 -04:00
Stephen Caudill	536cea5e44	Remove consecutive empty lines	2010-09-25 12:06:39 -04:00
Sarah Mei	e3ec00595d	Cleaned up file path joining in some of the dev utilties. ... Backfilled tests where necessary to make sure changes didn't break existing code.	2010-09-25 04:34:48 -07:00
Chiggins	f74b0a6f2c	Added "shadow text" to caption text field while editing a photo, since about every other text field has "shadow text".	2010-09-25 08:13:16 +08:00
Raphael	f4d18ce9bc	don't use request.host as data	2010-09-24 17:12:18 -07:00
ilya	f38bcc9eb3	tiny change in view	2010-09-24 15:54:53 -07:00
ilya	e414558f79	passing the right things to the partial	2010-09-24 15:52:29 -07:00
Raphael	999d229225	Post photos in either 1.8.7 or 1.9.2	2010-09-24 15:18:30 -07:00
Raphael	004e659ee1	fix album posting	2010-09-24 15:10:49 -07:00
ilya	c7757a302c	typo	2010-09-24 15:06:48 -07:00
ilya	ac9854596f	fb_status partial rendered in public	2010-09-24 15:04:31 -07:00
ilya	bb58678556	added a fb_status model & parser method	2010-09-24 14:41:31 -07:00
Raphael	950c6a7cab	Merge branch '1.9.2' into HEAD ... Conflicts: app/models/photo.rb	2010-09-24 14:36:00 -07:00
Raphael	40120bb441	Moving to activemodel validations	2010-09-24 11:15:39 -07:00
ilya	82b99decbb	putting the token in the warden session	2010-09-24 10:45:27 -07:00
Raphael	b9bff76054	Initial 1.9.2, specs fail (possibly validatable), need to pull in aredridel photo fixes	2010-09-24 09:49:42 -07:00
Raphael	70a22ae839	Merge branch 'master' into HEAD ... Conflicts: app/models/post.rb app/models/user.rb config/initializers/socket.rb	2010-09-24 09:15:10 -07:00
danielvincent	4f17eb4e02	stray aspect name removed from publisher	2010-09-23 20:33:34 -07:00
ilya	a594c9a34f	friends in the public bucket	2010-09-23 20:19:02 -07:00
danielvincent	265753b5fe	user edit is now divided into real sections	2010-09-23 20:13:07 -07:00
ilya	eaea26e58d	the public aspect is now set in application controller	2010-09-23 19:33:33 -07:00
ilya	796f198d8c	notification only on user page	2010-09-23 17:20:55 -07:00
ilya	11dc225311	removed the old publish box	2010-09-23 17:19:43 -07:00
Raphael	16b6fc6cdc	Don't give exception on webfinger with no query	2010-09-23 17:18:34 -07:00
ilya	75e1ddf9d2	saying going to FB in public aspect	2010-09-23 17:17:18 -07:00
ilya	0d71a1896c	posting to FB from public now works	2010-09-23 17:11:42 -07:00
ilya	107fb58917	added a logger statement	2010-09-23 17:04:27 -07:00
ilya	d7833c66b2	typo	2010-09-23 16:48:58 -07:00
ilya	4d2bd52310	public aspect param on statusMessage create and in the partial	2010-09-23 16:41:05 -07:00
Raphael	d748d456b5	Revert "fix in person partial" ... This reverts commit 8c0bc4b9e6.	2010-09-23 16:21:08 -07:00
ilya	be10681945	IZ tying the publisher to fb in public aspect	2010-09-23 16:06:55 -07:00
ilya	fc2cf4fde6	typo	2010-09-23 15:21:15 -07:00
ilya	1fdbc637d1	trying profile pictures on remote	2010-09-23 15:18:29 -07:00
ilya	19c3a5ce4b	fetching friend data	2010-09-23 15:07:07 -07:00
ilya	f0999628ae	trying to get friends from fb	2010-09-23 14:43:08 -07:00
ilya	5857838a0a	adding the new files	2010-09-23 12:29:00 -07:00
ilya	48c212c1ab	made a public view, copied the fb publisher there	2010-09-23 12:18:26 -07:00
danielvincent	af91eb51b4	Merge branch 'master' of github.com:diaspora/diaspora	2010-09-23 10:49:41 -07:00
danielvincent	8c0bc4b9e6	fix in person partial	2010-09-23 10:49:35 -07:00
maxwell	40d736d233	MS changed the session page to show APP_CONFIG[:terse_pod_url]	2010-09-23 10:39:47 -07:00
maxwell	457be4385b	Merge branch 'master' of github.com:diaspora/diaspora	2010-09-23 10:39:04 -07:00
danielvincent	5d0f4dd587	Merge branch 'master' of github.com:diaspora/diaspora	2010-09-23 10:29:50 -07:00
Raphael	95396cd9b2	Merge branch 'master' of github.com:diaspora/diaspora	2010-09-23 10:24:17 -07:00