Commit graph

1127 commits

Author SHA1 Message Date
danielvincent
f1ee32145d Remove pending_requests from user, just use Request.from and Request.to. 2010-12-14 19:00:03 -08:00
maxwell
0119de4afc adding task to fix users with periods 2010-12-14 18:45:10 -08:00
maxwell
6bd42874e8 adding a task to fix person object with spaces in their name 2010-12-14 17:36:27 -08:00
maxwell
d24be269f2 small refactor of admin mail. don't call deliver in the method 2010-12-14 17:36:26 -08:00
danielvincent
b1c0facfe6 initiating a request now just creates a pending contact instead of persisting a request 2010-12-14 17:11:43 -08:00
Raphael
06b7b1c99a WIP pending contacts 2010-12-14 17:11:42 -08:00
Raphael
251cdec2ec Add full request cycle cucumber feature 2010-12-14 17:11:42 -08:00
Raphael
e63a8a4bfa Take contact.person query out of the views, only query people once in hashes_for_aspects 2010-12-14 12:11:36 -08:00
maxwell
0bd13ec106 use blank instead of empty for the person#name helper 2010-12-14 11:30:06 -08:00
maxwell
42c22cedf9 Merge branch 'master' of github.com:diaspora/diaspora 2010-12-13 14:38:47 -08:00
MrZYX
045ba7c419 Merge branch 'email-validation' of https://github.com/themasch/diaspora into themasch-email-validation 2010-12-13 22:49:50 +01:00
maxwell
502db347cc removed homepage detail into a partial, which you should redefine 2010-12-13 12:52:23 -08:00
Raphael
f861955d80 profile.image_url is set to :thumb_large in update_profile 2010-12-13 12:11:54 -08:00
Mark Schmale
4cc62ffaca added spec for email validation 2010-12-13 15:46:19 +01:00
MrZYX
1284fcc92d fix for #699 2010-12-13 15:04:11 +01:00
Sarah Mei
3eaf7c48e6 white space police 2010-12-12 13:43:01 -08:00
Sarah Mei
7cd8e0f16b Fix jasmine specs so that they fail when they're supposed to. 2010-12-12 12:57:11 -08:00
danielvincent
d19353ed8f added newline support to markdownify 2010-12-12 00:44:54 -08:00
Sarah Mei
646603ffe0 Don't show rake output when running migrations_spec 2010-12-11 12:32:33 -08:00
danielvincent
6f62161442 invitation emails stripped of whitespace from form 2010-12-10 18:10:24 -08:00
danielvincent
2c5d5d9328 show already invited users on invitation#new 2010-12-10 18:05:08 -08:00
MrZYX
0b57ccd47f fixed require 2010-12-10 21:49:09 +01:00
Raphael
2c141baf78 Capitalization... 2010-12-10 12:12:34 -08:00
Raphael
4bb9370c5d Correctly stub the websocket redis method 2010-12-10 11:53:18 -08:00
maxwell
076d0e5edd Merge branch 'master' of github.com:diaspora/diaspora 2010-12-10 11:47:20 -08:00
maxwell
c774685d52 users can now disable email notfications 2010-12-10 11:47:10 -08:00
Raphael
0e77577fbd Websocket now uses redis 2010-12-10 11:25:38 -08:00
MrZYX
36043845ca fixed requires for ruby 1.9 2010-12-10 17:25:02 +01:00
Alec Leamas
eacee54846 Replace APP_CONFIG[:terse_pod_url] with uri object.
Adds a new APP_CONFIG[:pod_uri] item, an uri object parsed from
pod_url. Replace all occurrences of APP_CONFIG[:terse_pod_url] with
APP_CONFIG[:pod_uri].host. Closes http://bugs.joindiaspora.com/issues/684,
using the well-defined semantics of the uri object.

The pod_url is normalized using module URI's functions, always with a
trailing /.

The diaspora-handle will always reflect the pod_url with this patch
i. e., a pod_url like www.dpod.se will give the handle xx@www.dpod.se;
previous code stripped the www. prefix. If this is a problem, it
should be addressed by another setting, since one cannot presume that
www.domain.tld resolves to the same address as domain.tld.
2010-12-10 14:29:19 +01:00
Raphael
fc73c02c3a Fix hashes_for_person spec 2010-12-09 20:01:37 -08:00
maxwell
dfbc01ca7a added a test for the converter rake task 2010-12-09 19:29:25 -08:00
maxwell
bf56364019 tests for post to services resque job 2010-12-09 19:29:25 -08:00
maxwell
d81aa7dfe1 added specs for push_to_services, also rename the socket webfinger job spec because since it did not end with '_spec' it was not getting run 2010-12-09 19:29:25 -08:00
maxwell
a4336a8e72 moar tests for services 2010-12-09 19:29:25 -08:00
maxwell
041e747db6 MSSM services are now broken out into seperate classes, and we cleaned up posting to them 2010-12-09 19:29:25 -08:00
Raphael
2be0666d80 Remove query from aspects manage, correct spec in User spec 2010-12-09 19:11:47 -08:00
Raphael
e406426b81 select only profile on most Person queries 2010-12-09 15:04:40 -08:00
maxwell
13740da9b9 fix for people controller where Person.search was returning a non-deterministic order of people 2010-12-09 14:37:07 -08:00
Raphael
3a4caca397 Fix photo uploading in profile photos, style photo upload button better 2010-12-09 13:06:31 -08:00
Raphael
b8589c457d Refactor people edit page, now using form_tag 2010-12-09 13:03:30 -08:00
zhitomirskiyi
23d2a92bf1 pushing the profile to to all the contacts 2010-12-09 11:51:35 -08:00
danielvincent
46793179db people#show displays shows public posts for non-contacts as well 2010-12-08 16:53:24 -08:00
danielvincent
b94e6ae4a0 shift+enter submits new messages/comments 2010-12-07 21:30:29 -08:00
Raphael
18319f8e42 Hopefully cut down the stream rendering time by memoizing the new comment form 2010-12-07 09:28:11 -08:00
Raphael
f421f1327c Take nested queried out of aspects manage 2010-12-07 00:21:05 -08:00
Raphael
9442553504 Refactor aspectscontroller and aspect_contacts.haml 2010-12-06 17:20:21 -08:00
Raphael
8a19e9f961 Fix spec 2010-12-06 13:56:40 -08:00
Raphael
32a2264af5 Refactor peoplecontroller index 2010-12-06 13:36:20 -08:00
maxwell
97c1ce54c1 fixed the batch emailer tests... sorry it took me so long 2010-12-06 10:56:04 -08:00
Raphael
3ef5ac5252 Add some specs to Invitation, use I18n in InvitationsController 2010-12-05 14:37:43 -08:00