1762 commits

Author	SHA1	Message	Date
danielvincent	a7823485c7	made http calls synchronous. messagehandler enqueues POSTs into resque.	2010-12-03 15:26:52 -08:00
maxwell	f4fa3191bc	just call Jobs::Receive directly for now	2010-12-03 15:03:32 -08:00
Philip Champon	2633dbc268	Issue 658: user object creation comes before person object creation, ... preventing spurrious handle creation errors, if user creation fails	2010-12-03 14:59:35 -05:00
danielvincent	71cae6b89f	Move request mail into resque	2010-12-03 11:51:04 -08:00
maxwell	c43077d318	fixed twitter, added logging for constants, added job for local recieve	2010-12-03 11:34:42 -08:00
MrZYX	dd326699bd	changed back consumer_token to consumer_key as its not only more consistent with twitters website it also causes less support (less users complaining that their twitter integration is broken) :)	2010-12-03 16:04:37 +01:00
Raphael	3ee246d873	Merge branch 'resque-receive' ... Conflicts: Gemfile.lock	2010-12-02 19:42:05 -08:00
Raphael	2e87bece60	Final fixes for person socketing	2010-12-02 19:03:15 -08:00
maxwell	579a288351	public posts are now accessible by your friends, and facebook and twitter include a permalink. we prob want to link shorten these bad boys(and it has a max length of 140 chars, with a permalink), also, facebook and twitter posting are sync, but that will make it more reliable	2010-12-02 18:48:50 -08:00
maxwell	11f04a060e	frustrated	2010-12-02 18:48:50 -08:00
maxwell	38d9d75162	posts now have public permalinks	2010-12-02 18:47:48 -08:00
Raphael	07fdabbbd4	Seperate queues for jobs	2010-12-02 15:34:54 -08:00
Raphael	8798f05ff7	Revert "Revert redis merge to fix bugs on master" ... This reverts commit 30698d674b.	2010-12-02 15:33:26 -08:00
Raphael	30698d674b	Revert redis merge to fix bugs on master	2010-12-02 15:20:27 -08:00
Raphael	c76f38ca23	Write webfinger job for search	2010-12-02 12:35:26 -08:00
Raphael	6cfa6577a5	Add first resque job	2010-12-02 12:35:26 -08:00
Raphael	db0106f13c	Rename EMWebfinger to Webfinger, clean up some related things	2010-12-02 12:35:25 -08:00
maxwell	be00a2f1b3	webfingering is now syncrounous	2010-12-02 12:35:25 -08:00
maxwell	119599bfeb	Revert "Commented-on posts bubble up to the top" ... This reverts commit 6da410079b.	2010-12-02 09:51:26 -08:00
Raphael	6da410079b	Commented-on posts bubble up to the top	2010-12-01 15:38:56 -08:00
Raphael	c07b9b1874	Fix rest of specs	2010-12-01 15:38:56 -08:00
Raphael	199eb8945d	clean up posting spec, move socket_to_uid into add_to_streams	2010-12-01 15:38:56 -08:00
Raphael	836b5685f7	Change prune_aspect_ids to aspects_from_ids, seperate out non-backgroundable piece of posting from dispatch_post	2010-12-01 15:38:56 -08:00
Raphael	e63a29be64	Change v_aspect_ids to prune_aspect_ids	2010-12-01 15:38:55 -08:00
maxwell	7fc9d239b9	you can no longer send a request to yourself at the Request model level	2010-12-01 11:37:54 -08:00
Hexagon	5651ea1d33	Merge branch '619-gender-aware-translations' of https://github.com/siefca/diaspora into siefca-619-gender-aware-translations	2010-12-01 19:13:39 +01:00
Paweł Wilk	279b08ae4a	Added inflection of nouns by the grammatical gender for some languages. ... - New module I18n::Backend::Genderize keeps configuration and adds :gender option to translate(). - Module methods in Genderize allow fast checking if language needs gender and guessing gender. - jQuery in views/users/edit.html.haml shows and hides grammatical gender select list when needed. - Span and select list in views/users/edit.html.haml allows to choose grammatical gender. - Key :grammatical_gender in User model keeps grammatical gender information. - Added some methods to language_helper.rb. - UsersController is aware of grammatical gender and is able to guess it when "getting started".	2010-12-01 17:29:04 +01:00
Josh Lubaway	ecd1d2ecd6	Bug #624 Can't unset birthday ... This change allows users to "unset" their birthday. Previously the logic checked to see if all values for birthday were present (year, month, day). If all values were present the update would proceed. Now, there is another condition. If all values are empty, then also proceed with the update. Thus, allowing a user to "unset" their birthday.	2010-11-30 21:23:47 -08:00
maxwell	ec05c21472	profile now knows about three images sizes, even in federation case	2010-11-30 13:40:41 -08:00
danielvincent	828635def9	Person#real_name -> Person#name	2010-11-30 13:01:53 -08:00
Raphael	fce428826c	Try to take photos query out of views	2010-11-29 23:41:03 -08:00
maxwell	e0efaa6317	made the checking for already connected more explicit. also, the check itself had a bug when we were calling self.to_id on a request, rather than self.to.id	2010-11-29 10:57:54 -08:00
danielvincent	c35be73978	added pending specs. traced the whole comment thing -- it works, but i couldn't figure out how to make these pending specs pass (re: should_receive)	2010-11-28 18:51:27 -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	f59c6e2427	refactored comments to work like status_messages in the controller. weird stuff was happening when using EM::next_tick; holding off on that for now.	2010-11-27 23:06:34 -05:00
Raphael	7ca124c002	Refactor views to not be so dumb.	2010-11-27 21:27:27 -05:00
Raphael	e8310f2a19	Take benchmarks out of real_name, memoize it	2010-11-27 18:04:31 -05:00
Raphael	cedf4302a7	real_name takes time	2010-11-27 17:43:07 -05:00
Raphael	7030ed0fed	Putting youtube titles back into status messages	2010-11-27 11:43:24 -05:00
Raphael	d5d4a08f03	Start moving youtube title getting into the post/comment flow	2010-11-27 01:00:47 -05:00
danielvincent	ce63e13eca	aspect ids normalized to posts to minimize queries on views.	2010-11-26 18:55:06 -05:00
Raphael	3a24eb900d	Refine log lines	2010-11-26 13:02:52 -05:00
Michael Sofaer and Raphael Sofaer	b54164cef8	Don't do expensive things on invalid users	2010-11-26 11:55:54 -05:00
danielvincent	94d08954d9	401 -> 406 in controllers resolving http basic auth prompt on failed comment/status message creation. fixed status message validation.	2010-11-26 00:19:19 -05:00
Raphael	a061999e30	Don't inspect people in logging statements	2010-11-25 18:03:34 -05:00
Sarah Mei	287b79ab17	Merge branch 'master' of github.com:diaspora/diaspora	2010-11-24 22:09:25 -08:00
Sarah Mei	aa4a61870c	you can click on photos in manage aspects to see profiles	2010-11-24 22:09:14 -08:00
Raphael	12c049fec2	Add logging to inviting	2010-11-25 01:06:25 -05:00
zhitomirskiyi	9ca54a2282	accepting an invitation correctly adds the request to the user	2010-11-23 18:58:26 -08:00
zhitomirskiyi	546e7876d5	correct logging of the invitation acceptance	2010-11-23 11:46:45 -08:00
zhitomirskiyi	ebaf2c081e	returning nothing on empty query and limit the returning of the query to 90	2010-11-23 10:02:01 -08:00
Raphael Sofaer	31a851e787	No guarantees on functionality here, editing from a browser.	2010-11-23 06:14:36 -08:00
maxwell	da16e3ee1e	PALINDROME invite form can now take comma seperated multiple emails, so you only have to click the box once	2010-11-23 00:08:30 -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	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	9a18b7e6f3	photo show pages display comment streams for their original post. pending spec to do this *correctly* on the model level.	2010-11-22 00:32:46 -08:00
danielvincent	c841a47a37	status messages validate on presence of message OR one or more photos. took gifs out of carrierwave's whitelist, SORRY JAMIE.	2010-11-21 23:42:49 -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	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	769c0e1055	DG MS trying to finish statusmessage refactor	2010-11-21 16:13:01 -08:00
maxwell	ea7bdfde28	fix validation and order of status message sent	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	fb0dc2db7e	added photos to status messages	2010-11-21 16:13:00 -08:00
maxwell	7fb751b00c	making photo uploader work better	2010-11-21 16:11:55 -08:00
Raphael	655e92ebdd	Add some scopes for Request, take putses out of specs	2010-11-18 18:04:29 -08:00
zhitomirskiyi	d0d261fdae	zero default invites, the rake task starts people with 5 invites	2010-11-18 16:23:35 -08:00
maxwell	970d56a007	basic batch inviter	2010-11-18 15:17:22 -08:00
Raphael	4853a55d9b	Don't expect raises from user receive	2010-11-17 15:35:25 -08:00
Raphael	6c97899d5d	Add logging statements, rescue callbacks in em-webfinger	2010-11-17 13:55:58 -08:00
Raphael	7876da8fb8	Refactor raises in requesting to validations in request, move to better controller structure	2010-11-16 16:18:16 -08:00
Sarah Mei	44bd4534ce	I found where we needed the one-line addition. Ruby 1.9 build now works. ... I feel pretty badass.	2010-11-15 22:44:55 -08:00
Raphael	248e768846	search now sockets a person	2010-11-15 19:13:45 -08:00
Raphael	1b39b79446	Make invitation view with no inviters sensible	2010-11-15 16:35:00 -08:00
Raphael	03eea3fc08	Class not class_name	2010-11-15 11:49:16 -08:00
Raphael	2ad74d397c	fix build	2010-11-13 19:05:12 -08:00
danielvincent	60b272b243	remove validations on url for now to support ip addresses in pod_url field in app_config.yml	2010-11-13 14:55:40 -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
Raphael	390fffdee6	Fix new request view	2010-11-09 15:03:56 -08:00
Raphael	6dd58fe875	Specs pass again, invitations moved to Invitation model, refactor possibly complete	2010-11-09 14:07:26 -08:00
Raphael	4818973643	Beginning to refactor invitations into an Invitation class	2010-11-09 14:07:26 -08:00
Raphael	71ab919ad3	Remove urls from requests, invitations are broken	2010-11-09 14:07:26 -08:00
Raphael	70af10ee62	user#friends is now a many-foreign_key assoc, rather than a many-in	2010-11-08 15:19:23 -08:00
zhitomirskiyi	e50f29b032	the profile cannot massassign diaspora handle	2010-11-08 15:10:23 -08:00
maxwell	4a39d1a516	date now has a default nil value	2010-11-05 17:38:51 -07:00
maxwell	e4f8f558a0	aspects now have a max length of 20 characters	2010-11-05 17:18:20 -07:00
danielvincent	3ed10a22ff	xml_accessor creates attr_accessors in addition to xml_readers	2010-11-05 14:25:45 -07:00
Raphael	6468f0003b	Take out some xml accessors	2010-11-05 14:24:56 -07:00
maxwell	cc92f61583	mailer queue now works	2010-11-05 11:58:25 -07:00
Raphael	4eba0595f9	Fix 328 profile images dying, thanks to theBernd	2010-11-04 18:46:15 -07:00
Raphael	f6d899f1d9	Move prep_image_url into profile image_url setter	2010-11-04 18:46:15 -07:00
danielvincent	f4dba54ff3	posting to a person with a user on the same pod will send internally, skipping the http queue and encryption.	2010-11-04 15:33:16 -07:00
zhitomirskiyi	7f5b98a6cb	the photo image url is now randomized	2010-11-04 14:37:08 -07:00
danielvincent	9da7272e59	should query the correct collection on perform	2010-11-04 12:58:24 -07:00
danielvincent	b33aa9a0fb	retracting on a non existant post does not raise a permissions error.	2010-11-04 12:43:26 -07:00
danielvincent	82c82b8ccc	killed albums	2010-11-04 10:17:19 -07:00
Raphael	03b272db60	Requests are no longer tracked by id across servers, DELETED USELESS PUTS IN EM-WEBFINGER SPEC	2010-11-03 15:26:58 -07:00
zhitomirskiyi	0ac4c5b04f	IZ MS refactored invites to use user.build	2010-11-03 13:16:45 -07:00
Raphael	d5a4de58b3	User#post is now like a future controller, Photo#instantiate no longer saves	2010-11-02 19:16:02 -07:00
Raphael	1c67211ebc	Move post dispatching to dispatch_post	2010-11-02 19:16:02 -07:00
maxwell	0ecc27a935	MS IZ posts should now update	2010-11-02 18:56:00 -07:00
maxwell	4de89df4dc	MS IZ setting the diaspora handle in photo instantiate	2010-11-02 18:32:02 -07:00
maxwell	2f1fbaf686	temp. logging statement	2010-11-02 17:52:04 -07:00
danielvincent	e9f3efea79	person searchable by diaspora_handle	2010-11-02 16:48:58 -07:00
maxwell	8c89f8d87a	Merge branch 'master' of github.com:diaspora/diaspora	2010-11-02 16:42:52 -07:00
maxwell	51d419f41a	removed diaspora handle method from user	2010-11-02 16:42:37 -07:00
Raphael	a5dedc9bdb	User.build no longer saves people, user now has attr_accessible	2010-11-02 16:28:55 -07:00
danielvincent	da8124f8a7	hcard has searchable field, and is taken in to account when building Person from webfinger	2010-11-02 16:12:43 -07:00
danielvincent	fff43bf650	profile defaults key searchable to true. search takes searchable into account.	2010-11-02 16:12:42 -07:00
maxwell	c3d0c78bd1	Merge branch 'master' of github.com:diaspora/diaspora ... Conflicts: lib/diaspora/user/receiving.rb	2010-11-02 12:46:08 -07:00
maxwell	19bbf8ce4d	IZ MS; fixed post update. Posts which implement the mutable? method now can be updated via receive	2010-11-02 12:38:30 -07:00
Raphael	9d71ed1120	Merge remote branch 'robustdj/453-aspect-labels' ... Conflicts: app/models/user.rb pkg/ubuntu/dist	2010-11-02 11:31:51 -07:00
Raphael	7fdd0475ae	robustdj's specs now green	2010-11-02 11:27:51 -07:00
danielvincent	a3ce5f1cd7	REMOVED IMPORTER	2010-11-02 11:17:47 -07:00
Sarah Mei	dc97c852f4	Person delegates first_name and last_name to profile.	2010-11-01 22:22:15 -07:00
maxwell	15d6cff837	MS IZ everything now uses diaspora handle. this feels so good	2010-11-01 18:42:42 -07:00
maxwell	06445901f8	IZ MS retrations for posts now green	2010-11-01 17:11:06 -07:00
danielvincent	f6b4be97a3	requests are almost there	2010-11-01 14:54:40 -07:00
Raphael	9d273c6d24	Now expecting a 500 on someone passing an id to create, should really be a 422	2010-11-01 12:31:00 -07:00
Raphael	6c0b187d40	Merge remote branch 'jwinky/446-user-name-length-limit' ... Conflicts: app/models/user.rb	2010-11-01 11:00:02 -07:00
Derrick Camerino	1a03dd799a	showing aspect labels when posting status messages	2010-10-31 23:26:04 -07:00
danielvincent	3f7955f978	removed two unused methods	2010-10-31 14:50:14 -07:00
danielvincent	b08c4fb84e	removed user#aspect method. all aspect creation should be scoped through the user -> aspect association proper: user.aspects.create(opts)	2010-10-31 12:34:26 -07:00
Raphael	5f85cf2588	Simplifying validations a little	2010-10-29 17:26:28 -07:00
Raphael	05cd57b02c	Merge branch 'master' of github.com:diaspora/diaspora	2010-10-29 16:56:40 -07:00
Raphael	555c15dfef	Simplify validations on user	2010-10-29 16:56:04 -07:00
danielvincent	5a9bfa7405	DG IZ; post senders are now verified by diaspora handles	2010-10-29 16:49:59 -07:00
Raphael	3d2dd073ea	Take diaspora_handle out of user	2010-10-29 15:52:54 -07:00
maxwell	a7b3fc48ec	https is now a valid url for people. thx grippi	2010-10-29 12:30:38 -07:00
Raphael	d753e31205	Merge remote branch 'ed0h/309-user-choose-language' ... Add explicit language set to spec in users_controller_spec.rb Conflicts: app/models/user.rb	2010-10-29 12:06:14 -07:00
maxwell	8fe339b03b	EM websocket cleanly merged with master. webfingering is now async	2010-10-29 11:05:17 -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
Sarah Mei	14fedf5369	GAHHH STOP EMAILING ME (specs pass) ... Also, added attr_protected to Photo#person and Photo#person_id.	2010-10-29 00:59:26 -07:00
Justin Wienckowski	cdcb693c95	Issue #446: Adding 32-character length limit to User#username, Profile#first_name, Profile#last_name	2010-10-28 21:12:36 -07:00
Raphael	f1ae95fac9	443- patch trim on validation + spec	2010-10-28 20:03:49 -07:00
Raphael	512f40eac2	attr_accessible on Post	2010-10-28 15:50:19 -07:00
zhitomirskiyi	55b38585d6	Merge branch 'master' of github.com:diaspora/diaspora	2010-10-28 12:13:50 -07:00
zhitomirskiyi	f484eb957f	comments now don't imbed the person in the xml	2010-10-28 12:13:39 -07:00
danielvincent	bb9a6e47a4	added birthday and gender to Profile. fixed a view issue on getting_started#2	2010-10-28 11:01:16 -07:00
livefromthemoon@gmail.com	c4d8f4e587	remove two useless lines of code	2010-10-28 17:38:45 +02:00
livefromthemoon@gmail.com	b7a586b1a5	allow user to change his language in his settings	2010-10-28 17:29:17 +02:00
danielvincent	59858cd86b	opts[:person] set to empty hash only if not already defined. same with opts[:person][:profile]. rake db:reset works properly again.	2010-10-27 18:34:51 -07:00
danielvincent	1d5b7a87f1	Merge branch 'master' into getting-started	2010-10-27 18:14:08 -07:00
danielvincent	05c5e770ee	removed real name from signup process.	2010-10-27 16:25:22 -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
zhitomirskiyi	63c740fce7	Merge branch 'master' of github.com:diaspora/diaspora into contact-refactor	2010-10-27 09:53:50 -07:00
Raphael	aa819d2113	Putting an index on Person#diaspora_handle	2010-10-26 19:16:16 -07:00
zhitomirskiyi	fa484e95e4	MS IZ refactored querying	2010-10-26 17:05:38 -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
zhitomirskiyi	1024b8a3a7	Merge branch 'master' of github.com:diaspora/diaspora into contact-refactor ... Conflicts: app/controllers/aspects_controller.rb	2010-10-26 14:57:52 -07:00
zhitomirskiyi	8acdf21234	MS IZ got rid of the requests for me scope in the user	2010-10-26 14:49:37 -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
zhitomirskiyi	e776389d19	Merge branch 'master' of github.com:diaspora/diaspora into contact-refactor	2010-10-26 11:19:50 -07:00
danielvincent	060d8f9c7b	DG MS; fixed some bugs with posting publicly.	2010-10-25 19:24:48 -07:00
zhitomirskiyi	917d1838de	MS IZ specs are green	2010-10-25 18:55:51 -07:00
danielvincent	287d633c44	user#post now handles posting to services.	2010-10-25 17:41:59 -07:00
danielvincent	b2e8ebd0bc	OmniauthService -> Service. Cleaned up views.	2010-10-25 17:41:59 -07:00
maxwell	c489f49a25	DG beginning to collapse twitter&facebook	2010-10-25 17:41:58 -07:00
maxwell	154b6e0ee7	MS DG added specs for posting to twitter, and basic services controller tests	2010-10-25 17:41:58 -07:00
maxwell	606c7a02a4	MS DG public message now post to twitter, if connected	2010-10-25 17:41:58 -07:00
maxwell	c4ff07b09a	twitter oauth dance complete	2010-10-25 17:41:58 -07:00
maxwell	b17ae0bf38	DG MS removed unused fb_status model and respective specs, fixtures.	2010-10-25 12:26:08 -07:00
ilya	c27f05ed42	Initial refactor done, need to stop mapping user.friends to people so much	2010-10-22 18:11:04 -07:00
ilya	7083d2aa03	Moving friendships into a 'Contact' proxy object.	2010-10-22 18:11:04 -07:00
maxwell	606a6bb43a	status message length is limited to 1000 chars.	2010-10-22 17:42:59 -07:00
maxwell	6913381781	username now can only contain letters numbers, periods, and underscores	2010-10-22 17:26:10 -07:00
maxwell	6720fa2c59	added tests to make sure Person.by_webfinger only returns exact matches	2010-10-22 16:28:03 -07:00
maxwell	837b418201	reverting, going to write a test	2010-10-22 15:37:22 -07:00
maxwell	bcec2d04e6	do not pass in the diaspora handle query as a regex, we want to search on the string literal. also use dynamic finder	2010-10-22 15:27:59 -07:00
Raphael	fe1a6bce20	Attr-accessible on aspects, check whether built user is persisted	2010-10-21 12:49:50 -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	65ffe2ecdd	Merge branch 'master' of github.com:diaspora/diaspora	2010-10-20 12:19:24 -07:00
danielvincent	61122b83d0	make profile button on photo show page. (removed clean hash on usercontroller)	2010-10-20 12:19:06 -07:00
ilya	e6de6179e9	MS IZ dependant destroy is back for aspects	2010-10-20 11:47:09 -07:00
ilya	992bd42b55	Merge branch 'master' of github.com:diaspora/diaspora ... Conflicts: spec/models/aspect_spec.rb	2010-10-20 11:30:06 -07:00
ilya	ea1ab59c3a	MS, IZ finished adding and removing people from aspects methods, refactored the move friend method	2010-10-20 11:28:56 -07:00
Raphael	961510a8ed	Rename instantiate! to build, no more raising in build, no saving in build, no seeding of aspects in build.	2010-10-20 11:03:47 -07:00
Raphael	f97f63e2d1	Merge remote branch 'tristil/239-380-identity-error-handling'	2010-10-20 10:36:03 -07:00
Raphael	e52e600a4d	Revert "Revert "Merge remote branch 'upstream/master'"" ... This reverts commit 3faca8380b.	2010-10-20 09:52:03 -07:00
Raphael	fd8028db33	Revert "Revert "Merge remote branch 'upstream/master'"" ... This reverts commit 1481056af2.	2010-10-20 09:51:55 -07:00
ilya	4d1ce410d7	Merge branch 'master' of github.com:diaspora/diaspora	2010-10-20 09:39:32 -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
Alec Leamas	3faca8380b	Revert "Merge remote branch 'upstream/master'" ... This reverts commit 4bb5aeb34b, reversing changes made to fb70dc8c99.	2010-10-20 14:52:18 +02:00
Raphael	a01c1c7461	Remove remove_all_aspects without ill effect	2010-10-19 23:54:12 -07:00
Sarah Mei	81ef7386b3	validation errors in profile and person bubble up to user.	2010-10-19 22:33:12 -07:00
Joseph Method	4b588ccefb	Addresses [#380] and [#239] by handling the errors from bad identities	2010-10-19 23:44:43 -04:00
ilya	38e8af2300	better querying	2010-10-19 19:16:44 -07:00
ilya	e3ffd2ffe7	Merge branch 'master' of github.com:diaspora/diaspora	2010-10-19 18:26:06 -07:00
ilya	b31b2de6f5	MS IZ aspect add and delete for a person	2010-10-19 18:25:59 -07:00
Raphael	9309be2d69	Merge branch 'import' ... Conflicts: spec/models/user/invite_spec.rb	2010-10-19 16:06:48 -07:00
Raphael	2c66bbbe00	Strip profile names, resolve 357	2010-10-19 13:51:31 -07:00
Raphael	962f282cbc	Validate uniqueness of aspect name, 359	2010-10-19 12:23:24 -07:00
Raphael	fce902821b	Remove downcasing of diaspora_handle, verify that diaspora_handle querying and validation is case insensitive.	2010-10-19 11:06:43 -07:00
maxwell	8ada8414c7	username can be any case, but diaspora handle should always, always, ALWAYS be lowercase, for webfinger reasons	2010-10-18 22:55:09 -07:00
ilya	d642928268	invite sends friend request if already friends, and raises if already friends	2010-10-18 16:27:02 -07:00
ilya	7ab2b00231	moved fb posting into the user model	2010-10-18 14:50:48 -07:00
ilya	a8bf082e35	The invitation now has an optional personal message	2010-10-18 14:35:41 -07:00
ilya	e648042b15	the user destroy now deletes the aspects	2010-10-18 10:26:45 -07:00
Sarah Mei	fcdcf88a79	Person.by_webfinger preserves case of identifier. Backfill specs for PublicsController#webfinger.	2010-10-17 12:18:53 -07:00
Sarah Mei	50f9e8f240	Reorganize User model. Preserve case of username.	2010-10-16 23:58:01 -07:00
Sarah Mei	f688653936	disallow whitespace in username	2010-10-16 23:34:58 -07:00
Sarah Mei	798d904e7e	strip username on create	2010-10-16 23:27:18 -07:00
Sarah Mei	d3a62c7a45	RegistrationsController#create deals with validation errors. Username, email, password now required on sign-up.	2010-10-16 22:02:51 -07:00
maxwell	341009e20f	Merge branch 'master' of github.com:diaspora/diaspora into maxwell ... Conflicts: Gemfile Gemfile.lock spec/models/user/invite_spec.rb	2010-10-14 23:02:06 -07:00
ilya	4a7c4e0848	requests are made on invite but perhaps they should be made on signup so that we have a person	2010-10-14 18:12:18 -07:00
maxwell	d61a227fc7	posts now serialize their created_at time	2010-10-14 16:49:08 -07:00
maxwell	a30a2666c6	merging	2010-10-14 16:32:37 -07:00
Raphael	d66c1e70bc	Merge remote branch 'bigbash/280-bug-fix'	2010-10-14 13:21:50 -07:00
maxwell	f2bdc98b47	Merge branch 'master' of github.com:diaspora/diaspora into import	2010-10-13 23:52:46 -07:00
maxwell	e1dd0cf6be	Fixed pending people_controller spec; cleaned up person.search(this is ruby :D ); fyi, calling should_receive stubs that method, hence this test confusion	2010-10-13 23:49:13 -07:00
maxwell	e218ab6780	Merge branch 'master' of github.com:diaspora/diaspora into import ... Conflicts: app/controllers/users_controller.rb	2010-10-13 23:09:48 -07:00
ilya	36b9f66f60	the invited user keeps track of who invited them, limit on invites, ... removed the invites controller test	2010-10-13 16:52:33 -07:00
maxwell	b395208a51	DG MS; added more stuff to importer.	2010-10-13 16:42:27 -07:00
ilya	3b8998ab71	Invitations contains the inviters	2010-10-13 13:29:45 -07:00
Shawn McGuire	711dcdc5f4	Issue #280 Fixed trailing whitespace error	2010-10-13 14:36:03 -05:00
ilya	bf42b5766c	Merge branch 'master' of github.com:diaspora/diaspora	2010-10-13 11:20:43 -07:00
Raphael	9a1590fa02	Move user module requires out to the user modules definition file	2010-10-13 11:18:06 -07:00
ilya	db1a01d51b	Merge branch 'master' of github.com:diaspora/diaspora	2010-10-12 18:24:20 -07:00
ilya	324f14c719	setting the token to nil on accept of invite	2010-10-12 18:23:59 -07:00
Raphael	fe0120cc0d	Return everyone on an empty search	2010-10-12 18:18:03 -07:00
ilya	d6b08de6fc	corrected link on the account page	2010-10-11 15:07:17 -07:00
ilya	bb7e2a9918	Merge branch 'master' of github.com:diaspora/diaspora	2010-10-11 14:58:22 -07:00
ilya	007f6cfb6f	close account	2010-10-11 14:58:11 -07:00
danielvincent	9bfb213465	Merge branch 'invites' of github.com:diaspora/diaspora into invites	2010-10-11 11:52:57 -07:00
Raphael	73e4d2b25b	Pull in search improvement, remove cruft	2010-10-11 11:08:54 -07:00
Raphael	fe360e386a	Merge remote branch 'rmaskey/master' into search	2010-10-11 10:47:24 -07:00
maxwell	0541833c18	stop the file include madness. using File.join and Rails.root for includes everywhere I could	2010-10-10 11:54:08 -07:00
rmaskey	94f20ba684	resolution for issue #151 - search with multiple words	2010-10-10 08:43:43 -07:00
ilya	8e61b438ab	setting the username	2010-10-08 16:00:58 -07:00
Raphael	a720694364	Make logging less verbose	2010-10-08 15:51:12 -07:00
Raphael	b7bf526b91	Make logging message clearer	2010-10-08 15:47:30 -07:00
ilya	ef3e627bed	the users are now made with people	2010-10-08 15:40:42 -07:00
danielvincent	154ec95717	killed the public tab. made a broadcast button in everyone tab	2010-10-08 14:06:49 -07:00
ilya	ddb98502b9	setup the controller, still need to make the person	2010-10-07 19:25:34 -07:00
ilya	4ecda6ab8f	Merge branch 'master' of github.com:diaspora/diaspora into invites ... Conflicts: Gemfile Gemfile.lock	2010-10-07 18:20:51 -07:00
danielvincent	2e73104d6f	DG MS; updated BSON gems, added devise-mongomapper gem fix, using unforked devise 1.1.2	2010-10-07 18:17:26 -07:00
ilya	3c61365fa1	initial invitable in user	2010-10-07 18:11:17 -07:00
Raphael	1fd3aeabd9	Add or later to license notice	2010-10-07 16:25:34 -07:00
Raphael	d7bbb66d27	Run whitespace:cleanup	2010-10-07 10:47:37 -07:00
ilya	131e905322	fixed the public route	2010-10-06 19:05:43 -07:00
danielvincent	66b356b5fe	moved public route	2010-10-06 18:14:37 -07:00
danielvincent	7c4feb7464	better log message	2010-10-05 17:34:03 -07:00
kook	85b384010e	exchange photos on adding new friend	2010-10-05 17:18:51 -07:00
danielvincent	830b3772d5	self reference in atom	2010-10-05 16:59:55 -07:00
danielvincent	09b861c7a3	remove .atom from public url	2010-10-05 16:51:27 -07:00
danielvincent	6723a51149	correctly indent xml	2010-10-05 16:40:50 -07:00
danielvincent	f3c34692d8	pubsub support	2010-10-05 13:39:56 -07:00
ilya	ce4f8cab8b	not encrypting the entire thing	2010-10-03 17:39:16 -07:00
ilya	304e4ad32b	removed the puts	2010-10-02 12:37:53 -07:00
ilya	7dcde292e1	user posting spec is now green, now stubbing on the apropriate method	2010-10-02 12:34:16 -07:00
ilya	b6a912dd02	slowly getting specs to pass on with the new api	2010-09-30 15:17:53 -07:00
danielvincent	15a4609c14	moved user's public route to user controller. changed person.public_url to reflect change.	2010-09-27 22:30:16 -07:00
danielvincent	eb7244e07c	Merge branch 'master' of github.com:diaspora/diaspora	2010-09-27 19:07:01 -07:00
danielvincent	26a4dc76a6	Merge branch 'master' of github.com:diaspora/diaspora	2010-09-27 18:34:55 -07:00
danielvincent	df800dc87e	ostatus builder	2010-09-27 17:58:44 -07:00
ilya	6e407572c4	removed unused repost method, going through the warden object	2010-09-27 17:27:49 -07:00
ilya	c2b84fd9c6	added a public key to post	2010-09-27 16:59:54 -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
ilya	98bc2df841	removed the encryption key= method, and user with private key factory	2010-09-27 10:10:54 -07:00
ilya	cf0df90dae	moved the private key into user where it belongs, two failing cucumber tests	2010-09-26 22:08:42 -07:00
Sarah Mei	68a8ecb05f	Merge branch 'master' of github.com:diaspora/diaspora	2010-09-26 13:08:56 -07:00
Sarah Mei	0ec074be6d	Remove annoying deprecation warning from spec runs ... Add spec for validation hook	2010-09-26 10:00:29 -07:00
Dorian	6ffc03a4c9	Big clean up: delete trailing whitespace	2010-09-26 12:48:40 -04:00
Stephen Caudill	536cea5e44	Remove consecutive empty lines	2010-09-25 12:06:39 -04:00
ilya	e414558f79	passing the right things to the partial	2010-09-24 15:52:29 -07:00
Raphael	004e659ee1	fix album posting	2010-09-24 15:10:49 -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	40120bb441	Moving to activemodel validations	2010-09-24 11:15:39 -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
Raphael	ed6df7d1bf	Delete user.terse_url	2010-09-23 10:24:10 -07:00
danielvincent	81250c0e9d	Merge branch 'master' of github.com:diaspora/diaspora into reposting	2010-09-22 15:49:13 -07:00
danielvincent	e9d16cc09b	DG IZ; cleanup	2010-09-22 15:48:50 -07:00
root	aaa4d75a5e	Merge branch 'master' of http://github.com/diaspora/diaspora	2010-09-22 16:41:43 -04:00
danielvincent	6dd7911c8c	DG IZ; update_or_repost	2010-09-22 10:52:29 -07:00
ilya	6bd22034b7	typo in user	2010-09-21 21:45:29 -07:00
ilya	dc0bd363a1	Merge branch 'master' of github.com:diaspora/diaspora	2010-09-21 20:02:13 -07:00
ilya	6d6ca3d8bc	added terse_pod_url to the APP_CONFIG hash	2010-09-21 20:01:56 -07:00
danielvincent	df5b7d6d84	DG MS; new function in post	2010-09-21 18:14:46 -07:00
ilya	76f140aa8b	Merge branch 'master' of github.com:diaspora/diaspora	2010-09-21 16:59:16 -07:00
ilya	020ff603bd	terse_url in user, db seeds are fixed, config/app_config.yml is now in gitignore, copy over config/app_config_example.yml.	2010-09-21 16:59:06 -07:00
danielvincent	03638ee68e	Merge branch 'master' of github.com:diaspora/diaspora	2010-09-21 16:35:25 -07:00
danielvincent	107c05ef6f	DG MS; validate_aspect_permissions broken out of post method	2010-09-21 16:35:18 -07:00
root	fe2be748a0	Merge branch 'master' of http://github.com/diaspora/diaspora	2010-09-21 19:21:40 -04:00
ilya	d26e7850ac	RS, IZ; removed url from user and views	2010-09-21 15:52:26 -07:00
ilya	efd901dcd9	RS, IZ; Pod url moved to app_config.yml, app_config.yml refactored, diaspora_handle now set based on APP_CONFIG	2010-09-21 15:46:57 -07:00
danielvincent	44db21ffd4	DG MS; cleaned up spec	2010-09-21 15:41:29 -07:00
Raphael	95d852b181	Merge branch 'master' of github.com:diaspora/diaspora	2010-09-21 14:00:12 -07:00
Raphael	11d31901e4	IZ, RS, Pulled receiving out of user file, refactored receive method to be clearer	2010-09-21 13:59:52 -07:00
root	03f8cbc249	Merge branch 'master' of http://github.com/diaspora/diaspora	2010-09-21 16:59:26 -04:00
ilya	4d00a0e99e	IZ posting to all albums should now work, needed to check for all in user.post	2010-09-21 12:35:48 -07:00
Thomas Krehbiel	bdd752f07b	Fix for 'Local variable hides method'	2010-09-20 21:49:14 -04:00
maxwell	2be0cca2cd	MS adding downcase to webfinger lookup	2010-09-20 16:51:02 -07:00
danielvincent	fb2f027b24	DG IZ; escape regex characters in Person.search	2010-09-20 15:25:19 -07:00
danielvincent	5bb4ee5d36	DG IZ; posting now ensures aspect ownership.	2010-09-20 15:15:37 -07: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
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	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
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
Raphael	b3549c79f4	Give slightly more specific error message	2010-09-17 12:49:49 -07:00
Raphael	ce2260b747	Merge branch 'master' of github.com:diaspora/diaspora into production	2010-09-17 11:57:36 -07:00
Raphael	99ad001d28	Fix websocket spec, take out puts in by_webfinger	2010-09-17 09:52:31 -07:00
Raphael	2e8ecceaf7	Merge branch 'master' of github.com:diaspora/diaspora into production	2010-09-16 21:53:34 -07:00
Raphael	b45906f902	Merge branch 'master' of github.com:diaspora/diaspora	2010-09-16 21:35:48 -07:00
Raphael	c520fb71a7	Moved socket out to separate process. Multiple thins should now be possible	2010-09-16 21:34:15 -07:00
maxwell	e668071ea5	README.md	2010-09-16 18:48:18 -07:00
danielvincent	25b4b409be	Merge branch 'master' of github.com:diaspora/diaspora into production	2010-09-16 16:19:48 -07:00
danielvincent	cbb692b6a3	Merge branch 'master' of github.com:diaspora/diaspora	2010-09-16 16:06:28 -07:00
danielvincent	0c7ba49e34	DG IZ; aspect deletion	2010-09-16 16:03:18 -07:00
maxwell	2e8785b596	applying this change from wiki, thanks astronouth7303	2010-09-16 15:04:29 -07:00
maxwell	6f867d60c4	MS fixed the nil hostname on user	2010-09-16 14:38:24 -07:00
Raphael	1e646fb0a9	Merge branch 'master' of github.com:diaspora/diaspora into production	2010-09-15 23:54:57 -07:00
Raphael	32fc6212ab	Put only the hostname in diaspora_handle	2010-09-15 23:49:55 -07:00
Michael Fellinger	35c9922c61	And fix some more requires	2010-09-16 15:24:26 +09:00
Raphael	d760725145	Don't webfinger another server on receiving a webfinger request	2010-09-15 23:01:13 -07:00
Michael Fellinger	ba058a39a8	Replace require_relative with compatible version	2010-09-16 14:50:30 +09:00
Michael Fellinger	c6f5b4ed16	Basic 1.9.2 port	2010-09-16 14:41:33 +09:00
Raphael	c67a8ea100	Merge branch 'master' of github.com:diaspora/diaspora into production ... Conflicts: config/deploy.rb config/environments/production.rb spec/models/request_spec.rb	2010-09-15 22:37:05 -07:00
Stephen Caudill	5595dc5f48	Retab the project	2010-09-16 13:16:10 +08:00
Jamie Wilkinson	fbdd50172d	Cleanup stray whitespace	2010-09-16 10:07:59 +08:00
Raphael	e9009ea609	Downcase username only if it is there	2010-09-15 18:23:54 -07:00
Raphael	de93fd2818	Merge branch 'master' of github.com:diaspora/diaspora into production	2010-09-15 18:10:13 -07:00
Raphael	708e9f88a5	Spell our own name right	2010-09-15 17:56:18 -07:00
Raphael	04594d7ac5	Merge branch 'production' of github.com:diaspora/diaspora into production ... Conflicts: app/models/user.rb	2010-09-15 17:25:14 -07:00
Raphael	33048fe6db	Merge branch 'master' of github.com:diaspora/diaspora into production ... Conflicts: app/models/user.rb spec/models/aspect_spec.rb	2010-09-15 17:24:00 -07:00
Raphael	0e0df7fb22	downcase before validation	2010-09-15 17:21:23 -07:00
Raphael	bf33313bf9	take out index, change backer seed, no puts	2010-09-15 17:13:17 -07:00
Raphael	02dda4f0a7	change the name of instantiate back	2010-09-15 17:08:56 -07:00
Raphael	01d26f6d0e	Using custom registrations controller	2010-09-15 17:05:21 -07:00
Raphael	e0ffc8bba0	First pass at having a custom registrationsController	2010-09-15 16:40:03 -07:00
Daniel Vincent Grippi	ee89bfaf8f	removed do bad things	2010-09-15 16:18:33 -07:00
maxwell	b8bbc58d30	save person after changing handle	2010-09-15 16:02:23 -07:00
Daniel Vincent Grippi	f0dad8c16a	Merge branch 'master' of github.com:diaspora/diaspora into production	2010-09-15 15:55:45 -07:00
maxwell	77bd68e7c7	MS the deploy config is wrong	2010-09-15 15:55:26 -07:00
Daniel Vincent Grippi	e94b48e19a	Merge branch 'master' of github.com:diaspora/diaspora into production ... Conflicts: app/models/user.rb	2010-09-15 15:55:18 -07:00
maxwell	6e29a66e09	Merge branch 'master' of github.com:diaspora/diaspora ... Conflicts: app/models/user.rb	2010-09-15 15:46:15 -07:00
maxwell	3a4eb294f8	MS made it two callbacks for handles and keys	2010-09-15 15:45:26 -07:00
Daniel Vincent Grippi	b2b2748fea	seed aspects on user create	2010-09-15 15:39:04 -07:00
Daniel Vincent Grippi	82ada7d2d6	Merge branch 'production' of github.com:diaspora/diaspora into production	2010-09-15 15:36:59 -07:00
Daniel Vincent Grippi	cd21ee8652	just seed family and work	2010-09-15 15:36:41 -07:00
maxwell	7741951a42	MS removing production stuff from master... yowch	2010-09-15 15:26:06 -07:00
maxwell	8828707c45	MS fixed the login bug, deploying to master	2010-09-15 15:15:15 -07:00
maxwell	c1077b3eed	Merge branch 'production' of github.com:diaspora/diaspora into production	2010-09-15 14:11:24 -07:00
maxwell	b68ec3a5b8	MS DG setting diaspora handle in a unclean way	2010-09-15 13:53:36 -07:00
maxwell	84c60e5f2e	DG MS fixing webfinger, i hope to goodness	2010-09-15 13:28:06 -07:00
Raphael	1006e8a680	Merge branch 'master' of github.com:diaspora/diaspora into production	2010-09-15 11:01:11 -07:00
Raphael	aa3ebe372c	License notices replaced	2010-09-15 10:58:48 -07:00
Daniel Vincent Grippi	f256d433fd	nevermind	2010-09-14 19:34:26 -07:00
Daniel Vincent Grippi	02e1ed82a3	making profiles socket	2010-09-14 19:07:23 -07:00
Daniel Vincent Grippi	3a468a9f1b	Merge branch 'master' of github.com:diaspora/diaspora into production	2010-09-14 11:45:33 -07:00
Daniel Vincent Grippi	426d038aaf	Remove email based filter	2010-09-14 11:22:32 -07:00
Daniel Vincent Grippi	7643fb4125	remember that aspects are seeded	2010-09-14 11:15:10 -07:00
ilya	2311c33626	MS IZ mocked all the webrequest tests	2010-09-14 11:13:58 -07:00
Daniel Vincent Grippi	c1a9a89be7	Merge branch 'production' of github.com:diaspora/diaspora into production ... Conflicts: app/models/user.rb config/deploy.rb spec/factories.rb spec/models/request_spec.rb spec/spec_helper.rb	2010-09-14 11:08:18 -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	84b29770fe	Put raise back in webfinger fail	2010-09-13 16:05:43 -07:00
maxwell	6f75a81a9d	IZ MS trying again on fixing remote profile images	2010-09-13 15:48:30 -07:00
Raphael	34a4804b9f	Merge branch 'master' of github.com:diaspora/diaspora	2010-09-13 14:49:01 -07:00
Raphael	fd31e9aeeb	Force downcase on usernames	2010-09-13 14:48:55 -07:00
Daniel Vincent Grippi	40ecf176e8	Merge branch 'master' of github.com:diaspora/diaspora	2010-09-13 14:26:15 -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
Raphael	b05d106aed	Remove user_refs from Person, put pendings in the broken photo specs	2010-09-13 12:16:43 -07:00
Raphael	9837340eb2	Rename files from group to aspect	2010-09-13 10:43:15 -07:00
Raphael	44a1f82da9	Rename group to aspect	2010-09-13 10:38:38 -07:00
Daniel Vincent Grippi	4bf8bc9c0b	wrong key being sent in recieve method for posts (group_id => group_ids)	2010-09-12 22:17:39 -07:00
Daniel Vincent Grippi	945a6ffbeb	added a logger in post	2010-09-12 22:11:01 -07:00
Daniel Vincent Grippi	31a746db2f	group_ids to string in post	2010-09-12 22:05:07 -07:00
Daniel Vincent Grippi	cf48079446	group_ids must be converted to strings	2010-09-12 21:47:03 -07:00
Daniel Vincent Grippi	1874ebe51d	forgot to map to group ids in retraction	2010-09-12 21:33:39 -07:00
Daniel Vincent Grippi	62994f1660	retractions should now actually websocket again	2010-09-12 21:24:22 -07:00
maxwell	08233a74c5	MS added anohter logger so i can debug friend requests	2010-09-11 14:39:09 -07:00
Raphael	ab6d631a27	White space in user file, deleting net/curl as unused	2010-09-10 16:25:19 -07:00
Raphael	4922ebd84c	Finish removing encryption from retractions	2010-09-10 16:14:37 -07:00
Raphael	a44d40168a	Encryption removed from everything other than comments, most irrelevant specs removed	2010-09-10 16:04:09 -07:00
Raphael	cab8610bea	Actually use salmon to push comments	2010-09-10 10:38:16 -07:00
Raphael	aa1f3c6438	Comments now use salmon, the whole salmon is encrypted, user querying moved to lib file	2010-09-10 10:31:23 -07:00
Raphael	68dc74e0b7	Tests pass again, use id => in retraction.perform	2010-09-09 18:15:30 -07:00
Raphael	7448684358	Return results of queries	2010-09-09 17:56:21 -07:00
Raphael	222847ca92	Using methods that exist can be helpful	2010-09-09 17:54:33 -07:00
Raphael	e9377a681c	Don't use push_to_groups for retractions	2010-09-09 17:52:35 -07:00
Raphael	2b1724c42f	Pass id to groups_with_post	2010-09-09 17:44:33 -07:00
Raphael	8b09d8107c	Add encryptable to profiles	2010-09-09 17:43:07 -07:00
Raphael	87bef90932	Salmon for retractions and profiles	2010-09-09 17:28:32 -07:00
Raphael	6b4501c342	Move generate key back into user	2010-09-09 16:23:08 -07:00
Raphael	c73ce3ff99	RS IZ added a logger statement and a guid in the webfinger profile	2010-09-09 16:20:27 -07:00
Raphael	522450c9d3	RS IZ added a logger statement and a guid in the webfinger profile	2010-09-09 16:19:34 -07:00
Raphael	fd61535e11	Hcards working	2010-09-09 15:43:16 -07:00
Raphael	67f9d9dab5	Add hcard, add id for pod_location	2010-09-09 15:34:20 -07:00
Raphael	59006e657f	Hcard done manually	2010-09-09 15:15:37 -07:00
Raphael	c6aff4a562	making the hcard work	2010-09-09 13:02:59 -07:00
Raphael	240dda4eab	Salmon for posts is in, old cruft has not been taken out and requests and comments are unfinished	2010-09-09 12:21:36 -07:00
Raphael	4fd0853e71	Moving to salmon	2010-09-08 18:29:39 -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	edae8f1e66	DG MS; fixed a view bug in user edit page. page also displays diaspora username .	2010-09-08 11:58:03 -07:00
Daniel Vincent Grippi	36730978ca	login page is more elegant	2010-09-08 11:37:54 -07:00
Raphael	960d40278c	Add username, login with username or email	2010-09-08 10:59:08 -07:00
maxwell	2b165df85c	Merge branch 'master' of github.com:diaspora/diaspora into rails_rc	2010-09-07 18:21:17 -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
maxwell	804777f9ae	MS; updated to released rails	2010-09-07 16:47:53 -07:00
maxwell	919d7d23c0	MS fixed log view; also, now pagination is now working, check out the new method which returns plucky queries instead of arrays	2010-09-06 17:46:09 +02:00
Daniel Vincent Grippi	5e34506df6	added custom as_json methods to models	2010-08-29 23:46:19 -07:00
Daniel Grippi	de8450c7c5	line spacing adjustments.	2010-08-29 23:04:28 -07:00
Daniel Grippi & Raphael Sofaer	5babda044d	cleaned up group controller. added custom as_json to group model.	2010-08-29 21:56:10 -07:00
Raphael	b85333e52b	error.new	2010-08-28 18:36:49 -07:00
Raphael	d25e6017e3	Make a couple of generic errors ArgumentError	2010-08-28 14:53:08 -07:00
Raphael	aa22a0d5c8	Removing unused method	2010-08-28 14:38:22 -07:00
Raphael	5ef442d93f	RS, IZ; Socket spec now more realistic, visible_person_by_id fixed	2010-08-27 10:48:14 -07:00
Raphael	831609ad15	Make a stranger that you receive a comment from visible	2010-08-27 10:19:10 -07:00
Raphael	c629c23232	Tests now pass, export_key changed to exported_key, profile.person changed to _parent_document	2010-08-27 10:05:14 -07:00
Raphael	ba4468f9cc	Merge branch 'master' of github.com:diaspora/diaspora	2010-08-26 19:15:42 -07:00
Raphael	2dd2f38442	Attempting to make comments from unknown users save	2010-08-26 19:15:22 -07:00
danielvincent	435db1ecb1	Pass the right url in websocketed photo json	2010-08-26 17:23:23 -07:00
Raphael	36342db7a8	logging statement in the user receive after parsing the person	2010-08-26 17:04:40 -07:00
Raphael	977786aa65	remove the raise from the top of user receive	2010-08-26 16:31:57 -07:00
Raphael	9d48b45ee4	merge conflict line	2010-08-26 16:28:34 -07:00
Raphael	3ed191e972	MS IZ testing on remote	2010-08-26 16:27:01 -07:00
Raphael	c3e199a00a	Also set object.person	2010-08-26 15:36:56 -07:00
Raphael	0e36d89711	Also set object.person	2010-08-26 15:09:54 -07:00
Raphael	94bb754c34	Changed parseing person from xml a little, using it for comments.	2010-08-26 15:06:39 -07:00
Raphael	1ce34bc6fc	Parenthases	2010-08-26 14:42:16 -07:00
Raphael	73d8317534	Merge branch 'master' of github.com:diaspora/diaspora	2010-08-26 14:38:22 -07:00
Raphael	31f79be068	Save the person on receiving a comment	2010-08-26 14:38:06 -07:00
ilya	1d69b88e2e	to id so that change of group works	2010-08-26 12:17:35 -07:00
Raphael	6a48c07c90	Return if nil	2010-08-26 12:10:22 -07:00
Raphael	5a92f9e8a8	Do some logging	2010-08-26 12:07:35 -07:00
Raphael	f3c20bf3c0	accept comments from strangers	2010-08-26 12:01:11 -07:00
Raphael	c7974f8046	Save comment's person in receive	2010-08-26 11:53:32 -07:00
Raphael	c3fe3bf443	RS, IZ, check against self.person, not self in user receive	2010-08-26 11:48:34 -07:00
Raphael	9f11a474d8	Take out some logging, put in log user on receive	2010-08-26 11:46:04 -07:00
Raphael	7feb30e3e1	RS, IZ, try saving the comment	2010-08-26 11:41:16 -07:00
Raphael	958627cc1c	RS IZ object.post	2010-08-26 11:32:33 -07:00
Raphael	a65f512fa3	verify post creator signature in receive	2010-08-26 11:29:06 -07:00
Raphael	f186dd98c8	SIGNATOR	2010-08-26 11:13:44 -07:00
Raphael	36f265fa2f	Log safely	2010-08-26 11:11:30 -07:00
Raphael	a29a1bec3e	Add some logging to comments	2010-08-26 11:07:26 -07:00
Raphael	6d3d37b7c6	Merge branch 'master' of github.com:diaspora/diaspora	2010-08-25 18:20:37 -07:00
Raphael	ad67798004	User to_id on groups_with_post	2010-08-25 18:15:38 -07:00
maxwell	a26229223c	Merge branch 'master' of github.com:diaspora/diaspora	2010-08-25 18:07:49 -07:00
maxwell	b4174c664e	you can now reassign a peson's group	2010-08-25 18:07:31 -07:00
Raphael	50459d896c	Socket received comments	2010-08-25 17:34:12 -07:00
Raphael	00f8a3e628	removed ensure_bson in user. added to_id method to String and ObjectID classes	2010-08-25 17:11:57 -07:00
maxwell	22f63a4c44	MS IZ added the move friend method	2010-08-25 16:58:07 -07:00
Raphael	55c94c385c	fixed photos going through the websocket. added a spec to SocketsController	2010-08-25 16:08:44 -07:00
Raphael	559b6cd02f	Merge branch 'master' of github.com:diaspora/diaspora	2010-08-24 17:43:35 -07:00
Raphael	1faaf1dd81	Fix profile pic getting unset on profile update	2010-08-24 17:43:11 -07:00
maxwell	326f17567e	bad signature valid hack	2010-08-24 17:34:13 -07:00
Raphael	41aa8ed10e	Specs pass again, need to make albums have a group	2010-08-24 17:12:27 -07:00
Raphael	c102e81b03	put the visible back in	2010-08-24 16:56:04 -07:00
maxwell	68bd5bf5f5	MS merging in master again	2010-08-24 16:21:20 -07:00
ilya	9db4838543	collecting the ids	2010-08-24 16:15:59 -07:00
ilya	f5ae090e9b	posting empty albums to people	2010-08-24 16:05:29 -07:00
Raphael	10bd40d1a2	Merge branch 'master' of github.com:diaspora/diaspora	2010-08-24 15:49:04 -07:00
Raphael	abafa03e92	Spec for posting to no group	2010-08-24 15:48:51 -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
Raphael	72c41a5ff8	User post now requires a :to field	2010-08-24 15:42:24 -07:00
maxwell	46f062a5f3	fixing merge confilts	2010-08-24 14:50:01 -07:00
maxwell	f5316fb3c1	Merge branch 'master' of github.com:diaspora/diaspora into production	2010-08-24 14:45:04 -07:00
Raphael	db33d94f07	Render nothing on status_messages create, Websockets now honestly ... support multiple groups.	2010-08-24 14:36:03 -07:00
maxwell	4f63f60b03	MS merging, and added a dumb check for the email validating twice	2010-08-24 14:03:57 -07:00
Raphael	abf48cefd4	Putting back in both generate_key	2010-08-24 13:41:09 -07:00
Raphael	2814dfceb7	Deleted the wrong generate_key	2010-08-24 13:40:36 -07:00
Raphael	d1c540439e	Moved friending out to a lib file, specs all pass	2010-08-24 12:13:10 -07:00
Raphael	b5bb61a135	Merging master into production	2010-08-24 11:18:42 -07:00
Raphael	7ca9d1e791	Changed group_nav a little, deleted people_sidebar	2010-08-24 11:02:30 -07:00
maxwell	f172c9e1d2	Merge branch 'master' of github.com:diaspora/diaspora	2010-08-23 18:45:31 -07:00
maxwell	a37b5ae09b	IZ MS; added a basic salmon library to help with directed messages, and made an keyhash method	2010-08-23 18:45:20 -07:00
Raphael	e05956bddd	rescuing 500 on friending someone that was already friends	2010-08-23 17:05:24 -07:00
Raphael	511f571ae5	Specs mostly pass again	2010-08-23 15:01:39 -07:00
Raphael	76f2aa98ac	Push to multiple groups	2010-08-23 14:45:13 -07:00
Raphael	ae6f0fdc51	new photo form now loads through ajax	2010-08-23 13:58:33 -07:00
Raphael	01dac4d173	Take tinymce out of layout	2010-08-23 11:56:06 -07:00
Raphael	364cdfed22	Allowed email checking no longer so ridiculous	2010-08-23 10:20:19 -07:00
Raphael	8e253a6d49	Left in a merge marker	2010-08-19 16:20:38 -07:00
Raphael	f66b5f4006	Merge branch 'master' of github.com:diaspora/diaspora into pivots ... Conflicts: app/controllers/users_controller.rb app/models/user.rb config/sprinkle/provision.rb	2010-08-19 16:09:08 -07:00
ilya	7eb1bb5a00	removing the sanity check	2010-08-19 14:36:15 -07:00
ilya	542c1769f9	doing a sanity check, that not requiring serialized key passes the validation	2010-08-19 14:25:34 -07:00
ilya	f7608f6292	RS IZ trying to create user through instantiate in seed script	2010-08-19 14:12:52 -07:00
maxwell	02da9bf634	Merge branch 'master' of github.com:diaspora/diaspora	2010-08-19 12:00:21 -07:00
maxwell	df435dc319	MS IZ made a reques form in the user index page	2010-08-19 11:59:58 -07:00
ilya	b723c5997e	Merge branch 'master' of github.com:diaspora/diaspora	2010-08-19 10:49:18 -07:00
ilya	54afb1bad4	Rolling assign_key into setup_person	2010-08-19 10:49:04 -07:00
maxwell	9942aef5d4	Merge branch 'master' of github.com:diaspora/diaspora	2010-08-19 10:46:58 -07:00
maxwell	5d25861dc6	IZ MS person profile page now displays only posts a user can see	2010-08-19 10:46:47 -07:00
ilya	9b47e67a15	call the right method in before_validation_on_create	2010-08-19 10:23:40 -07:00
ilya	9e78c9b64c	removing setup person	2010-08-18 21:58:29 -07:00
ilya	0a3277d306	maybe the instantiate method will help	2010-08-18 21:51:51 -07:00
ilya	0f6ec71dcd	we need assign key as well	2010-08-18 21:45:41 -07:00
ilya	0c9f041f28	we need do bad things in the user for seeding the database	2010-08-18 21:42:37 -07:00
Raphael	a23df47dbc	Trying to merge in the pivots changes that we want in master	2010-08-18 21:10:42 -07:00
Raphael	701bec670f	Merge branch 'master' of github.com:diaspora/diaspora into pivots ... Conflicts: app/views/groups/index.html.haml config/deploy_config.yml	2010-08-18 20:50:28 -07:00
ilya	ef15cddf19	RS, IZ a slash	2010-08-18 18:13:17 -07:00
ilya	5cae2b21b1	RS, IZ fixed the url for the image	2010-08-18 18:06:13 -07:00
ilya	f6892b88d6	photo.remote_photo is relative	2010-08-18 17:50:13 -07:00
ilya	76b4b55e98	Added spec for remote photo url setting to photos	2010-08-18 17:39:38 -07:00
ilya	4019e4425a	Checking for failing to set url in photo	2010-08-18 17:12:28 -07:00
ilya	b279d6582b	Merge branch 'master' of github.com:diaspora/diaspora	2010-08-18 16:59:52 -07:00
ilya	803de25cc0	DG IZ albums are now posts	2010-08-18 16:59:19 -07:00
Raphael	5a2b42e4e5	Merge branch 'master' of github.com:diaspora/diaspora	2010-08-18 16:37:12 -07:00
Raphael	7ed31ab96a	Moving to file store	2010-08-18 16:37:05 -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	1ab21fe8b1	Merge branch 'master' of github.com:diaspora/diaspora	2010-08-18 15:25:23 -07:00
ilya	08739ad23d	DG IZ; retractions remove post references in group objects	2010-08-18 15:23:46 -07:00
Raphael	61c906a9d3	Merge branch 'master' of github.com:diaspora/diaspora_rails into pivots ... Conflicts: app/models/user.rb app/views/groups/index.html.haml config/deploy_config.yml	2010-08-18 14:45:41 -07:00
Raphael	f570199d17	Add a couple specs to groups, moved socketing into each block, unclear where or why groups are being created wrongly	2010-08-18 14:30:16 -07:00
Raphael	0cc5cc5487	Merge branch 'master' of github.com:diaspora/diaspora_rails ... Conflicts: app/models/user.rb	2010-08-18 12:20:07 -07:00
ilya	034755368b	Merge branch 'master' of github.com:diaspora/diaspora_rails	2010-08-18 12:17:23 -07:00
Raphael	9b2f2bbddf	Move socketing out to method from receive	2010-08-18 12:14:47 -07:00
Raphael	5e439bdb28	Ensure_bson on groups_with_person	2010-08-18 11:56:11 -07:00
Raphael	b7d648e173	Validate presence of name on group	2010-08-18 11:54:44 -07:00
ilya	4d86933f4a	DG IZ; user's visible posts method queries group objects for their posts	2010-08-18 11:40:02 -07:00
Raphael	d640c0672f	switch deploy branch to actually be one we are working on	2010-08-18 10:56:09 -07:00
ilya	055c222fc2	DG IZ; using group_id instead of group in post method. passing in :group_id into publisher partial	2010-08-18 10:53:43 -07:00
ilya	b0088c73d8	DG IZ; user's own post gets referenced in group model	2010-08-18 10:37:33 -07:00
Raphael	1685e0c28b	Merge branch 'master' of github.com:diaspora/diaspora_rails into pivots ... Conflicts: app/models/user.rb	2010-08-18 10:13:25 -07:00
Raphael	045878de64	call ensure_bson once in visible_person_by_id and group_by_id	2010-08-18 10:12:22 -07:00
Raphael	b99a86e6bd	Merge branch 'master' of github.com:diaspora/diaspora_rails into pivots ... Conflicts: app/models/user.rb	2010-08-18 10:10:20 -07:00
Raphael	9a188fd9f0	Don't try to unsocket albums	2010-08-18 10:08:38 -07:00
Raphael	36f8289522	Fixing retractions on albums, adding back remove_from_view	2010-08-18 10:03:37 -07:00
danielvincent	2409fd3f20	user page doesn't give an error anymore. fixed visible_person_by_id to return self.person instead of self	2010-08-18 02:40:53 -07:00
Raphael	539316a235	Removing posts relation from person	2010-08-17 23:50:07 -07:00
Raphael	42cc1da9f6	Removing posts array from person	2010-08-17 23:27:17 -07:00
ilya	501bcdd197	Merge branch 'master' of github.com:diaspora/diaspora_rails into pivots	2010-08-17 23:25:33 -07:00
Raphael	4a4686ce6e	refactored signature validation got specs passing	2010-08-17 23:21:00 -07:00
ilya	55b4d4758f	Merge branch 'master' of github.com:diaspora/diaspora_rails into pivots ... Conflicts: app/models/user.rb spec/models/user_spec.rb	2010-08-17 22:58:46 -07:00
Raphael	cb152ea3c3	Shortened user receive, moderated groups.first in the socketing	2010-08-17 22:34:01 -07:00
Raphael	55d84b3288	Broke up user spec, put user update back in routes	2010-08-17 22:03:45 -07:00
Raphael	9285839296	Merging in socket-group	2010-08-17 20:30:30 -07:00
Raphael	20bc88c0bf	Merge branch 'socket-group' of github.com:diaspora/diaspora_rails	2010-08-17 20:19:29 -07:00
Raphael	9fcc02a580	Ensure bson on visible person	2010-08-17 19:56:21 -07:00
Raphael	9f9395bc9c	visible_person_by_id should check against self.person.id	2010-08-17 19:51:29 -07:00
Raphael	456e9e9634	Merge branch 'master' of github.com:diaspora/diaspora_rails into pivots ... Conflicts: app/models/user.rb	2010-08-17 19:34:19 -07:00
Raphael	48756e77f3	Friend_by_id changed to visible_person_by_id	2010-08-17 19:32:42 -07:00
Raphael	eb84b39f93	change before to after	2010-08-17 19:11:59 -07:00
Raphael	e8e141b24e	Merge branch 'master' of github.com:diaspora/diaspora_rails into pivots	2010-08-17 19:04:03 -07:00
Raphael	86afa7a987	Remove bookmarks and blogs	2010-08-17 18:56:42 -07:00
Raphael	4fe6a54c09	seed groups	2010-08-17 18:54:27 -07:00
Raphael	43160496c9	Tommy	2010-08-17 18:52:15 -07:00
ilya	2614cb5add	DG IZ; find_all_by instead of find_by	2010-08-17 18:37:08 -07:00
Raphael	ffc9b00489	taking group seed out	2010-08-17 18:35:33 -07:00
Raphael	07549ed17e	Start with a group'	2010-08-17 18:30:08 -07:00
Raphael	8619584834	things mostly working	2010-08-17 18:27:50 -07:00
ilya	f4f377e7e7	DG IZ finding albums by person_id	2010-08-17 18:26:48 -07:00
ilya	daf08cd9f9	DG IZ posts by the user get websocketed on the group page and albums ... get signed?	2010-08-17 18:06:35 -07:00
ilya	f15b3c46b2	DG IZ; reverted to before removing latest message methods	2010-08-17 17:40:48 -07:00
Raphael	bb85c46be1	syntax error	2010-08-17 17:28:17 -07:00
Raphael	6f24a454c8	merge	2010-08-17 17:23:37 -07:00
Raphael	1aefaedda1	merge	2010-08-17 17:21:10 -07:00
ilya	e5036862f6	DG IZ removed the latest message javascript as well as the hash	2010-08-17 16:49:58 -07:00
Raphael	26a892ab4c	putting email verification back in	2010-08-17 16:43:54 -07:00
Raphael	ba83cb9d29	Index on email	2010-08-17 16:24:52 -07:00
ilya	5e95650ae3	DG IZ logger info	2010-08-17 16:11:25 -07:00
ilya	f70cf4a60a	DG IZ first group for now, added logging statements	2010-08-17 16:09:55 -07:00
ilya	87bc9dad1d	DG IZ added group id to the action hash	2010-08-17 15:27:12 -07:00
Raphael	88cb7aaa8b	Merge branch 'master' of github.com:diaspora/diaspora_rails into pivots	2010-08-17 14:52:17 -07:00
ilya	fd539926c2	DG IZ; changed variable 'c' to 'comment'	2010-08-17 13:59:58 -07:00
Raphael	063164fea2	comma	2010-08-17 13:59:57 -07:00
Raphael	0fdb337076	Confirmable	2010-08-17 13:57:45 -07:00
ilya	b5c6bbd1df	DG IZ; moved commenting methods into User (from Person).	2010-08-17 13:56:52 -07:00
Raphael	771c594814	Take out pivotal only for a second	2010-08-17 13:49:18 -07:00
Raphael	e6768cb5c8	helper method	2010-08-17 13:21:29 -07:00
Raphael	1d6e132a9f	Merge branch 'master' of github.com:diaspora/diaspora_rails into pivots	2010-08-17 13:07:26 -07:00
Raphael	842b321dfa	User email checking, routes working again	2010-08-17 13:02:42 -07:00
ilya	2a90e59f1e	DG IZ the group should view the posts for the group (and yourself) w	2010-08-17 12:22:14 -07:00
ilya	2af41a0ea9	DG IZ; posts_for :group method in User	2010-08-17 12:14:02 -07:00
Raphael	ccbbf40584	validation lambda out to method	2010-08-17 11:48:59 -07:00
Raphael	015940b60e	Pass to the lambda	2010-08-17 11:45:47 -07:00
ilya	4f8b8ad3c5	DG IZ saving the post	2010-08-17 11:03:31 -07:00
Raphael	453cb06691	changing settings and deploy scripts, validating email	2010-08-17 11:01:30 -07:00
ilya	0af6f7b0e5	Merge branch 'master' of github.com:diaspora/diaspora_rails	2010-08-17 10:48:47 -07:00
ilya	a9c9619a54	DG IZ; posting from a user includes adding to the many posts association in said user	2010-08-17 10:43:18 -07:00
Raphael	72559cbce1	Merge branch 'master' of github.com:diaspora/diaspora_rails	2010-08-17 10:37:18 -07:00
Raphael	50919ef491	Requesting now searches the local server by email for a matching person.	2010-08-17 10:37:09 -07:00
ilya	5761d5db36	Merge branch 'master' of github.com:diaspora/diaspora_rails	2010-08-17 10:35:37 -07:00
ilya	dea6551374	DG IZ; moved post() into User from Person.	2010-08-17 10:35:25 -07:00
Raphael	e32315b6c6	Merge branch 'master' of github.com:diaspora/diaspora_rails	2010-08-17 10:25:11 -07:00
Raphael	2c1c5df281	Moved search specs, renamed method	2010-08-17 10:24:59 -07:00
danielvincent	7e5ace7cbc	minor cleanup in models	2010-08-16 22:44:22 -07:00
ilya	1d92d11841	DG IZ; user refs are incremented as well as decremented for Posts	2010-08-16 20:39:24 -07:00
ilya	74c70d9410	Merge branch 'master' of github.com:diaspora/diaspora_rails ... Conflicts: app/models/user.rb spec/lib/diaspora_parser_spec.rb	2010-08-16 18:18:30 -07:00
ilya	b5594ad6bc	DG IZ; post user refs started (permissions)	2010-08-16 18:11:23 -07:00
Raphael	eae4053902	Encryption removed from callbacks, except retractions sort of. verification is in user.receive	2010-08-16 17:23:54 -07:00
Raphael	fbee1aabb1	Special casing comments from people that you are not friends with so it accepts them	2010-08-16 16:32:20 -07:00
Raphael	3ff4387cd8	Merge branch 'master' of github.com:diaspora/diaspora_rails	2010-08-16 16:22:55 -07:00
Raphael	ad07521e07	Made a few more tests pass	2010-08-16 16:22:46 -07:00
ilya	b3d8f59c77	removed many posts association within group model	2010-08-16 15:51:31 -07:00
Raphael	3a591b0713	Merging in friend-refactor...	2010-08-16 15:35:14 -07:00
Raphael	b0537e2f34	Comments pushing in the right directions	2010-08-16 15:04:09 -07:00
Raphael	fa2e621b0f	Syntax error	2010-08-16 14:24:30 -07:00
Raphael	e4af2ccb1f	Rename send_comment to dispatch_comment, simplify it	2010-08-16 14:22:14 -07:00
Raphael	71aaa9240c	only socket if the object isn't yours	2010-08-16 14:18:08 -07:00
Raphael	b463958f0d	Check ownership on the comment's post	2010-08-16 14:06:52 -07:00
Raphael	deeb4832c1	Error: insufficient parenthases	2010-08-16 14:02:26 -07:00
Raphael	1f40ea23b6	logging is awesome	2010-08-16 13:58:05 -07:00
Raphael	91b0a1e8f9	PAAAARSER	2010-08-16 13:51:49 -07:00
Raphael	f8e2e6bf2d	Infinite loops are the best	2010-08-16 13:49:48 -07:00
Raphael	598c646b07	Hack to get comments working for now	2010-08-16 12:56:02 -07:00
Raphael	1f0ca49ce5	url, not user.url	2010-08-16 12:29:26 -07:00
Raphael	fb8d3b3e85	Check for local person before destroying accepted request	2010-08-16 12:26:15 -07:00
Raphael	4f22222b30	Splitting accept_friend_request into two methods	2010-08-16 12:10:23 -07:00
Raphael	00a9bd820b	Parser confused :(	2010-08-16 11:50:43 -07:00
Raphael	a8b402636a	Shorten ensure_bson	2010-08-16 11:47:23 -07:00
Raphael	f4d6a04f4f	Get objects by bson id	2010-08-16 11:46:36 -07:00
Raphael	4c731bf818	special-casing local webfinger	2010-08-16 11:29:14 -07:00
Raphael	99fb383dc0	BSONify ids in by_id methods	2010-08-16 11:13:00 -07:00
Raphael	eb793ea129	Took out a couple more references to User.owner	2010-08-16 11:07:18 -07:00
Raphael	3efa36587a	Took out a bunch of user.owner references	2010-08-16 11:01:58 -07:00
Raphael	26abc68236	Use group_by_id or friend_by_id, no querying on friends or groups	2010-08-16 10:50:38 -07:00
Raphael	0e67ef8d7e	Inspect the friend before calling unfriended by	2010-08-16 10:38:36 -07:00
Raphael	ad2d8f8b46	Specify id field in the query whose result is passed to unfriended_by	2010-08-16 10:37:07 -07:00
Raphael	e84b25b3f5	Log the xml again	2010-08-16 10:31:39 -07:00
ilya	053ed9176d	Merge branch 'friend-refactor' of github.com:diaspora/diaspora_rails into friend-refactor	2010-08-16 10:00:25 -07:00
ilya	d0c02859e6	DG IZ got one more log statement in the user person retraction	2010-08-16 10:00:04 -07:00
danielvincent	f1f827120b	intentional failing test in user for tomorrow.	2010-08-15 21:03:19 -07:00
danielvincent	80b81c1ae1	comment now validates presence of text. also, removed unused method overriding ==.	2010-08-15 19:28:59 -07:00
ilya	22910ef4ce	Check retraction signature on person retraction	2010-08-13 19:09:55 -07:00
ilya	99c8869b8f	Removing a friend now deletes them from the group(s) they are in	2010-08-13 18:56:33 -07:00
ilya	ac40f7974e	RS, IZ; A variety of fixes and some refactoring on unfriending and activate friend	2010-08-13 18:37:09 -07:00
ilya	bd271b7bec	RS, IZ; Refactored the user unfriend and unfriended_by	2010-08-13 17:33:26 -07:00
ilya	7bd1193c5e	RS, IZ; wrote and tested user retractions actually removing people from the friend lists on retractions	2010-08-13 11:19:20 -07:00
ilya	1fcb033b68	RS, IZ; receiving a request no longer overwrites the group it is destined for, specs pass	2010-08-13 10:55:18 -07:00
ilya	23fc799b4d	Turning up logging on friend request receive	2010-08-13 10:04:33 -07:00
ilya	3d57fb7f78	Merge branch 'friend-refactor' of github.com:diaspora/diaspora_rails into friend-refactor	2010-08-13 09:47:29 -07:00
ilya	5e33de7e56	unfriended method in the user	2010-08-13 09:47:08 -07:00
danielvincent	64c7a87aeb	removed two bogus lines from user.receive	2010-08-13 08:57:22 -07:00
danielvincent	3d12e9ab51	DG RS; friending through groups	2010-08-12 21:30:16 -07:00
ilya	26bebbe393	MS IZ changing it back	2010-08-12 10:04:56 -07:00
ilya	352b9f65e0	MS IZ unfriending maybe works	2010-08-11 20:23:28 -07:00
ilya	283b4a40b5	IZ MS tests now pass	2010-08-11 17:51:46 -07:00
ilya	b0455b9532	Merge branch 'friend-refactor' of github.com:diaspora/diaspora_rails into friend-refactor	2010-08-11 17:45:13 -07:00
ilya	dd3fb1677b	MS IZ continuiung to squash failing tests	2010-08-11 17:44:43 -07:00
Raphael	a19e29f2c2	RS, DG; Album.mine_or_friends actually fixed	2010-08-11 17:33:37 -07:00
Raphael	3d46a49b97	RS, DG; fixing Album.mine_or_friends	2010-08-11 16:50:22 -07:00
Raphael	cf5476f601	RS, DG; stop crashing trying to socket albums	2010-08-11 16:40:08 -07:00
Raphael	ab25e35a71	Comment guids now serialize	2010-08-11 16:31:12 -07:00
Raphael	d8959326d5	RS, DG; unsocketing is back in	2010-08-11 16:24:05 -07:00
Raphael	4b5071ec05	DG, RS; socketing back in for your own posts	2010-08-11 16:12:55 -07:00
Raphael	2d14f64745	RS, DG; Socketing moved to user	2010-08-11 16:10:27 -07:00
Raphael	0907d7a9fd	RS, DG; Cleaned up the switch in user.receive	2010-08-11 16:01:16 -07:00
Raphael	bee71c5a23	RS, DG; All saving moved to user	2010-08-11 15:22:06 -07:00
Raphael	c6a620c7dd	RS, DG; store_from_xml is gone, use user.receive	2010-08-11 15:05:05 -07:00
Raphael	5abd604dad	RS, DG; build_xml_for has been eliminated.	2010-08-11 14:21:53 -07:00
Raphael	d7828a8bf3	Merge branch 'friend-refactor' of github.com:diaspora/diaspora_rails into friend-refactor ... Conflicts: spec/controllers/publics_controller_spec.rb	2010-08-11 13:59:21 -07:00
Raphael	9c9ebbf4c7	build_xml_for is no longer static, we should probably change the name	2010-08-11 13:58:18 -07:00
ilya	29b1217fcd	Merge branch 'friend-refactor' of github.com:diaspora/diaspora_rails into friend-refactor	2010-08-11 12:29:35 -07:00
ilya	11a8b8f3d4	MS IZ testing many the friend request user methods	2010-08-11 12:28:48 -07:00
Raphael	599d1da620	Moved socket code out to lib, unsocketing from view should now work again	2010-08-11 12:03:26 -07:00
Raphael	144e9ed439	Bookmarks now clean link in instantiate, posting them should work right again	2010-08-11 11:18:40 -07:00
maxwell	a45d852f30	MS IZ request specs now PASS	2010-08-10 17:36:25 -07:00
maxwell	b9718c079b	Merge branch 'friend-refactor' of github.com:diaspora/diaspora_rails into friend-refactor	2010-08-10 16:05:10 -07:00
maxwell	8a3eb9f6cf	IZ MS one last receive url...i think...	2010-08-10 16:04:08 -07:00
Raphael	a9ebe44b1d	Merge branch 'friend-refactor' of github.com:diaspora/diaspora_rails into friend-refactor	2010-08-10 16:03:54 -07:00
Raphael	0fb55be7a0	RS, DG; You can now sign up to be a user on a seed	2010-08-10 16:03:38 -07:00
maxwell	89c54d1a63	MS IZ receive url in the request and a slash in person	2010-08-10 15:56:34 -07:00
Raphael	8b9cd3453d	RS, DG; User.instatntiate simplified	2010-08-10 15:44:14 -07:00
maxwell	432ce02a14	MS IZ receive url is better	2010-08-10 15:35:40 -07:00
Raphael	a8b77cf868	DG RS; made an instantiate method for user which makes a person and profile	2010-08-10 15:35:27 -07:00
maxwell	da4de20ce1	IZ MS made things push to the receive url	2010-08-10 15:24:51 -07:00
maxwell	487de2d865	MS IZ receive, not recieve	2010-08-10 15:17:12 -07:00
maxwell	7ff25ef81a	MS IZ saved the person model	2010-08-10 15:10:11 -07:00
maxwell	0ffe893f8a	MS IZ merging diffs	2010-08-10 12:37:04 -07:00
maxwell	71612ba33d	changing some webfinger resources	2010-08-10 12:36:00 -07:00
Raphael	aa1f892c35	Merge branch 'friend-refactor' of github.com:diaspora/diaspora_rails into friend-refactor	2010-08-10 12:27:02 -07:00
Raphael	9947a2abb8	RS, DG; latest_status thing now works, started putting signup back in	2010-08-10 12:26:43 -07:00
maxwell	95c4de5d6c	MS IZ fixed all of the request specs zomg	2010-08-10 11:26:32 -07:00
Raphael	b645eb3f3d	RS, DG, comments socket again	2010-08-10 11:05:29 -07:00
Raphael	aa4d428ab7	RS, DG; Groups can now include other users, the user's first group is displayed by default, never use many without :in =>	2010-08-10 11:02:04 -07:00
maxwell	38abd51666	MS IZ fixed a couple of failing specs in the parser	2010-08-09 21:09:51 -07:00
maxwell	68c4de6c16	Merge branch 'friend-refactor' of github.com:diaspora/diaspora_rails into friend-refactor	2010-08-09 19:05:12 -07:00
maxwell	d443be35f9	Merge branch 'friend-refactor' of github.com:diaspora/diaspora_rails into friend-refactor ... Conflicts: app/controllers/publics_controller.rb app/models/user.rb	2010-08-09 17:31:46 -07:00
maxwell	56d7c67bbb	Going toward pending requests	2010-08-09 17:21:41 -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	c14bb5a4f8	Changed info logging to debug logging almost everywhere	2010-08-09 14:39:37 -07:00
Raphael	59147eb232	Person.new in dev seed	2010-08-09 13:03:27 -07:00
Raphael	33a827c33a	RS, DG; Websocket is now working again, users have a channel	2010-08-09 13:02:08 -07:00
maxwell	82578ad80c	MS IZ doing the friend querying correctly in user	2010-08-09 12:25:36 -07:00
maxwell	4243d8efca	MS IZ using the particular user's friends in the send_friend_request_to	2010-08-09 12:19:26 -07:00
maxwell	f4428679ef	First attempt at fixing warzombie friendingw	2010-08-09 11:44:13 -07:00
maxwell	921ee029b6	MS IZ putting the person in the return trip	2010-08-09 11:12:15 -07:00
maxwell	8532be1307	MS IZ moved activate_friend to user	2010-08-09 11:03:16 -07:00
maxwell	67843a21e2	MS IZ saving the person in accept of FR	2010-08-09 10:50:49 -07:00
Raphael	73a6cd911b	DG, RS; User person delegation fixed	2010-08-09 10:46:02 -07:00
maxwell	544f7f08e5	MS IZ doesn't delete from pending friends since there is nothing in it	2010-08-09 10:38:13 -07:00
ilya	890f927492	removed references of mine? method in all views	2010-08-08 22:53:23 -07:00
ilya	8e6dfe7166	DG IZ having an email key makes devise work, ring to deploy	2010-08-08 17:00:39 -07:00
Raphael	214685e5a9	Dev seed might now work	2010-08-06 17:11:50 -07:00
Raphael	7076097ee4	RS, IZ; The tests are green.	2010-08-06 16:56:13 -07:00
maxwell	58de12df5e	DG MS; PeopleController#index now accepts query string for search (only looks at first_name and last_name)	2010-08-06 16:35:02 -07:00
Raphael	4350e17656	RS, IZ; removed lots of putses, fixed up request, parser, retractions	2010-08-06 16:01:39 -07:00
Raphael	f2e327d908	User factory now works	2010-08-06 13:27:42 -07:00
Raphael	0f596af5c4	Refactored message_queue getting, fixed retraction spec	2010-08-06 13:13:00 -07:00
Raphael	b5cbfab36e	RS, IZ; Comment spec now passes	2010-08-05 19:01:45 -07:00
maxwell	5d924dadf4	MS DG; 19 failing specs left	2010-08-05 17:16:51 -07:00
maxwell	5e6d0c1153	Merge branch 'master' of github.com:diaspora/diaspora_rails into ... friend-refactor, also fixed more specs Conflicts: app/models/person.rb app/models/user.rb spec/factories.rb	2010-08-05 15:13:05 -07:00
danielvincent	dae8f26692	DG MS; fixed most photo specs	2010-08-05 11:56:37 -07:00
Raphael	bb66e87905	RS, IZ; Encryption specs now pass with openssl	2010-08-05 11:56:31 -07:00
Raphael	f8e7d3f313	RS, IZ; Rolling back special casing of friend-request	2010-08-05 11:14:40 -07:00
Raphael	2429a1a476	RS, IZ; keys should roxml	2010-08-05 11:13:38 -07:00
Raphael	ebe14b5afd	RS, IZ; Not using person in friend request verification	2010-08-05 11:09:36 -07:00
Raphael	f487e271c0	RS, IZ; Posts now sign, signatures and keys now serialize	2010-08-05 10:43:02 -07:00
danielvincent	4827953bec	DG MS; person specs are now passing. retraction on unfriend is now uncommented	2010-08-05 10:29:30 -07:00
danielvincent	42c0b82068	one failing test in Person. i have no idea.	2010-08-04 23:54:15 -07:00
danielvincent	d6bc93fb96	commented out retraction on unfriending due to ROXML messing things up ... .	2010-08-04 23:47:27 -07:00
ilya	4a3f6b2986	need to serialize key to bson	2010-08-04 21:08:25 -07:00
ilya	f11e973602	added the inport key thing in user	2010-08-04 20:44:18 -07:00
ilya	5dfc097c88	replaced the functionality with openssl, didn't do the encryption spec	2010-08-04 20:32:15 -07:00
danielvincent	f2d7f35b84	unfriend still not removing association from bad_friend	2010-08-04 20:29:54 -07:00
danielvincent	7a556e1b3c	Merge branch 'master' of github.com:diaspora/diaspora_rails into friend-refactor	2010-08-04 19:23:56 -07:00
danielvincent	c92a225556	DG MS; user-person relationship done. bunch of failing stuff.	2010-08-04 19:22:14 -07:00
Raphael	6832c67a78	RS IZ friend requests are hopefully now signed	2010-08-04 17:20:34 -07:00
Raphael	7676179e54	IZ, RS; now passing correct object to verify_signature	2010-08-04 17:10:38 -07:00
Raphael	5a802299d5	IZ, RS; Retractions should now be signed	2010-08-04 17:06:15 -07:00
Raphael	2388237174	RS, IZ; Replace type_name method with object.class.to_s	2010-08-04 16:36:08 -07:00
Raphael	b8a2e8ecdf	RS, IZ; Fix Photo.instantiate, make photo url include spec a little more specific	2010-08-04 16:13:32 -07:00
Raphael	e2c0ae2cee	Merge branch 'master' of github.com:diaspora/diaspora_rails	2010-08-04 16:01:37 -07:00
danielvincent	75663b2447	DG MS; user can edit photo caption. also, photos have captions.	2010-08-04 16:00:59 -07:00
Raphael	58addca8dd	RS, IZ; extracted and murdered ostatus.	2010-08-04 16:00:01 -07:00
Raphael	e3c28c4fee	Fixed Photos, and Carrierwave initializer	2010-08-02 21:31:14 -07:00
Raphael	da3bf35d81	Typo in album	2010-08-02 18:30:09 -07:00
Raphael	74691228d3	RS, IZ; All relevant controllers now create with user.post	2010-08-02 16:32:52 -07:00
Raphael	9fe37b1d8c	RS, IZ; Cleaned up user spec, started to add current_user.post	2010-08-02 16:16:23 -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
ilya	f191aef981	DG IZ profile profile photos should update, removed the scaled down hack	2010-07-29 19:44:58 -07:00
ilya	abc5ee412d	DG IZ assiging the new profile to the person in the parse objects from xml	2010-07-29 19:24:52 -07:00
ilya	0aa268a62d	DG IZ trying asymetric searization and marshaling	2010-07-29 19:12:20 -07:00
ilya	f6495e2bec	RS IZ photos now fade in on the album upload page	2010-07-29 17:26:05 -07:00
maxwell	6aa1fa1826	DG MS profiles send? who knows...	2010-07-29 15:53:38 -07:00
Raphael	3376057c33	Merge branch 'master' of github.com:diaspora/diaspora_rails	2010-07-29 13:58:49 -07:00
danielvincent	11a099914c	on photo delete, photo checks to see if it is set in user profile. if it is, profile is edited.	2010-07-29 11:07:44 -07:00
maxwell	7a0db375ab	MS added rails 3rc	2010-07-29 09:59:03 -07:00
Raphael	1e954eae4f	took out old puts, put in new one	2010-07-28 20:37:42 -07:00
maxwell	049361ea15	MS profiles should send, need to just make the parser now	2010-07-28 18:32:00 -07:00
maxwell	80db1132d1	Fixed the tests;	2010-07-28 16:50:38 -07:00
danielvincent	f6687316d6	DG IZ; only a remote scaled photo is downloaded, not the full res	2010-07-26 16:08:19 -07:00
danielvincent	65acd48885	Merge branch 'master' of github.com:diaspora/diaspora_rails	2010-07-26 15:52:02 -07:00
danielvincent	36abb19e2c	added the uploading photo wjava script	2010-07-26 15:50:41 -07:00
maxwell	47f5c77e1a	kinda prettied up the albums page	2010-07-26 15:09:02 -07:00
maxwell	0c2fc54c0f	MS we didnt serialize the post creator sig....sigh.... this could not be the problem	2010-07-26 13:29:39 -07:00
maxwell	b797704a14	MS small pointless webhooks refactor	2010-07-24 16:11:32 -07:00
maxwell	416f128ba8	MS pushing code around into seperate files for clairty, many specs moved around to much more sane names. i still need to break out diaspora generator out of webhooks module	2010-07-24 15:48:42 -07:00
maxwell	2cbdc5413f	MS nuked some random non helpful puts statements	2010-07-24 12:12:48 -07:00
maxwell	9095a06738	MS just broke common.rb out into 3 files.... all tests pass, dont shoot me if something is broken, but on first pass we look ok	2010-07-24 01:56:07 -07:00
maxwell	302cf54fab	MS subscribers should now unsubscribe	2010-07-23 21:31:28 -07:00
maxwell	311a60f7b7	MS should be able to unsubscribe from an ostatus feed now, now it needs to be put in the controller	2010-07-23 21:16:36 -07:00
maxwell	00159d1fb8	MS minor defaults change	2010-07-23 18:17:48 -07:00
ilya	4eccf63fef	Can't upload to other people's album	2010-07-23 16:26:05 -07:00
ilya	031234f763	Failing at syntax	2010-07-23 15:42:12 -07:00
ilya	bb251e73b3	Logging photo.inspect after save	2010-07-23 15:37:07 -07:00
ilya	e754e97c7e	Logging for the differing id problem in remote photos	2010-07-23 15:32:27 -07:00
ilya	2f35d07807	Broke photo signing	2010-07-23 15:22:04 -07:00
ilya	e43f54cc72	RS IZ remote photo url does not change on marshaling'	2010-07-23 15:13:40 -07:00
maxwell	0fdce91756	DG MS added views for ostatus following	2010-07-22 21:27:43 -07:00
maxwell	16bbce3054	DG MS ostatus post and author now exsist	2010-07-22 20:16:24 -07:00
ilya	7df902b9db	XML reader was assuming photos were local	2010-07-22 12:39:53 -07:00
ilya	065c790e4e	not saving in photo receive and logging the saving in common	2010-07-22 12:23:18 -07:00
ilya	a1a8fc1ea4	Merge branch 'master' of github.com:diaspora/diaspora_rails	2010-07-22 12:07:36 -07:00
ilya	b2dcaed5e2	RS IZ saving in the photo parsing	2010-07-22 12:07:18 -07:00
maxwell	daf0de2eb0	Merge branch 'master' of github.com:diaspora/diaspora_rails into ostatus	2010-07-22 11:54:07 -07:00
ilya	24f8b33f2f	Tests all pass!	2010-07-22 11:36:36 -07:00
ilya	773dbd91aa	RS IZ one more test passing going to bisect	2010-07-22 10:21:10 -07:00
ilya	8d87f07d31	using owner instead of first user	2010-07-22 09:55:13 -07:00
maxwell	6869384732	i think it works - max	2010-07-21 21:15:16 -07:00
ilya	14533f6534	url not path	2010-07-21 21:13:31 -07:00
maxwell	9b1fcdbab2	MS DG some serious message handler and user request API stuff....needs way more tests	2010-07-21 20:33:43 -07:00
ilya	a222edc646	Url not path	2010-07-21 20:22:30 -07:00
ilya	ef7b9f58a7	IZ remote files	2010-07-21 19:51:34 -07:00
ilya	a75dfb0201	Album retractions	2010-07-21 18:27:18 -07:00
ilya	6b9a3fc518	Pushing Albums out	2010-07-21 18:26:03 -07:00
ilya	5a5842dbdc	Accidently started websocketing albums	2010-07-21 18:22:57 -07:00
ilya	a6104fd2b5	RS, IZ; Albums must be pushed	2010-07-21 18:07:38 -07:00
ilya	606fa3353c	RS, IZ; Photos might push urls to friends	2010-07-21 18:02:13 -07:00
maxwell	0d268905e7	DG MS all photos of a album are destroyed on album deletion	2010-07-21 17:05:40 -07:00
maxwell	695a93ddad	DG MS added basic album traversal	2010-07-21 14:29:58 -07:00
maxwell	301343ae01	DG MS added basic album support	2010-07-20 21:28:24 -07:00
danielvincent	249948a500	hotfix for photos/collection relationship to fix photo saving	2010-07-20 19:29:19 -07:00
danielvincent	51fd87db36	no ideas why collection saving isn't working...	2010-07-20 15:15:11 -07:00
ilya	1bd2c16ef1	DG IZ started the collection spec	2010-07-20 14:01:56 -07:00
ilya	e08ed8805f	DG IZ photo upload form now with all the others	2010-07-20 10:00:02 -07:00
Raphael	7d7c39e3dc	callbacks not running on photo save	2010-07-17 14:09:21 -07:00
Raphael	93e900b998	fixed comments, did I break request url?	2010-07-17 11:29:30 -07:00
Raphael	d8ad4367d5	Tests now pass	2010-07-17 09:32:41 -07:00
danielvincent	04eb66b2e6	user has a image url field for user picture	2010-07-16 23:02:24 -07:00
Raphael	bb4d5cad59	Merge branch 'master' of github.com:diaspora/diaspora_rails	2010-07-16 17:26:22 -07:00
Raphael	fa46fb31f4	Added photos, profile editing	2010-07-16 17:26:06 -07:00
maxwell	3d87c111df	webfinger is now not washington specific	2010-07-16 14:15:19 -07:00
Raphael	9165ac413a	image uploading started	2010-07-16 12:31:24 -07:00
Raphael	256757f02a	Rails.logger in a model	2010-07-16 10:29:42 -07:00
Raphael	9f90ae4db0	Syntax errors are awesome	2010-07-16 10:20:41 -07:00
Raphael	4178a78b23	Logger in receive friend request	2010-07-16 10:18:45 -07:00
Raphael	d7e07dfda8	comment specs fixed, comments now signed by post poster	2010-07-15 14:41:39 -07:00
Raphael	64c81f0551	merge in master, only friend tom	2010-07-15 14:18:22 -07:00
Raphael	862787ea93	RS, DG; person destruction no longer deletes comments	2010-07-15 14:12:01 -07:00
Raphael	2d5d3a2f2d	commit more often	2010-07-15 13:29:21 -07:00
Raphael	fd18ac6c4b	Merge branch 'master' of github.com:diaspora/diaspora_rails into encryption	2010-07-15 13:06:46 -07:00
maxwell	f97218c005	MS IZ cleanup of pubsub stuff	2010-07-15 10:24:41 -07:00
Raphael	c82f41e740	Merging in master	2010-07-14 12:16:24 -07:00
Raphael	d7d1af8058	always import the key	2010-07-14 11:55:15 -07:00
Raphael	2e0e904cdb	Sending key in friend request response	2010-07-14 11:47:36 -07:00
Raphael	a7ba1d8920	Assign key before validation	2010-07-14 11:25:34 -07:00
Raphael	335f202e2b	RS, IZ; Profiles are now embedded	2010-07-14 11:22:44 -07:00
maxwell	1b63fbbec7	DG MS added pubsub gem, added hub to message queue	2010-07-14 11:01:28 -07:00
Raphael	f680c4b71e	RS, IZ; Signature Verification now stubbed out outside of encryption specs, green	2010-07-14 11:01:21 -07:00
ilya	4a0bd5fc0c	RS IZ; removed validations on marshaling and removed key deletion on person destroyw	2010-07-13 17:36:18 -07:00
ilya	2862925e2d	before validations on create	2010-07-13 15:19:39 -07:00
ilya	6614285644	params string now a method	2010-07-13 15:08:14 -07:00
ilya	0df76daab5	assign key	2010-07-13 14:44:30 -07:00
ilya	4a53d29939	assign key	2010-07-13 14:40:10 -07:00
ilya	d4d1aa0fd5	RS IZ validations of signature are now called on craeeton of a post	2010-07-13 14:34:30 -07:00
maxwell	9e93fd072e	DG MS; added subscriber model for ostatus interop	2010-07-13 14:32:27 -07:00
ilya	83ea15c97a	merging in master	2010-07-13 12:23:09 -07:00
ilya	964ee65b11	rs iz ; the signature of the signable_accessors are now in the xml	2010-07-13 12:21:11 -07:00
ilya	add9961ca4	Now signing only xml accessors other than person	2010-07-13 11:41:57 -07:00
ilya	7952385cdb	added newlines to post	2010-07-13 11:24:57 -07:00
ilya	25940cf567	Removed stray puts	2010-07-13 11:12:49 -07:00
ilya	a219801c2d	Now using detached signatures	2010-07-13 11:10:04 -07:00
ilya	6d431e9459	signing tests sort of almost done	2010-07-13 11:01:27 -07:00
ilya	b9146cbb41	RS IZ; now signatures work like in real life	2010-07-12 20:42:22 -07:00
danielvincent	ed8ed9be9e	DG MS; started Diaspora::XML for ostatus compliance	2010-07-12 20:15:12 -07:00
ilya	406c00aeb6	RS IZ; using detached signatures and verification things	2010-07-12 18:31:20 -07:00
maxwell	f9f7f0fcc7	DG MS; request makes sure http:// and an ending slash is present on a new request link	2010-07-12 12:33:31 -07:00
maxwell	5ba2e61ab8	MS DG moved xml accessor for profile	2010-07-12 11:37:46 -07:00
ilya	174eb7e8f7	Merging in Master	2010-07-12 11:28:39 -07:00
maxwell	18760f13f8	push changes	2010-07-12 11:25:53 -07:00
ilya	3dfb55ee85	IZ MS pulled in master: this is now the authoritative branch; waiting for dan to fix gpg so we can move on	2010-07-11 00:04:08 -04:00
ilya	72e7514535	MS fixed your key fingerprint bug. ROML sux. all things which are marshalled as a class need to be after the other fields, because those fields were ignored. also, ids were no long being marshalled correctlyw	2010-07-10 23:30:24 -04:00
maxwell	902a8cb349	MS factored out User.first EVERYWHERE. Use User.owner now instead (currently just calls User.first, but now it is easier to make a new change	2010-07-10 10:34:46 -07:00
ilya	1bed575b90	Added the Key Fingerprint validation to the person model(defaults to empty string)	2010-07-10 06:09:53 -04:00
ilya	7eba033c0d	Revert "RS IZ Friday night, key_fingerprint serialization weirdness" ... This reverts commit c6e16835df9c5d46d0ec5e0f1860da1ef4c0986a.	2010-07-10 05:29:57 -04:00
ilya	8c75761ba1	RS IZ Friday night, key_fingerprint serialization weirdness	2010-07-10 02:25:48 -04:00
maxwell	d37461a432	ms dg post deletions now come thru the socket again	2010-07-09 19:27:39 -07:00
maxwell	23057869e1	DG MS debugging friend request	2010-07-09 18:41:39 -07:00
maxwell	8147602570	DG MS friends now are delete	2010-07-09 18:10:11 -07:00
ilya	eec66395c1	Removed key password	2010-07-09 20:22:01 -04:00
ilya	91e96973ef	Merge branch 'master' of github.com:diaspora/diaspora_rails into encryption	2010-07-09 19:17:14 -04:00
ilya	2f5ec3d7c4	added a bunch of public keys to test ring	2010-07-09 19:17:07 -04:00
maxwell	f5fd0b011a	DG MS; upon friend deletion, all connected posts and comments are purged	2010-07-09 16:08:00 -07:00
ilya	7eec041846	Merge branch 'master' of github.com:diaspora/diaspora_rails into encryption	2010-07-09 18:15:22 -04:00
ilya	8c45dd4702	testing signing	2010-07-09 18:15:17 -04:00
ilya	b802db9194	writing signing	2010-07-09 17:41:01 -04:00
maxwell	cf352b6f8d	DG MS; cannot friend request an existing friend.	2010-07-09 14:35:42 -07:00
maxwell	b052ddeb84	DG MS; database seed scripts now ensure all friends are set to true	2010-07-09 14:13:39 -07:00
maxwell	48adc9ebc1	DG MS; person object now properly stored with request object save	2010-07-09 14:07:35 -07:00
ilya	cfaf13ac7d	Use pregenerated keys	2010-07-09 13:45:00 -04:00
maxwell	c7e1bc3a46	DG MS debugging friend requests	2010-07-09 10:18:29 -07:00