Raphael
5e6c14fce8
Simplify connect_users for a huge test speedup
2010-12-16 14:47:37 -08:00
danielvincent
1465024f10
skipping receive process for incoming local posts, calling receive_object directly
2010-12-16 14:39:19 -08:00
Raphael
eb56521a66
Don't query inside of loops...
2010-12-16 12:25:31 -08:00
danielvincent
f821f49db1
added similar contacts to contact pages
2010-12-16 11:49:08 -08:00
Raphael
b467d12d83
Fix spec in peoplecontroller
2010-12-16 11:37:16 -08:00
maxwell
226d95ec2c
Merge branch 'master' of github.com:diaspora/diaspora
2010-12-15 19:15:26 -08:00
Raphael
837ad20045
unpend spec in aspects controller spec
2010-12-15 18:11:09 -08:00
maxwell
d5ba34f245
Merge branch 'master' of github.com:diaspora/diaspora
2010-12-15 18:05:54 -08:00
Raphael
e881edab96
Fix missing partials on last commit, you can now accept a request from the requestor's profile page
2010-12-15 18:05:18 -08:00
Raphael
3b727dc887
Add share_with fancybox on search page, fix a couple of queries
2010-12-15 17:45:12 -08:00
maxwell
8ec85d3b12
basic notifications
2010-12-15 17:31:36 -08:00
Raphael
b22398951e
Send requests from the aspect list on the person show page
2010-12-15 14:48:14 -08:00
Raphael
80a9b97f8d
add_person_to_aspect is now add_contact_to_aspect, some methods now take models rather than ids
2010-12-15 14:48:14 -08:00
maxwell
9555fae33d
no notifications on retractions
2010-12-15 13:14:46 -08:00
maxwell
61b2bbbd7d
Merge branch 'master' of github.com:diaspora/diaspora
2010-12-15 12:28:09 -08:00
maxwell
b6754d92b7
adding basic notification class
2010-12-15 12:11:47 -08:00
maxwell
a7d36615e6
adding basic notification class
2010-12-15 12:11:37 -08:00
Dan Hansen & Sarah Mei
82e2f23f91
Merge branch 'master' of github.com:diaspora/diaspora
2010-12-15 14:29:33 -05:00
Raphael
bd31ff3ee3
Fix request validations, build.
2010-12-15 10:48:29 -08:00
Dan Hansen & Sarah Mei
fbfe28bcfa
added vimeo method, still needs support from lib/youtube_titles.rb. updated locales
2010-12-15 01:20:53 -05:00
Dan Hansen & Sarah Mei
c4a7745c88
Refactored the markdownify method.
2010-12-15 01:00:20 -05:00
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
