danielvincent
|
601284a171
|
make profile photo action uses :remote=>true rails ajax helpers. added photos#make_profile_photo.
|
2010-11-30 15:58:26 -08:00 |
|
maxwell
|
c5f71184be
|
profile now knows about three images sizes, even in federation case
|
2010-11-30 15:58:25 -08:00 |
|
Hexagon
|
160198c152
|
Added rake task to check pod_url and terse_pod_url
|
2010-11-30 15:58:25 -08:00 |
|
maxwell
|
fdbc7dff86
|
profile now knows about three images sizes, even in federation case
|
2010-11-30 15:56:43 -08:00 |
|
Hexagon
|
b15032de39
|
Added rake task to check pod_url and terse_pod_url
|
2010-11-30 15:56:43 -08:00 |
|
Raphael
|
366734ca5e
|
Take queries out of aspect contacts pane on home page
|
2010-11-30 15:35:32 -08:00 |
|
Raphael
|
57485e7093
|
Move aspect contacts pane js to public
|
2010-11-30 13:55:37 -08:00 |
|
maxwell
|
ec05c21472
|
profile now knows about three images sizes, even in federation case
|
2010-11-30 13:40:41 -08:00 |
|
Hexagon
|
ec5145777e
|
Added rake task to check pod_url and terse_pod_url
|
2010-11-30 13:32:46 -08:00 |
|
Hexagon
|
c98f6f21c8
|
config spec now makes sense
|
2010-11-30 22:27:19 +01:00 |
|
danielvincent
|
185e84537e
|
fixed build
|
2010-11-30 13:19:25 -08:00 |
|
danielvincent
|
828635def9
|
Person#real_name -> Person#name
|
2010-11-30 13:01:53 -08:00 |
|
Hexagon
|
4fa3e801a8
|
Added rake task to check pod_url and terse_pod_url
|
2010-11-30 20:48:55 +01:00 |
|
Raphael
|
fcb0e07dd7
|
Stop regenerating fixtures on every spec run
|
2010-11-29 23:22:49 -08:00 |
|
Hexagon
|
7d2b46c7c0
|
public helper spec superfluous, fixing build
|
2010-11-30 00:17:01 +01:00 |
|
Raphael
|
e86a5563ed
|
Override request started log line
|
2010-11-29 14:03:29 -08:00 |
|
maxwell
|
bf79d62317
|
Merge branch 'master' of github.com:diaspora/diaspora
|
2010-11-29 13:41:38 -08:00 |
|
maxwell
|
4ef7c4d6d1
|
make the build pass (we no longer socket photos at all) and also more test fixing around request. we were saving requests to early in the cycle, most likely cruft before it was refactored.
|
2010-11-29 13:39:48 -08:00 |
|
Raphael
|
eccc25e20a
|
Add pending specs for log_overrider... hit a wall when I wanted more information than is being passed to ActiveSupport::Notifier
|
2010-11-29 13:14:27 -08:00 |
|
danielvincent
|
2c22941e2f
|
fixed listener for delete action on aspect-edit. scope through a manage_aspect_zones div to avoid confusion on aspects#show.
|
2010-11-28 20:16:57 -05:00 |
|
Sarah Mei
|
5ae8a06016
|
unpendingify comment specs
|
2010-11-28 17:16:22 -08:00 |
|
danielvincent
|
c35be73978
|
added pending specs. traced the whole comment thing -- it works, but i couldn't figure out how to make these pending specs pass (re: should_receive)
|
2010-11-28 18:51:27 -05:00 |
|
danielvincent
|
05174436c0
|
comments should only be dispatched out to remote people from owner. for local people on the same pod, the comment has already been verified by the comment's authority (post owner).
|
2010-11-28 18:51:27 -05:00 |
|
danielvincent
|
d7c5e12d64
|
move photo-show js to assets. remove EM::next_tick from controller#create actions. make photo show pages render again.
|
2010-11-28 02:30:25 -05:00 |
|
Raphael
|
845e1fe7a3
|
Fix comments ajax response
|
2010-11-28 01:31:05 -05:00 |
|
Raphael
|
4e15745170
|
Add spec to comment
|
2010-11-28 00:55:20 -05:00 |
|
Raphael
|
cbe98a1479
|
Add spec to commentscontroller
|
2010-11-28 00:39:23 -05:00 |
|
Raphael
|
703e8e0426
|
Add spec for js requests on stmc create
|
2010-11-28 00:36:05 -05:00 |
|
Raphael
|
6d6b07fb92
|
Use form_tag, not form_for, in _new_comment
|
2010-11-27 23:24:29 -05:00 |
|
danielvincent
|
f59c6e2427
|
refactored comments to work like status_messages in the controller. weird stuff was happening when using EM::next_tick; holding off on that for now.
|
2010-11-27 23:06:34 -05:00 |
|
Raphael
|
d2bfffca92
|
Fix PeopleController, add specs
|
2010-11-27 21:46:07 -05:00 |
|
Raphael
|
7ca124c002
|
Refactor views to not be so dumb.
|
2010-11-27 21:27:27 -05:00 |
|
danielvincent
|
64f7a20ff4
|
fixed specs, took out that nasty raise.
|
2010-11-27 16:20:46 -05:00 |
|
maxwell
|
c65c62906c
|
pushing so dan can look at how to stub EM:next_tick correctly
|
2010-11-27 16:20:46 -05:00 |
|
Raphael
|
7030ed0fed
|
Putting youtube titles back into status messages
|
2010-11-27 11:43:24 -05:00 |
|
Raphael
|
d5d4a08f03
|
Start moving youtube title getting into the post/comment flow
|
2010-11-27 01:00:47 -05:00 |
|
Raphael
|
fef6d84f4b
|
markdownify performance spec
|
2010-11-26 22:16:33 -05:00 |
|
Raphael
|
d81db97054
|
take out request routed
|
2010-11-26 21:15:03 -05:00 |
|
Raphael
|
0fa93706a6
|
Make request completed log line complete
|
2010-11-26 21:15:02 -05:00 |
|
Raphael
|
e09b544f26
|
Add specs to log overrider
|
2010-11-26 21:15:02 -05:00 |
|
danielvincent
|
ce63e13eca
|
aspect ids normalized to posts to minimize queries on views.
|
2010-11-26 18:55:06 -05:00 |
|
Raphael
|
fb85ffe406
|
Adding specs for log_overrider
|
2010-11-26 18:38:08 -05:00 |
|
Sarah Mei
|
abae16472d
|
pagination works on aspects#show
|
2010-11-26 13:09:05 -08:00 |
|
Sarah Mei
|
f8229d07e8
|
Adding copyright to js files
|
2010-11-26 12:16:10 -08:00 |
|
Michael Sofaer and Raphael Sofaer
|
b54164cef8
|
Don't do expensive things on invalid users
|
2010-11-26 11:55:54 -05:00 |
|
Dan Hansen & Sarah Mei
|
257d6f414a
|
Top-level Diaspora object for js widget management
|
2010-11-25 22:24:25 -08:00 |
|
danielvincent
|
417301088f
|
fixed build
|
2010-11-26 00:56:53 -05:00 |
|
danielvincent
|
94d08954d9
|
401 -> 406 in controllers resolving http basic auth prompt on failed comment/status message creation. fixed status message validation.
|
2010-11-26 00:19:19 -05:00 |
|
Dan Hansen & Sarah Mei
|
5075a7384b
|
allow hyphens in YouTube video IDs
|
2010-11-25 21:05:54 -08:00 |
|
Raphael
|
690951dcd1
|
Take a query out of the views
|
2010-11-25 23:53:45 -05:00 |
|
Raphael
|
33ba00377e
|
Add performance spec
|
2010-11-25 23:53:45 -05:00 |
|
Dan Hansen & Sarah Mei
|
eb314aa300
|
Fix application helper specs around youtube links
|
2010-11-25 16:29:30 -08:00 |
|
Sarah Mei
|
ef2fa21d06
|
person_image_link and object_path return empty strings if parameter is nil.
|
2010-11-25 12:26:46 -08:00 |
|
Sarah Mei
|
050918a310
|
Added link to manage aspects page from sidebar.
Now you can drag requests from that page, but not existing contacts. d&d interface for moving contacts between aspects needs some thought.
|
2010-11-25 10:29:35 -08:00 |
|
Sarah Mei
|
287b79ab17
|
Merge branch 'master' of github.com:diaspora/diaspora
|
2010-11-24 22:09:25 -08:00 |
|
Sarah Mei
|
aa4a61870c
|
you can click on photos in manage aspects to see profiles
|
2010-11-24 22:09:14 -08:00 |
|
Raphael
|
08ba387311
|
More sane redirect on failing to accept an invitation
|
2010-11-25 00:39:13 -05:00 |
|
Raphael
|
a85f47041a
|
This file is generated by rake fixtures:users
|
2010-11-24 14:07:00 -05:00 |
|
zhitomirskiyi
|
9ca54a2282
|
accepting an invitation correctly adds the request to the user
|
2010-11-23 18:58:26 -08:00 |
|
zhitomirskiyi
|
a9b503b65e
|
made the dev. util things pending
|
2010-11-23 15:49:50 -08:00 |
|
zhitomirskiyi
|
3f737116d6
|
since there is only one person with that name in the db, it returns a redirect
|
2010-11-23 11:02:17 -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 |
|
danielvincent
|
c9c84794af
|
fixed build. publisher lights up on hover on aspect#index page. updated login page text.
|
2010-11-23 03:10:47 -08:00 |
|
maxwell
|
709e348457
|
Merge branch 'master' of github.com:diaspora/diaspora
Conflicts:
spec/fixtures/users.yaml
|
2010-11-23 00:15:26 -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 |
|
Dan Goldenberg
|
bfc1fa4da0
|
added getting_started text and new press logos
|
2010-11-22 21:07:01 -08:00 |
|
maxwell
|
7c09117230
|
fixing build
|
2010-11-22 19:05:35 -08:00 |
|
maxwell
|
173ec5f73b
|
Revert "remove a duplicate view, hence many files updated, and fixed the js to socket people to the aspect sidebar"
This reverts commit c45893d07d.
Conflicts:
config/locales/diaspora/en.yml
|
2010-11-22 17:11:34 -08:00 |
|
maxwell
|
c45893d07d
|
remove a duplicate view, hence many files updated, and fixed the js to socket people to the aspect sidebar
|
2010-11-22 16:38:10 -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 |
|
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 |
|