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 |
|
maxwell
|
9882fa183d
|
Merge branch 'master' of github.com:diaspora/diaspora
|
2010-11-17 23:19:27 -08:00 |
|
maxwell
|
2ffd2d93e3
|
made mailchimp form ssl
|
2010-11-17 23:19:12 -08:00 |
|
Sarah Mei
|
64237534fd
|
Merge branch 'master' of github.com:diaspora/diaspora
|
2010-11-17 22:31:21 -08:00 |
|
Sarah Mei
|
c19ebcece3
|
Request delete now returns head :ok instead of redirecting. On client side, request div is removed.
|
2010-11-17 22:28:24 -08:00 |
|
maxwell
|
f01fca1877
|
letting jammit do its default thing
|
2010-11-17 22:18:15 -08:00 |
|
danielvincent
|
1a9041a3c0
|
DG MS; fixed cucumber tests to work with new landing page flow
|
2010-11-17 19:49:01 -08:00 |
|
danielvincent
|
056dc7d3ba
|
DG MS; added homecontroller to take care of landing page and aspects index redirecting in regards to user's logged in state.
|
2010-11-17 19:37:08 -08:00 |
|
Raphael
|
4853a55d9b
|
Don't expect raises from user receive
|
2010-11-17 15:35:25 -08:00 |
|
maxwell
|
2c627cdb2b
|
updating jas
|
2010-11-17 00:16:11 -08:00 |
|
maxwell
|
f81bb1d7e7
|
i broke the jasmine tests. this is me fixin them
|
2010-11-16 22:02:18 -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
|
538c6ce4b9
|
Take handle validations out of em-webfinger
|
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
|
44bd4534ce
|
I found where we needed the one-line addition. Ruby 1.9 build now works.
I feel pretty badass.
|
2010-11-15 22:44:55 -08:00 |
|
Sarah Mei
|
2cf4350fab
|
Clean up unused variable
|
2010-11-15 22:42:09 -08:00 |
|
Sarah Mei
|
686cea6595
|
1.9.2 doesn't like friending people when the target doesn't have any aspects. ::sigh:: And with that, I fix the cucumber feature that was failing under 1.9.
|
2010-11-15 21:52:02 -08:00 |
|
Sarah Mei
|
9fa47c9bfa
|
Fix a failing spec under 1.9 in receive_spec
|
2010-11-15 21:19:21 -08:00 |
|
Raphael
|
248e768846
|
search now sockets a person
|
2010-11-15 19:13:45 -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
|
0f1517af15
|
Redirect directly to the login page no registrations closed
|
2010-11-15 12:24:58 -08:00 |
|
Raphael
|
d3098cf6bc
|
Add option to close registration in app_config
|
2010-11-15 12:15:40 -08:00 |
|
Sarah Mei
|
23c1ac4936
|
Cucumber feature for managing contact requests
|
2010-11-14 21:49:56 -08:00 |
|
Sarah Mei
|
45e47513c2
|
AspectEdit#onDeleteRequestSuccess now adds and drops attributes properly
|
2010-11-14 21:49:36 -08:00 |
|
Sarah Mei
|
830a43ec2f
|
Add destroy specs for RequestsController.
Cucumber feature for contact requests.
|
2010-11-14 09:43:28 -08:00 |
|
Raphael
|
2ad74d397c
|
fix build
|
2010-11-13 19:05:12 -08:00 |
|
danielvincent
|
86470dc15b
|
jasmine references move_contact instead of move_friend
|
2010-11-12 20:39:49 -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 |
|
Sarah Mei
|
6c439608f0
|
started specs for AspectEdit.deletePersonFromAspect
|
2010-11-12 17:04:15 -06:00 |
|
Sarah Mei
|
9586ebb67e
|
specs for AspectEdit.onMovePersonSuccess
|
2010-11-12 16:44:22 -06:00 |
|
Sarah Mei
|
737c812e08
|
Specs for AspectEdit.onDeleteRequestSuccess
|
2010-11-12 16:38:02 -06:00 |
|
Sarah Mei
|
506d13335a
|
Finally have complete specs for AspectEdit.onDropMove.
|
2010-11-12 16:05:17 -06:00 |
|
Sarah Mei
|
b77547e940
|
Responding to a friend request now only calls RequestsController#delete instead of also calling AspectsController#move_friend
|
2010-11-12 14:51:16 -06:00 |
|
Raphael
|
1e842f1a88
|
Render mail css as a partial, fix spec
|
2010-11-12 12:26:34 -08:00 |
|
Raphael
|
a4d7b25bac
|
Merge branch 'master' of github.com:diaspora/diaspora
|
2010-11-12 11:54:19 -08:00 |
|
Raphael
|
ae9f4ab969
|
Refactor mail views, add a spec to make sure CSS is rendered
|
2010-11-12 11:47:59 -08:00 |
|
Sarah Mei
|
feec6d971d
|
More specs for aspect edit JS
|
2010-11-12 13:40:23 -06:00 |
|
Raphael
|
8232a92ca0
|
Update _person and person show, add specs for those pages
|
2010-11-10 12:41:18 -08:00 |
|
Sarah Mei
|
a39bd2badb
|
AspectsController#manage now works if you have pending friend requests.
|
2010-11-10 12:05:28 -07:00 |
|
Sarah Mei
|
c113ee2b7c
|
Finish specs for AspectEdit#stopDrag.
|
2010-11-10 10:54:12 -07:00 |
|
Sarah Mei
|
72bf683c87
|
Renaming publisher_spec to publisher-spec since js likes dashes. Fix typo in spec.
|
2010-11-10 10:53:23 -07:00 |
|
maxwell
|
4037ae9f33
|
fixing controller test
|
2010-11-09 16:55:54 -08:00 |
|
maxwell
|
034d7ee2b1
|
first commit
|
2010-11-09 15:29:43 -08:00 |
|
Raphael
|
390fffdee6
|
Fix new request view
|
2010-11-09 15:03:56 -08:00 |
|