nocebo/diaspora
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions
1221 commits 4 branches 0 tags 121 MiB
Commit graph

835 commits

Author SHA1 Message Date
ilya
af6c70db47 RS, IZ; hack to test requests, accepted friends go into the first group. 2010-08-13 09:56:18 -07:00
ilya
3d57fb7f78 Merge branch 'friend-refactor' of github.com:diaspora/diaspora_rails into friend-refactor 2010-08-13 09:47:29 -07:00
ilya
5e33de7e56 unfriended method in the user 2010-08-13 09:47:08 -07:00
danielvincent
64c7a87aeb removed two bogus lines from user.receive 2010-08-13 08:57:22 -07:00
danielvincent
3d12e9ab51 DG RS; friending through groups 2010-08-12 21:30:16 -07:00
ilya
26bebbe393 MS IZ changing it back 2010-08-12 10:04:56 -07:00
ilya
9bec1131f6 Merge branch 'friend-refactor' of github.com:diaspora/diaspora_rails into friend-refactor 2010-08-12 10:03:51 -07:00
danielvincent
f7e43ee3d0 photo fancybox indicates progress. unfortunately, it doesn't reset after you close it right now... 2010-08-12 00:27:26 -07:00
danielvincent
013a6d0849 add photo is now in a fancy-pancy box 2010-08-11 20:45:57 -07:00
ilya
352b9f65e0 MS IZ unfriending maybe works 2010-08-11 20:23:28 -07:00
danielvincent
97b04fc0d7 nevermind 2010-08-11 20:12:10 -07:00
danielvincent
3e1081acaa commented out tinyMCE js for the time being 2010-08-11 20:09:16 -07:00
Raphael
8b51f94d1d Merge branch 'friend-refactor' of github.com:diaspora/diaspora_rails into friend-refactor 2010-08-11 18:13:38 -07:00
Raphael
eb36190188 DG, RS; Albums create failure prettier 2010-08-11 18:13:23 -07:00
ilya
283b4a40b5 IZ MS tests now pass 2010-08-11 17:51:46 -07:00
ilya
b0455b9532 Merge branch 'friend-refactor' of github.com:diaspora/diaspora_rails into friend-refactor 2010-08-11 17:45:13 -07:00
ilya
dd3fb1677b MS IZ continuiung to squash failing tests 2010-08-11 17:44:43 -07:00
Raphael
a19e29f2c2 RS, DG; Album.mine_or_friends actually fixed 2010-08-11 17:33:37 -07:00
Raphael
144d673dac DG, RS; album button looks better 2010-08-11 17:16:20 -07:00
Raphael
3d46a49b97 RS, DG; fixing Album.mine_or_friends 2010-08-11 16:50:22 -07:00
Raphael
cf5476f601 RS, DG; stop crashing trying to socket albums 2010-08-11 16:40:08 -07:00
Raphael
ab25e35a71 Comment guids now serialize 2010-08-11 16:31:12 -07:00
Raphael
d8959326d5 RS, DG; unsocketing is back in 2010-08-11 16:24:05 -07:00
Raphael
4b5071ec05 DG, RS; socketing back in for your own posts 2010-08-11 16:12:55 -07:00
Raphael
2d14f64745 RS, DG; Socketing moved to user 2010-08-11 16:10:27 -07:00
Raphael
0907d7a9fd RS, DG; Cleaned up the switch in user.receive 2010-08-11 16:01:16 -07:00
Raphael
bee71c5a23 RS, DG; All saving moved to user 2010-08-11 15:22:06 -07:00
Raphael
c6a620c7dd RS, DG; store_from_xml is gone, use user.receive 2010-08-11 15:05:05 -07:00
Raphael
5228e51262 RS, DG; store_from_xml now takes one objects. All talk of arrays and collections has been eliminated. 2010-08-11 14:40:48 -07:00
Raphael
5abd604dad RS, DG; build_xml_for has been eliminated. 2010-08-11 14:21:53 -07:00
Raphael
d7828a8bf3 Merge branch 'friend-refactor' of github.com:diaspora/diaspora_rails into friend-refactor 
Conflicts:
	spec/controllers/publics_controller_spec.rb
 2010-08-11 13:59:21 -07:00
Raphael
9c9ebbf4c7 build_xml_for is no longer static, we should probably change the name 2010-08-11 13:58:18 -07:00
ilya
29b1217fcd Merge branch 'friend-refactor' of github.com:diaspora/diaspora_rails into friend-refactor 2010-08-11 12:29:35 -07:00
ilya
11a8b8f3d4 MS IZ testing many the friend request user methods 2010-08-11 12:28:48 -07:00
Raphael
599d1da620 Moved socket code out to lib, unsocketing from view should now work again 2010-08-11 12:03:26 -07:00
Raphael
144e9ed439 Bookmarks now clean link in instantiate, posting them should work right again 2010-08-11 11:18:40 -07:00
Raphael
683bb0dbef Took out create redirects on ajaxy things, authenticating statusmessages 2010-08-11 10:52:01 -07:00
Raphael
355aba75df RS, DG; removing the last link_to_person 2010-08-11 10:02:45 -07:00
Raphael
f73c5c6a05 Merge branch 'friend-refactor' of github.com:diaspora/diaspora_rails into friend-refactor 2010-08-10 18:08:37 -07:00
Raphael
cc070ba168 RS, DG; Removed fancybox gone mad from photo adder 2010-08-10 18:08:27 -07:00
Raphael
a201390123 DG, RS; Added fancybox, made the contextual panes fancyboxes, photo adding is all broken 2010-08-10 17:59:22 -07:00
maxwell
1683370da5 Merge branch 'friend-refactor' of github.com:diaspora/diaspora_rails into friend-refactor 2010-08-10 17:36:54 -07:00
maxwell
a45d852f30 MS IZ request specs now PASS 2010-08-10 17:36:25 -07:00
Raphael
bd7ce5250f renamed the route for signup. also, removed the link from the login page: get_to_the_choppa 2010-08-10 17:14:58 -07:00
Raphael
4b102de1db Merge branch 'friend-refactor' of github.com:diaspora/diaspora_rails into friend-refactor 2010-08-10 16:56:42 -07:00
Raphael
37bf5b45f1 RS, DG; You now can't open the photo upload form while photos are uploading 2010-08-10 16:56:19 -07:00
Raphael
3104eeebc9 RS, DG; Photo websocket margins fixed 2010-08-10 16:40:25 -07:00
maxwell
b9718c079b Merge branch 'friend-refactor' of github.com:diaspora/diaspora_rails into friend-refactor 2010-08-10 16:05:10 -07:00
maxwell
8a3eb9f6cf IZ MS one last receive url...i think... 2010-08-10 16:04:08 -07:00
Raphael
a9ebe44b1d Merge branch 'friend-refactor' of github.com:diaspora/diaspora_rails into friend-refactor 2010-08-10 16:03:54 -07:00
Raphael
0fb55be7a0 RS, DG; You can now sign up to be a user on a seed 2010-08-10 16:03:38 -07:00
maxwell
89c54d1a63 MS IZ receive url in the request and a slash in person 2010-08-10 15:56:34 -07:00
Raphael
8b9cd3453d RS, DG; User.instatntiate simplified 2010-08-10 15:44:14 -07:00
maxwell
432ce02a14 MS IZ receive url is better 2010-08-10 15:35:40 -07:00
Raphael
a8b77cf868 DG RS; made an instantiate method for user which makes a person and profile 2010-08-10 15:35:27 -07:00
maxwell
da4de20ce1 IZ MS made things push to the receive url 2010-08-10 15:24:51 -07:00
maxwell
487de2d865 MS IZ receive, not recieve 2010-08-10 15:17:12 -07:00
maxwell
7ff25ef81a MS IZ saved the person model 2010-08-10 15:10:11 -07:00
maxwell
016c8fa471 MS IZ taking out URL options in sockets helper. hopefully the websocket doesnt blow up 2010-08-10 14:11:41 -07:00
maxwell
b5f962c725 trying root path in host meta 2010-08-10 13:58:17 -07:00
maxwell
0ffe893f8a MS IZ merging diffs 2010-08-10 12:37:04 -07:00
maxwell
71612ba33d changing some webfinger resources 2010-08-10 12:36:00 -07:00
Raphael
aa1f892c35 Merge branch 'friend-refactor' of github.com:diaspora/diaspora_rails into friend-refactor 2010-08-10 12:27:02 -07:00
Raphael
9947a2abb8 RS, DG; latest_status thing now works, started putting signup back in 2010-08-10 12:26:43 -07:00
Raphael
a48fbaaf59 RS, DG; DashboardsController has been eliminated. 2010-08-10 11:36:00 -07:00
maxwell
95c4de5d6c MS IZ fixed all of the request specs zomg 2010-08-10 11:26:32 -07:00
Raphael
b645eb3f3d RS, DG, comments socket again 2010-08-10 11:05:29 -07:00
Raphael
aa4d428ab7 RS, DG; Groups can now include other users, the user's first group is displayed by default, never use many without :in => 2010-08-10 11:02:04 -07:00
Raphael
4308f35b4b Changed partial on request index 2010-08-10 10:18:16 -07:00
Raphael
d1bedeb993 RS, DG; don't show the group-specific nav if there is no group 2010-08-10 10:11:13 -07:00
maxwell
d7d9c8aac5 MS put some current users checks into a single one 2010-08-09 21:30:56 -07:00
danielvincent
4e062c143b new album partial has a title. album title is in italics in new photo partial 2010-08-09 21:29:19 -07:00
danielvincent
d207c8b955 fixed way too high z-index in album div 2010-08-09 21:27:17 -07:00
danielvincent
988eea4215 fixed comment view bug 2010-08-09 21:21:35 -07:00
danielvincent
36adf1b6fd Merge branch 'friend-refactor' of github.com:diaspora/diaspora_rails into friend-refactor 2010-08-09 21:10:31 -07:00
maxwell
9d41ed3ef1 Merge branch 'friend-refactor' of github.com:diaspora/diaspora_rails into friend-refactor 2010-08-09 21:10:14 -07:00
danielvincent
96fa34ea60 changed the pop-up boxes. going to probably switch to fancybox jquery plugin... also, fixed the user page so viewing it doesn't throw an error. 2010-08-09 21:10:11 -07:00
maxwell
38abd51666 MS IZ fixed a couple of failing specs in the parser 2010-08-09 21:09:51 -07:00
danielvincent
fd8d92a095 moved next/prev links in photo show to be inline with full size link. 2010-08-09 20:23:01 -07:00
danielvincent
d712218a14 removed commented out stuff on photo_new partial. also, fixed the delete button in photo show. 2010-08-09 20:18:20 -07:00
danielvincent
acd00c2a59 fixed top right buttons on album page, etc. also, made the image loader simpler. 2010-08-09 20:14:03 -07:00
maxwell
68c4de6c16 Merge branch 'friend-refactor' of github.com:diaspora/diaspora_rails into friend-refactor 2010-08-09 19:05:12 -07:00
Raphael
91b42ac0e2 Specs now mostly pass again, one is failing 2010-08-09 18:06:09 -07:00
Raphael
744693e7fb RS, DG; There is now a add friend box on the front page that passes group idto the app 2010-08-09 17:33:54 -07:00
maxwell
d443be35f9 Merge branch 'friend-refactor' of github.com:diaspora/diaspora_rails into friend-refactor 
Conflicts:
	app/controllers/publics_controller.rb
	app/models/user.rb
 2010-08-09 17:31:46 -07:00
maxwell
56d7c67bbb Going toward pending requests 2010-08-09 17:21:41 -07:00
Raphael
838fec4921 RS, DG; Working on group nav, fixed some stuff in photo 2010-08-09 16:34:06 -07:00
Raphael
02f66d4c0e Merge branch 'group-top' of github.com:diaspora/diaspora_rails into friend-refactor 2010-08-09 15:59:23 -07:00
Raphael
aebe7b97c0 DG RS; added groups. can't delete, but can make new ones 2010-08-09 15:58:53 -07:00
Raphael
d71966476b Merge branch 'group-top' of github.com:diaspora/diaspora_rails into group-top 
Conflicts:
	app/views/albums/show.html.haml
	app/views/authors/show.html.haml
	app/views/layouts/application.html.haml
	app/views/photos/show.html.haml
 2010-08-09 15:09:05 -07:00
Raphael
039ec0d06e warzombie is now more friendly 2010-08-09 15:05:54 -07:00
Raphael
c14bb5a4f8 Changed info logging to debug logging almost everywhere 2010-08-09 14:39:37 -07:00
Raphael
59147eb232 Person.new in dev seed 2010-08-09 13:03:27 -07:00
Raphael
33a827c33a RS, DG; Websocket is now working again, users have a channel 2010-08-09 13:02:08 -07:00
maxwell
82578ad80c MS IZ doing the friend querying correctly in user 2010-08-09 12:25:36 -07:00
maxwell
4243d8efca MS IZ using the particular user's friends in the send_friend_request_to 2010-08-09 12:19:26 -07:00
maxwell
ac7530d17f MS IZ person doesn't have friends user does 2010-08-09 11:51:32 -07:00
maxwell
f4428679ef First attempt at fixing warzombie friendingw 2010-08-09 11:44:13 -07:00
maxwell
921ee029b6 MS IZ putting the person in the return trip 2010-08-09 11:12:15 -07:00
maxwell
8532be1307 MS IZ moved activate_friend to user 2010-08-09 11:03:16 -07:00
maxwell
67843a21e2 MS IZ saving the person in accept of FR 2010-08-09 10:50:49 -07:00
Raphael
0a40efdaf7 Removing unused messages 2010-08-09 10:47:45 -07:00
Raphael
73a6cd911b DG, RS; User person delegation fixed 2010-08-09 10:46:02 -07:00
maxwell
544f7f08e5 MS IZ doesn't delete from pending friends since there is nothing in it 2010-08-09 10:38:13 -07:00
maxwell
7be374ac48 MS IZ fixed a couple of view things as well as the dev db seed script 2010-08-09 10:10:41 -07:00
ilya
890f927492 removed references of mine? method in all views 2010-08-08 22:53:23 -07:00
ilya
719bf450e1 I can't get no satisfaction from get satisfaction 2010-08-08 20:54:50 -07:00
ilya
8e6dfe7166 DG IZ having an email key makes devise work, ring to deploy 2010-08-08 17:00:39 -07:00
danielvincent
a6f5603dc9 added email field to login screen. strange error won't let me log in? 2010-08-06 23:55:05 -07:00
maxwell
f4ca29da41 PeopleController now renders json when given a query. Unfortunately, it only renders the matching friend ids without first or last names... 2010-08-06 17:19:33 -07:00
Raphael
214685e5a9 Dev seed might now work 2010-08-06 17:11:50 -07:00
Raphael
7076097ee4 RS, IZ; The tests are green. 2010-08-06 16:56:13 -07:00
maxwell
58de12df5e DG MS; PeopleController#index now accepts query string for search (only looks at first_name and last_name) 2010-08-06 16:35:02 -07:00
Raphael
4350e17656 RS, IZ; removed lots of putses, fixed up request, parser, retractions 2010-08-06 16:01:39 -07:00
Raphael
f2e327d908 User factory now works 2010-08-06 13:27:42 -07:00
Raphael
0f596af5c4 Refactored message_queue getting, fixed retraction spec 2010-08-06 13:13:00 -07:00
Raphael
d130b82e42 RS, IZ; ApplicationHelper specs now passed, specs for mine? moved into person spec as specs for owns? 2010-08-06 11:52:33 -07:00
danielvincent
6f1a596dff small color changes 2010-08-06 00:40:44 -07:00
danielvincent
c54d47337b updated button style 2010-08-06 00:15:22 -07:00
Raphael
b5cbfab36e RS, IZ; Comment spec now passes 2010-08-05 19:01:45 -07:00
maxwell
5d924dadf4 MS DG; 19 failing specs left 2010-08-05 17:16:51 -07:00
maxwell
dc0eb7de51 Merge branch 'master' of github.com:diaspora/diaspora_rails into friend-refactor 2010-08-05 15:13:59 -07:00
maxwell
5e6d0c1153 Merge branch 'master' of github.com:diaspora/diaspora_rails into 
friend-refactor, also fixed more specs

Conflicts:
	app/models/person.rb
	app/models/user.rb
	spec/factories.rb
 2010-08-05 15:13:05 -07:00
Raphael
bffb63d9f0 IZ, RS; Moved every instance of hardcoded backer info out to yml file config/deploy_config.yml 2010-08-05 14:39:48 -07:00
danielvincent
dae8f26692 DG MS; fixed most photo specs 2010-08-05 11:56:37 -07:00
Raphael
bb66e87905 RS, IZ; Encryption specs now pass with openssl 2010-08-05 11:56:31 -07:00
Raphael
f8e7d3f313 RS, IZ; Rolling back special casing of friend-request 2010-08-05 11:14:40 -07:00
Raphael
2429a1a476 RS, IZ; keys should roxml 2010-08-05 11:13:38 -07:00
Raphael
ebe14b5afd RS, IZ; Not using person in friend request verification 2010-08-05 11:09:36 -07:00
Raphael
f487e271c0 RS, IZ; Posts now sign, signatures and keys now serialize 2010-08-05 10:43:02 -07:00
danielvincent
4827953bec DG MS; person specs are now passing. retraction on unfriend is now uncommented 2010-08-05 10:29:30 -07:00
danielvincent
42c0b82068 one failing test in Person. i have no idea. 2010-08-04 23:54:15 -07:00
danielvincent
d6bc93fb96 commented out retraction on unfriending due to ROXML messing things up 
.
 2010-08-04 23:47:27 -07:00
ilya
4a3f6b2986 need to serialize key to bson 2010-08-04 21:08:25 -07:00
ilya
f11e973602 added the inport key thing in user 2010-08-04 20:44:18 -07:00
ilya
5dfc097c88 replaced the functionality with openssl, didn't do the encryption spec 2010-08-04 20:32:15 -07:00
danielvincent
f2d7f35b84 unfriend still not removing association from bad_friend 2010-08-04 20:29:54 -07:00
danielvincent
7a556e1b3c Merge branch 'master' of github.com:diaspora/diaspora_rails into friend-refactor 2010-08-04 19:23:56 -07:00
danielvincent
c92a225556 DG MS; user-person relationship done. bunch of failing stuff. 2010-08-04 19:22:14 -07:00
Raphael
6832c67a78 RS IZ friend requests are hopefully now signed 2010-08-04 17:20:34 -07:00
Raphael
7676179e54 IZ, RS; now passing correct object to verify_signature 2010-08-04 17:10:38 -07:00
Raphael
5a802299d5 IZ, RS; Retractions should now be signed 2010-08-04 17:06:15 -07:00
Raphael
2388237174 RS, IZ; Replace type_name method with object.class.to_s 2010-08-04 16:36:08 -07:00
Raphael
b8a2e8ecdf RS, IZ; Fix Photo.instantiate, make photo url include spec a little more specific 2010-08-04 16:13:32 -07:00
Raphael
e2c0ae2cee Merge branch 'master' of github.com:diaspora/diaspora_rails 2010-08-04 16:01:37 -07:00
Raphael
c245d8c60c Merging ostatus deletion with selenium start 2010-08-04 16:01:19 -07:00
danielvincent
75663b2447 DG MS; user can edit photo caption. also, photos have captions. 2010-08-04 16:00:59 -07:00
Raphael
58addca8dd RS, IZ; extracted and murdered ostatus. 2010-08-04 16:00:01 -07:00
danielvincent
09958bc207 DG MS; removed delete friend button from current user's show page 2010-08-04 15:43:24 -07:00
danielvincent
278189462b fixed ostatus generator references in models 2010-08-04 09:59:15 -07:00