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
|
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 |
|
maxwell
|
15bd24a64f
|
Merge branch 'master' of github.com:diaspora/diaspora
Conflicts:
spec/lib/message_handler_spec.rb
spec/spec_helper.rb
|
2010-10-29 16:23:33 -07:00 |
|
maxwell
|
c1c045a4cd
|
mocking
|
2010-10-29 16:21:39 -07:00 |
|
Raphael
|
581985990c
|
Delete no-longer-relevant spec, now down to master branch failures
|
2010-10-29 15:59:42 -07:00 |
|
Raphael
|
99eb25762d
|
Moving to make_user, a few specs broken
|
2010-10-29 15:53:21 -07:00 |
|
Raphael
|
ce805c8167
|
Test pollution from locale being set
|
2010-10-29 13:26:54 -07:00 |
|
maxwell
|
f75bd6bc2e
|
whoops, taking out queue stuff untill i finish
|
2010-10-29 13:05:35 -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
|
39f66cc5d9
|
tests are green
|
2010-10-29 11:19:07 -07:00 |
|
maxwell
|
6d139ab946
|
more tests pass
|
2010-10-29 11:17:39 -07:00 |
|
maxwell
|
1b48572674
|
MS tests are now green
|
2010-10-29 11:16:50 -07:00 |
|
maxwell
|
68a44af856
|
making a few more cleanup and tests
|
2010-10-29 11:13:08 -07:00 |
|
maxwell
|
eddcb71fcb
|
EM websocket cleanly merged with master. webfingering is now async
|
2010-10-29 11:11:05 -07:00 |
|
maxwell
|
9a2e3ef158
|
making a few more cleanup and tests
|
2010-10-29 11:05:17 -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 |
|
Raphael
|
f1ae95fac9
|
443- patch trim on validation + spec
|
2010-10-28 20:03:49 -07:00 |
|
zhitomirskiyi
|
3fc5651e9d
|
Merge branch 'master' of github.com:diaspora/diaspora
|
2010-10-28 17:03:14 -07:00 |
|
zhitomirskiyi
|
f5d54ff6f8
|
another silly malicious friend spec
|
2010-10-28 17:02:55 -07:00 |
|
Raphael
|
512f40eac2
|
attr_accessible on Post
|
2010-10-28 15:50:19 -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 |
|
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 |
|
livefromthemoon@gmail.com
|
b7a586b1a5
|
allow user to change his language in his settings
|
2010-10-28 17:29:17 +02: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 |
|
zhitomirskiyi
|
63c740fce7
|
Merge branch 'master' of github.com:diaspora/diaspora into contact-refactor
|
2010-10-27 09:53:50 -07:00 |
|
Sarah Mei
|
0c8de9460c
|
Fix for 1.9 (no spaces between method name and parens)
|
2010-10-27 03:21:17 -07:00 |
|
zhitomirskiyi
|
fa484e95e4
|
MS IZ refactored querying
|
2010-10-26 17:05:38 -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 |
|
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 |
|
danielvincent
|
287d633c44
|
user#post now handles posting to services.
|
2010-10-25 17:41:59 -07:00 |
|
maxwell
|
b17ae0bf38
|
DG MS removed unused fb_status model and respective specs, fixtures.
|
2010-10-25 12:26:08 -07:00 |
|
ilya
|
ff3dad2bff
|
adding assertion to album_spec many association
|
2010-10-24 14:03:03 -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
|
5af3d5fa82
|
double checking that matches are in front or back
|
2010-10-22 16:34:08 -07:00 |
|
maxwell
|
6720fa2c59
|
added tests to make sure Person.by_webfinger only returns exact matches
|
2010-10-22 16:28:03 -07:00 |
|
ilya
|
d1a2ebd236
|
Merge branch 'master' of github.com:diaspora/diaspora
|
2010-10-22 11:56:04 -07:00 |
|
ilya
|
9a217d1fa8
|
MS IZ request acceptance email
|
2010-10-22 11:55:50 -07:00 |
|