Sarah Mei
|
aa4a61870c
|
you can click on photos in manage aspects to see profiles
|
2010-11-24 22:09:14 -08:00 |
|
zhitomirskiyi
|
ebaf2c081e
|
returning nothing on empty query and limit the returning of the query to 90
|
2010-11-23 10:02:01 -08:00 |
|
maxwell
|
da16e3ee1e
|
PALINDROME invite form can now take comma seperated multiple emails, so you only have to click the box once
|
2010-11-23 00:08:30 -08:00 |
|
zhitomirskiyi
|
7df35ade12
|
Merge branch 'master' of github.com:diaspora/diaspora
|
2010-11-22 12:24:34 -08:00 |
|
zhitomirskiyi
|
1519fd46bf
|
Sending a request to someone who requested you autoaccepts the request
|
2010-11-22 12:21:26 -08:00 |
|
danielvincent
|
857a4b5f11
|
photo large is now at 300px. a person's profile photo now references the larger size instead of medium.
|
2010-11-22 10:32:14 -08:00 |
|
danielvincent
|
9a18b7e6f3
|
photo show pages display comment streams for their original post. pending spec to do this *correctly* on the model level.
|
2010-11-22 00:32:46 -08:00 |
|
danielvincent
|
c841a47a37
|
status messages validate on presence of message OR one or more photos. took gifs out of carrierwave's whitelist, SORRY JAMIE.
|
2010-11-21 23:42:49 -08:00 |
|
danielvincent
|
b3ec4d10c2
|
user can now remove contact from aspects on contact's profile page. a contact's posts are retained in a given aspect reflecting the duration of said contact's inclusion.
|
2010-11-21 16:30:45 -08:00 |
|
maxwell
|
9b7d2ed0f6
|
DG MS; status messages can now have photos.
|
2010-11-21 16:13:01 -08:00 |
|
Raphael
|
0daffb7fed
|
Add a couple specs, refactor in connecting
|
2010-11-21 14:09:39 -05:00 |
|
zhitomirskiyi
|
3d5cf8f625
|
added a panding cross path request spec
|
2010-11-19 18:53:46 -08:00 |
|
Raphael
|
655e92ebdd
|
Add some scopes for Request, take putses out of specs
|
2010-11-18 18:04:29 -08:00 |
|
zhitomirskiyi
|
c2dcf9a074
|
fixed the invite spec
|
2010-11-18 16:55:44 -08:00 |
|
zhitomirskiyi
|
0e171e8504
|
added a fixed the pending request query
|
2010-11-18 15:22:14 -08:00 |
|
Raphael
|
61692c1da6
|
Fix translation missing in inv mailer
|
2010-11-18 12:50:46 -08:00 |
|
Raphael
|
be55384628
|
Add pending spec to invitations
|
2010-11-18 11:21:35 -08:00 |
|
Raphael
|
4853a55d9b
|
Don't expect raises from user receive
|
2010-11-17 15:35:25 -08:00 |
|
Raphael
|
2d347ec36d
|
Delete an accepted friend request
|
2010-11-16 16:47:06 -08:00 |
|
Raphael
|
f3a301d314
|
Don't expect raises in request specs, redirect to :back on all requesting
|
2010-11-16 16:18:16 -08:00 |
|
Raphael
|
7876da8fb8
|
Refactor raises in requesting to validations in request, move to better controller structure
|
2010-11-16 16:18:16 -08:00 |
|
Sarah Mei
|
9fa47c9bfa
|
Fix a failing spec under 1.9 in receive_spec
|
2010-11-15 21:19:21 -08:00 |
|
Raphael
|
1b39b79446
|
Make invitation view with no inviters sensible
|
2010-11-15 16:35:00 -08:00 |
|
Raphael
|
70bcab3abc
|
adding a couple specs to invitation_spec
|
2010-11-15 16:34:59 -08:00 |
|
Raphael
|
2ad74d397c
|
fix build
|
2010-11-13 19:05:12 -08:00 |
|
danielvincent
|
ed50fe7f1f
|
Aspect.people -> Aspect.contacts. Fixed diaspora.en to reflect friend -> contact changes.
|
2010-11-12 20:22:56 -08:00 |
|
danielvincent
|
aa9966ea26
|
removed the word friend everywhere minus translation files
|
2010-11-12 20:22:55 -08:00 |
|
danielvincent
|
a21af7cac6
|
friend_users -> connect_users in helper_methods
|
2010-11-12 20:22:54 -08:00 |
|
Raphael
|
1e842f1a88
|
Render mail css as a partial, fix spec
|
2010-11-12 12:26:34 -08:00 |
|
Raphael
|
98fe1d357b
|
accept_friend_request no longer takes ids
|
2010-11-09 14:15:02 -08:00 |
|
Raphael
|
bfa0917ce4
|
add a couple specs
|
2010-11-09 14:07:26 -08:00 |
|
Raphael
|
6dd58fe875
|
Specs pass again, invitations moved to Invitation model, refactor possibly complete
|
2010-11-09 14:07:26 -08:00 |
|
Raphael
|
ae28a6f70c
|
Don't pluralize in model spec name
|
2010-11-09 14:07:26 -08:00 |
|
Raphael
|
4818973643
|
Beginning to refactor invitations into an Invitation class
|
2010-11-09 14:07:26 -08:00 |
|
Raphael
|
71ab919ad3
|
Remove urls from requests, invitations are broken
|
2010-11-09 14:07:26 -08:00 |
|
zhitomirskiyi
|
7d39f8ae5f
|
Merge branch 'master' of github.com:diaspora/diaspora
|
2010-11-08 15:36:11 -08:00 |
|
zhitomirskiyi
|
a6dff4f78e
|
removing the posts from the aspect on unfriending
|
2010-11-08 15:35:37 -08:00 |
|
Raphael
|
70af10ee62
|
user#friends is now a many-foreign_key assoc, rather than a many-in
|
2010-11-08 15:19:23 -08:00 |
|
maxwell
|
e4f8f558a0
|
aspects now have a max length of 20 characters
|
2010-11-05 17:18:20 -07:00 |
|
Raphael
|
0ce37bbfa8
|
Remove some extra receives in tests
|
2010-11-05 14:15:40 -07:00 |
|
maxwell
|
cc92f61583
|
mailer queue now works
|
2010-11-05 11:58:25 -07:00 |
|
zhitomirskiyi
|
d793bdc3c7
|
inital commit for mailqueue
|
2010-11-05 11:46:43 -07:00 |
|
Raphael
|
693847480b
|
Take out notifier stubbing, it's in test mode.
|
2010-11-05 11:31:52 -07:00 |
|
Raphael
|
c69e2b8900
|
rename spec file
|
2010-11-05 11:26:49 -07:00 |
|
Raphael
|
4eba0595f9
|
Fix 328 profile images dying, thanks to theBernd
|
2010-11-04 18:46:15 -07:00 |
|
Raphael
|
f6d899f1d9
|
Move prep_image_url into profile image_url setter
|
2010-11-04 18:46:15 -07:00 |
|
danielvincent
|
f4dba54ff3
|
posting to a person with a user on the same pod will send internally, skipping the http queue and encryption.
|
2010-11-04 15:33:16 -07:00 |
|
danielvincent
|
d5cc0ed6dc
|
separating object receiving in user#receive
|
2010-11-04 15:33:16 -07:00 |
|
Raphael
|
7e568db032
|
Add a couple specs to user_spec
|
2010-11-04 15:23:58 -07:00 |
|
zhitomirskiyi
|
7f5b98a6cb
|
the photo image url is now randomized
|
2010-11-04 14:37:08 -07:00 |
|
danielvincent
|
b33aa9a0fb
|
retracting on a non existant post does not raise a permissions error.
|
2010-11-04 12:43:26 -07:00 |
|
danielvincent
|
82c82b8ccc
|
killed albums
|
2010-11-04 10:17:19 -07:00 |
|
zhitomirskiyi
|
2da1f860cd
|
validate user ownership on status message destroy
|
2010-11-03 18:04:10 -07:00 |
|
zhitomirskiyi
|
8246882067
|
MS IZ fixed some permissions in photo controller
|
2010-11-03 16:42:33 -07:00 |
|
Raphael
|
03b272db60
|
Requests are no longer tracked by id across servers, DELETED USELESS PUTS IN EM-WEBFINGER SPEC
|
2010-11-03 15:26:58 -07:00 |
|
zhitomirskiyi
|
0ac4c5b04f
|
IZ MS refactored invites to use user.build
|
2010-11-03 13:16:45 -07:00 |
|
zhitomirskiyi
|
c6e9b94f4f
|
IZ MS moved contact_for to querying and added tests
|
2010-11-03 10:59:56 -07:00 |
|
Raphael
|
d5a4de58b3
|
User#post is now like a future controller, Photo#instantiate no longer saves
|
2010-11-02 19:16:02 -07:00 |
|
Raphael
|
1c67211ebc
|
Move post dispatching to dispatch_post
|
2010-11-02 19:16:02 -07:00 |
|
maxwell
|
0ecc27a935
|
MS IZ posts should now update
|
2010-11-02 18:56:00 -07:00 |
|
maxwell
|
4de89df4dc
|
MS IZ setting the diaspora handle in photo instantiate
|
2010-11-02 18:32:02 -07:00 |
|
Raphael
|
ab4e3a9f7f
|
add a couple specs to album_spec
|
2010-11-02 18:16:14 -07:00 |
|
danielvincent
|
bf12dc6bc7
|
fix spec
|
2010-11-02 17:44:13 -07:00 |
|
maxwell
|
1951df8d9c
|
Merge branch 'master' of github.com:diaspora/diaspora
|
2010-11-02 16:49:54 -07:00 |
|
maxwell
|
3baa8b4552
|
IZ MS two pending photo specs now pass
|
2010-11-02 16:49:40 -07:00 |
|
danielvincent
|
e9f3efea79
|
person searchable by diaspora_handle
|
2010-11-02 16:48:58 -07:00 |
|
maxwell
|
8c89f8d87a
|
Merge branch 'master' of github.com:diaspora/diaspora
|
2010-11-02 16:42:52 -07:00 |
|
Raphael
|
20d5daafbc
|
Two pending specs on photo serialization for Max and Ilya
|
2010-11-02 16:41:53 -07:00 |
|
Raphael
|
15ecc22130
|
Unpending user spec
|
2010-11-02 16:41:31 -07:00 |
|
Raphael
|
2c903ea519
|
check that User#build does not save a Person
|
2010-11-02 16:28:55 -07:00 |
|
danielvincent
|
fff43bf650
|
profile defaults key searchable to true. search takes searchable into account.
|
2010-11-02 16:12:42 -07:00 |
|
maxwell
|
34f190ce75
|
MS IZ added a check for person in webfinger response in receive_salmon method
|
2010-11-02 16:10:17 -07:00 |
|
maxwell
|
3251b8ba2e
|
MS IZ fixed a hole where another user could update another friends post
|
2010-11-02 13:58:27 -07:00 |
|
maxwell
|
c3d0c78bd1
|
Merge branch 'master' of github.com:diaspora/diaspora
Conflicts:
lib/diaspora/user/receiving.rb
|
2010-11-02 12:46:08 -07:00 |
|
maxwell
|
19bbf8ce4d
|
IZ MS; fixed post update. Posts which implement the mutable? method now can be updated via receive
|
2010-11-02 12:38:30 -07:00 |
|
Raphael
|
0b8425cbde
|
user.aspect is gone
|
2010-11-02 11:02:08 -07:00 |
|
Raphael
|
c031416ca8
|
Merge branch 'master' into HEAD
Conflicts:
lib/diaspora/user/receiving.rb
pkg/ubuntu/dist
|
2010-11-02 10:54:37 -07:00 |
|
Sarah Mei
|
dc97c852f4
|
Person delegates first_name and last_name to profile.
|
2010-11-01 22:22:15 -07:00 |
|
maxwell
|
15d6cff837
|
MS IZ everything now uses diaspora handle. this feels so good
|
2010-11-01 18:42:42 -07:00 |
|
maxwell
|
3c8b40c427
|
IZ MS retractions now use diaspora handle
|
2010-11-01 17:11:06 -07:00 |
|
maxwell
|
06445901f8
|
IZ MS retrations for posts now green
|
2010-11-01 17:11:06 -07:00 |
|
danielvincent
|
f6b4be97a3
|
requests are almost there
|
2010-11-01 14:54:40 -07:00 |
|
Raphael
|
6c0b187d40
|
Merge remote branch 'jwinky/446-user-name-length-limit'
Conflicts:
app/models/user.rb
|
2010-11-01 11:00:02 -07:00 |
|
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 |
|
Derrick Camerino
|
b19cdf2e25
|
fixing N socketing bug
|
2010-10-31 03:15:58 -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 |
|
Justin Wienckowski
|
cdcb693c95
|
Issue #446: Adding 32-character length limit to User#username, Profile#first_name, Profile#last_name
|
2010-10-28 21:12:36 -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 |
|
Raphael
|
7dd86b3c87
|
Move comment signing spec to comment spec, make encryption spec not depend on message building
|
2010-10-22 11:18:43 -07:00 |
|
Raphael
|
d8bbe38019
|
Move spec to request_spec
|
2010-10-22 11:11:51 -07:00 |
|
Raphael
|
1a19c28199
|
Move spec to user_spec
|
2010-10-22 11:10:35 -07:00 |
|
Raphael
|
b404346c40
|
Stop stubbing signature verification unless it's necessary
|
2010-10-22 11:01:58 -07:00 |
|
Sarah Mei
|
ffa467b795
|
more stubbing! yay?
|
2010-10-22 06:38:46 -07:00 |
|
maxwell
|
6620f33ae2
|
fixing spec with a mock on mailer
|
2010-10-22 01:07:57 -07:00 |
|
maxwell
|
5701c3a873
|
should send the email when a new request is received. emails in dev should be intercepted to email@joindiaspora.com for now
|
2010-10-22 00:49:01 -07:00 |
|
ilya
|
80cd4761f3
|
started the new invitation email
|
2010-10-22 00:49:01 -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
|
705cef3696
|
Fix comment spec
|
2010-10-21 10:55:17 -07:00 |
|
Raphael
|
35a830aa03
|
Fix profile update spec
|
2010-10-21 10:39:19 -07:00 |
|
Sarah Mei
|
e414b1c553
|
Fix some comment specs (still one failing). Remove warning from receive spec.
|
2010-10-21 06:45:15 -07:00 |
|
Raphael
|
bef6d76bfd
|
Refactor specs a little more
|
2010-10-20 17:53:09 -07:00 |
|
Raphael
|
e1cdcc68c8
|
Cut 10 seconds off of visible_posts_spec
|
2010-10-20 17:48:16 -07:00 |
|