maxwell
8fe339b03b
EM websocket cleanly merged with master. webfingering is now async
2010-10-29 11:05: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
Raphael
f7d2665950
Merge branch 'master' of github.com:diaspora/diaspora
2010-10-28 14:29:40 -07:00
Raphael
4aaa921121
A couple specs for create overwriting users
2010-10-28 14:26:20 -07:00
danielvincent
05c5e770ee
removed real name from signup process.
2010-10-27 16:25:22 -07:00
maxwell
6913381781
username now can only contain letters numbers, periods, and underscores
2010-10-22 17:26:10 -07:00
Raphael
1a19c28199
Move spec to user_spec
2010-10-22 11:10:35 -07:00
Raphael
41cfd36b19
Refactor user_spec a little
2010-10-21 16:06:47 -07:00
Raphael
fe1a6bce20
Attr-accessible on aspects, check whether built user is persisted
2010-10-21 12:49:50 -07:00
Raphael
35a830aa03
Fix profile update spec
2010-10-21 10:39:19 -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
fd8028db33
Revert "Revert "Merge remote branch 'upstream/master'""
...
This reverts commit 1481056af2 .
2010-10-20 09:51:55 -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
Sarah Mei
81ef7386b3
validation errors in profile and person bubble up to user.
2010-10-19 22:33:12 -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
e648042b15
the user destroy now deletes the aspects
2010-10-18 10:26:45 -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
d25847a626
Error message for duplicate email; add email validation spec.
2010-10-16 22:46:13 -07:00
Sarah Mei
83b23a0ffe
Error message for duplicate username; refactor User validation specs.
2010-10-16 22:36:26 -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
adbc4dddbc
added pending spec for aspect removal on account deletion
2010-10-14 00:12:00 -07:00
Raphael
3fb2ee6e1b
adding spec for password confirmation fail
2010-10-13 16:28:56 -07:00
ilya
007f6cfb6f
close account
2010-10-11 14:58:11 -07:00
Raphael
1fd3aeabd9
Add or later to license notice
2010-10-07 16:25:34 -07:00
Stoyan Gaydarov
dbacff250a
added extra user spec
2010-10-06 08:27:25 +08:00
Stoyan Gaydarov
9eb8fe0c5a
use the correct pod url in the user spec
2010-10-06 08:27:25 +08: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
Stephen Caudill
821643deb9
Use the new style of spec_helper require
2010-09-25 11:27:59 -04:00
danielvincent
4c0dc58458
spec cleanup
2010-09-21 20:02:37 -07:00
ilya
394bf1acb5
Merge branch 'master' of github.com:diaspora/diaspora
...
Conflicts:
app/models/user.rb
spec/models/user_spec.rb
2010-09-21 16:15:01 -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
danielvincent
25b4b409be
Merge branch 'master' of github.com:diaspora/diaspora into production
2010-09-16 16:19:48 -07:00
danielvincent
0c7ba49e34
DG IZ; aspect deletion
2010-09-16 16:03:18 -07: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
Jamie Wilkinson
fbdd50172d
Cleanup stray whitespace
2010-09-16 10:07:59 +08: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
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
426d038aaf
Remove email based filter
2010-09-14 11:22:32 -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
4c15b1a01c
added license to every single goddamn file. also, put one in the root dir.
2010-09-13 14:23:50 -07:00
Raphael
44a1f82da9
Rename group to aspect
2010-09-13 10:38:38 -07:00