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
8894fa4daa
Merge branch 'master' of github.com:diaspora/diaspora
2010-10-18 16:28:57 -07:00
ilya
d642928268
invite sends friend request if already friends, and raises if already friends
2010-10-18 16:27:02 -07:00
Raphael
676e802fd2
Merge branch 'master' of github.com:diaspora/diaspora
2010-10-18 15:46:44 -07:00
Raphael
b681850783
Get rid of warning/error on invites/_new partial
2010-10-18 15:46:14 -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
Raphael
41a0718fc2
Don't overwrite existing pod_url in db:seed:dev
2010-10-18 12:56:22 -07:00
Raphael
eeea57d307
Case sensitivity...
2010-10-18 12:43:04 -07:00
Raphael
244accc9a9
flash error on friending self
2010-10-18 12:11:32 -07:00
Raphael
f90d38bb9c
Merge branch 'master' of http://github.com/tristil/diaspora into tristil-merge
2010-10-18 12:00:20 -07:00
Raphael
3436371a96
Merge remote branch 'archi/332-quickfix'
2010-10-18 11:44:47 -07:00
Raphael
8e4691b9d0
Merge remote branch 'rmaskey/269-album-link'
2010-10-18 11:27:13 -07:00
Raphael
d38316002e
Merging in Hexagon fancybox. TODO: Refactor out fancybox options hash.
2010-10-18 11:24:47 -07:00
danielvincent
d18757b5c1
pushed stream up
2010-10-18 11:00:52 -07:00
danielvincent
4b1516542d
various. fixed publisher in new layout.
2010-10-18 11:00:52 -07:00
danielvincent
54e5fb4abb
add new aspect back on manage page. changed badges
2010-10-18 11:00:52 -07:00
danielvincent
15104cf920
somewhat there
2010-10-18 11:00:52 -07:00
ilya
4fbe933158
removed pending
2010-10-18 10:57:22 -07:00
ilya
17bd9710dc
invitation tests we're evaluating before stubbing
2010-10-18 10:38:59 -07:00
ilya
e648042b15
the user destroy now deletes the aspects
2010-10-18 10:26:45 -07:00
ilya
73dfab8601
Merge branch 'master' of github.com:diaspora/diaspora
2010-10-18 09:56:36 -07:00
archi
5e97fd3b52
Merge branch 'master' of git://github.com/diaspora/diaspora into 332-quickfix
2010-10-18 11:06:42 +02:00
danielvincent
eca37e1a28
small view cleanups
2010-10-17 21:55:03 -07:00
danielvincent
2f5547626e
fixed error in status_messages_controller
2010-10-17 21:31:12 -07:00
danielvincent
1139299f42
removed loop and hidden checkboxes from publisher. hidden field passes single aspect id or :all to controller
2010-10-17 20:47:51 -07:00
danielvincent
060767e794
comments submit on enter. design touchup
2010-10-17 19:36:43 -07:00
danielvincent
108bf9d99e
Merge branch 'master' of github.com:diaspora/diaspora
2010-10-17 19:33:57 -07:00
Joseph Method
e3e4a6b319
Continuation of previous commit
2010-10-17 19:07:54 -04:00
Joseph Method
b58b6d380b
Controller and module specs and code to prevent a fatal error when you try to befriend yourself
2010-10-17 19:05:19 -04:00
archi
2f7bc02712
Some specs for the make_links function.
...
Can i haz youtubeZ? :P
2010-10-17 22:25:56 +02:00
archi
baa0b43655
Merge branch 'master' of git://github.com/diaspora/diaspora into 332-quickfix
2010-10-17 21:19:27 +02:00
Sarah Mei
fcdcf88a79
Person.by_webfinger preserves case of identifier. Backfill specs for PublicsController#webfinger.
2010-10-17 12:18:53 -07:00
archi
1d9aa4c43d
Modified spec (doesn't check Youtube handling due to disabled net::http)
2010-10-17 21:07:49 +02:00
archi
f2af56f4b2
Youtubelink support :)
...
Tested with Firefox, Chrome and Mobile Safari (IE8 is broken anyway)
2010-10-17 20:18:24 +02:00
danielvincent
7160e9f85b
Merge branch 'master' of github.com:diaspora/diaspora
2010-10-17 10:25:38 -07:00
archi
f676e284f7
Added Youtube links - Still TODO: Caching of titles!
2010-10-17 16:14:01 +02:00
archi
8e753cc073
Youtube proof of concept patch/preview - not done yet (see bug #332 )
2010-10-17 12:56:26 +02: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
d25847a626
Error message for duplicate email; add email validation spec.
2010-10-16 22:46:13 -07:00
Sarah Mei
6869afc6b4
Merge branch 'master' of github.com:diaspora/diaspora
2010-10-16 22:36:35 -07:00
Sarah Mei
83b23a0ffe
Error message for duplicate username; refactor User validation specs.
2010-10-16 22:36:26 -07:00
Alec Leamas
0abc483222
Merge branch 'pkg'
2010-10-17 07:05:58 +02: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
Alec Leamas
656d9387a6
Separate wsd daemon, simpler bundle directories, -f bundle update flag
...
For fedora, splits off the wsd daemin in separate package. Overall,
tools to handle bad Gemfile.lock README notes, -f option to invoke
'bundle update' in make-dist.sh. Minor bugfixes
2010-10-17 07:01:24 +02:00
Sarah Mei
1b6726354f
Backfill specs for RegistrationsController#create.
...
Remove RegistrationsController#new (which just called super, so it's not necessary).
2010-10-16 21:14:37 -07:00
Sarah Mei
21d213059c
Found the magic incantation for devise controller specs.
2010-10-16 20:14:14 -07:00
Sarah Mei
698dafb344
put ruby-debug back into Gemfile.lock
2010-10-16 20:14:01 -07:00
