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
Sarah Mei
218aa1c0d6
MSSM aspect switcher in mobile interface plus tests; added check for ipad useragent
2010-11-21 19:56:35 -08:00
danielvincent
bd0c21a634
button for adding photos works again. pulled _aspect_nav into _header. fixed all but one cucumber test.
2010-11-21 16:30:46 -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
4ce337bbed
display a users username in the final step
2010-11-21 16:13:02 -08:00
maxwell
9b7d2ed0f6
DG MS; status messages can now have photos.
2010-11-21 16:13:01 -08:00
danielvincent
242d0ab9c5
a search yielding exactly one person will redirect to that person's page. hotkey ctrl+f triggers focus on search box.
2010-11-21 16:11:55 -08:00
Raphael
b991df9d3a
WSR spec working
2010-11-21 16:19:25 -05:00
Raphael
6f0d008914
Move WebSocketReceiver out to a js file
2010-11-21 16:14:36 -05:00
Raphael
0daffb7fed
Add a couple specs, refactor in connecting
2010-11-21 14:09:39 -05:00
Raphael
4ce2de55e2
Fix photo show, js on people search page
2010-11-21 13:29:50 -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
d0d261fdae
zero default invites, the rake task starts people with 5 invites
2010-11-18 16:23:35 -08:00
maxwell
c0d10ef174
Merge branch 'master' of github.com:diaspora/diaspora
2010-11-18 15:36:47 -08:00
maxwell
747ab761a0
pushing mailer spec for ilya
2010-11-18 15:36:30 -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
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
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
Sarah Mei
16e2ccc614
Specs for aspect edit during and stop drag.
2010-11-09 06:53:55 -08:00
Sarah Mei
16ea7a321b
specs for AspectEdit#animateImage
2010-11-08 21:19:49 -08:00
zhitomirskiyi
77fe7a1462
Revert "IZ local comment destroy"
...
This reverts commit cb9fb0ad94
2010-11-08 19:32:43 -08:00
zhitomirskiyi
34179d60db
Merge branch 'master' of github.com:diaspora/diaspora
2010-11-08 18:21:02 -08:00
zhitomirskiyi
cb9fb0ad94
IZ local comment destroy
2010-11-08 18:19:55 -08:00
maxwell
a84f9437b0
trying another thing to get the redirect working
2010-11-08 17:43:59 -08:00
maxwell
4164ceaf90
trying another thing to get the redirect working
2010-11-08 16:30:46 -08:00
maxwell
52908cec1a
services controller should now go back to the referer. this might not actually work
2010-11-08 16:18:15 -08:00
maxwell
3fd5852d44
Merge branch 'master' of github.com:diaspora/diaspora
2010-11-08 15:56:18 -08:00
maxwell
2162a2e3f9
collapse person's photos and status message into their profile; also, made these nested on a person
2010-11-08 15:55:58 -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
zhitomirskiyi
cbabc547a2
Merge branch 'master' of github.com:diaspora/diaspora
2010-11-08 15:10:32 -08:00
zhitomirskiyi
e50f29b032
the profile cannot massassign diaspora handle
2010-11-08 15:10:23 -08:00
maxwell
4d2820e31c
MS RS fixed photo show bug
2010-11-08 14:05:01 -08:00
Sarah Mei
1a4fa2713a
More specs for aspect-edit.js. Initialize now fully covered.
...
Also, bundler upgraded our cucumber and rspec.
2010-11-07 16:58:51 -08:00
Sarah Mei
32d953f457
Reorganized public folder - third-party js is now in public/javascripts/vendor. Third-party css is now in public/stylesheets/vendor.
2010-11-06 16:50:07 -07:00
maxwell
e4f8f558a0
aspects now have a max length of 20 characters
2010-11-05 17:18:20 -07:00
Raphael
9970ee0e22
Write comments controller spec
2010-11-05 14:15:40 -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
Sarah Mei
c816a1f78e
RegistrationsController#create re-renders the form instead of redirecting, so user doesn't lose what they've entered.
...
Took out RegistrationsController#update, since all it was doing was calling super.
Took out stubbing of user save, because I actually want to check that save is doing the right thing.
2010-11-04 22:51:30 -07:00
Raphael
4eba0595f9
Fix 328 profile images dying, thanks to theBernd
2010-11-04 18:46:15 -07:00
