Commit graph

236 commits

Author SHA1 Message Date
danielvincent
7ea3fe5bf1 MS DG; verifys implemented, but need more tests 2010-10-12 18:53:12 -07:00
danielvincent
92e5622247 DG MS; adding verification methods to importer. 2010-10-12 17:41:09 -07:00
ilya
9b249281a1 moved verify comment sig before any saving goes on 2010-10-12 16:01:36 -07:00
danielvincent
8720dfa950 DG MS; made test slower. posts now export correctly. 2010-10-12 15:33:08 -07:00
ilya
d8439c82ee going calling by webfinger only once 2010-10-12 12:21:57 -07:00
danielvincent
2e8bba1a04 MS DG adding more to exporter and importer 2010-10-12 11:34:13 -07:00
ilya
ee2d134cb0 receiving spec is green 2010-10-11 19:20:00 -07:00
danielvincent
948c5d9b02 DG MS; end of day. 2010-10-11 19:04:27 -07:00
ilya
03df0ff716 parser spec is green 2010-10-11 18:22:19 -07:00
danielvincent
b2f3074eb0 DG MS; scenario for importer spec 2010-10-11 17:00:42 -07:00
danielvincent
0f7807222b DG MS; cleaned up method 2010-10-11 11:38:08 -07:00
danielvincent
9162a4a168 DG MS; 404 show pages for objects that don't exist for given user 2010-10-11 11:32:20 -07:00
ilya
3887712115 slight refactor of receiving spec, wrote a spec that exposed malicious friend attack
vector
2010-10-09 21:34:53 -07:00
Raphael
d72c4de438 Revert "CGI unescape incoming salmons"
This reverts commit 6cbe4075f4.
2010-10-08 16:08:35 -07:00
Raphael
f09a54b67f Revert "arguments..."
This reverts commit 8049aa20e8.
2010-10-08 16:08:25 -07:00
Raphael
8049aa20e8 arguments... 2010-10-08 16:01:24 -07:00
Raphael
6cbe4075f4 CGI unescape incoming salmons 2010-10-08 15:59:32 -07:00
Raphael
1fd3aeabd9 Add or later to license notice 2010-10-07 16:25:34 -07:00
danielvincent
0f5a09783d positioning 2010-10-07 14:32:45 -07:00
danielvincent
09dad2d80f DG MS; exporter includes comments. exporter spec 2010-10-07 14:10:14 -07:00
danielvincent
7e8bf40a87 Merge branch 'master' of github.com:diaspora/diaspora 2010-10-07 12:21:31 -07:00
danielvincent
8a130a68aa DG MS; xml exporter file added 2010-10-07 12:21:14 -07:00
Raphael
d7bbb66d27 Run whitespace:cleanup 2010-10-07 10:47:37 -07:00
Raphael
67fc01aa36 Send friend_acceptances correctly 2010-10-07 09:49:34 -07:00
danielvincent
6b74053e06 scratch that last commit 2010-10-05 20:37:28 -07:00
danielvincent
982f51b9c7 prepend pod_url to image paths 2010-10-05 20:31:40 -07:00
danielvincent
91bbd607e6 user avatar in public feed activity:subject 2010-10-05 20:27:33 -07:00
danielvincent
dc88110716 img tag in hcard 2010-10-05 20:22:13 -07:00
danielvincent
830b3772d5 self reference in atom 2010-10-05 16:59:55 -07:00
danielvincent
09b861c7a3 remove .atom from public url 2010-10-05 16:51:27 -07:00
danielvincent
6723a51149 correctly indent xml 2010-10-05 16:40:50 -07:00
danielvincent
11857a9308 fixing id field in atom 2010-10-05 16:35:29 -07:00
danielvincent
4a8a21b95f public fix 2010-10-05 16:28:01 -07:00
ilya
0d2d5b65fb removed the logging statements, now servers communicate sucessfully and only re-encrypt the header for people 2010-10-03 18:08:18 -07:00
ilya
3eaf4e0ba1 a couple of logger lines to help debug on remote 2010-10-03 17:33:31 -07:00
ilya
f9cecd9d89 specs are green 2010-10-02 13:03:11 -07:00
ilya
b6a912dd02 slowly getting specs to pass on with the new api 2010-09-30 15:17:53 -07:00
ilya
6eede48f9f started to refactor the salmon spec, changed data in to be parsed data
to be more clear
2010-09-28 12:39:55 -07:00
danielvincent
762646dbe8 make the director more forgiving 2010-09-27 22:11:14 -07:00
danielvincent
eac6b8a63b builder is now a class initialized with a user. added director class. 2010-09-27 21:54:01 -07:00
danielvincent
58b688aa68 fixed builder spec 2010-09-27 21:28:21 -07:00
danielvincent
eb7244e07c Merge branch 'master' of github.com:diaspora/diaspora 2010-09-27 19:07:01 -07:00
danielvincent
3b8ddf76a3 temp route for atom feed. also, public atom currently displays all posts. 2010-09-27 18:34:47 -07:00
ilya
7852c346f2 mode the visible posts api more general and moved to it on the public controller 2010-09-27 18:31:37 -07:00
danielvincent
df800dc87e ostatus builder 2010-09-27 17:58:44 -07:00
ilya
9ff3263444 Merge branch 'master' of github.com:diaspora/diaspora 2010-09-27 10:03:41 -07:00
danielvincent
b4d4986758 removed inclusion block 2010-09-26 22:20:01 -07:00
ilya
cf0df90dae moved the private key into user where it belongs, two failing cucumber tests 2010-09-26 22:08:42 -07:00
Dorian
6ffc03a4c9 Big clean up: delete trailing whitespace 2010-09-26 12:48:40 -04:00
Stephen Caudill
536cea5e44 Remove consecutive empty lines 2010-09-25 12:06:39 -04:00
Thomas Krehbiel
10e6ff9df8 Fix for sending unlimited duplicate friend requests 2010-09-22 18:16:10 -04:00
danielvincent
4a3bfea1ba DG MS; cleaned spec 2010-09-21 17:43:46 -07:00
Raphael
11d31901e4 IZ, RS, Pulled receiving out of user file, refactored receive method to be clearer 2010-09-21 13:59:52 -07:00
danielvincent
ca97d792af DG IZ; fixing querying bug in aspect_by_id 2010-09-20 18:08:59 -07:00
danielvincent
9c334e24e4 Merge branch 'master' of github.com:diaspora/diaspora 2010-09-20 17:26:35 -07:00
danielvincent
e588d7ab6a DG IZ moving friends is now ajaxy 2010-09-20 17:26:20 -07:00
Raphael
8dd11c0c95 Add a couple specs to friending 2010-09-20 16:41:03 -07:00
danielvincent
af9cda52af DG IZ; always query through the current_user in the controllers. 2010-09-20 13:18:11 -07:00
Raphael
c520fb71a7 Moved socket out to separate process. Multiple thins should now be possible 2010-09-16 21:34:15 -07:00
danielvincent
0c7ba49e34 DG IZ; aspect deletion 2010-09-16 16:03:18 -07:00
Jamie Wilkinson
fbdd50172d Cleanup stray whitespace 2010-09-16 10:07:59 +08:00
Raphael
708e9f88a5 Spell our own name right 2010-09-15 17:56:18 -07:00
Raphael
aa3ebe372c License notices replaced 2010-09-15 10:58:48 -07:00
Daniel Vincent Grippi
b2b60af8aa Albums_by_aspect now takes :all 2010-09-13 17:32:29 -07:00
Daniel Vincent Grippi
1b92bcd17c Add albums_by_aspect method to user 2010-09-13 17:26:24 -07:00
Daniel Vincent Grippi
40ecf176e8 Merge branch 'master' of github.com:diaspora/diaspora 2010-09-13 14:26:15 -07:00
Daniel Vincent Grippi
4c15b1a01c added license to every single goddamn file. also, put one in the root dir. 2010-09-13 14:23:50 -07:00
Raphael
b05d106aed Remove user_refs from Person, put pendings in the broken photo specs 2010-09-13 12:16:43 -07:00
Raphael
44a1f82da9 Rename group to aspect 2010-09-13 10:38:38 -07:00
Daniel Vincent Grippi
62994f1660 retractions should now actually websocket again 2010-09-12 21:24:22 -07:00
Raphael
04883f914f Remove unused webhooks methods 2010-09-10 16:43:31 -07:00
Raphael
dd166921a4 Salmon friend retractions 2010-09-10 16:38:40 -07:00
Raphael
6afaf73c30 Merge branch 'salmon' of github.com:diaspora/diaspora 2010-09-10 16:27:13 -07:00
maxwell
98e882b2f0 MS reloading friend_request.person 2010-09-10 16:19:51 -07:00
Raphael
a44d40168a Encryption removed from everything other than comments, most irrelevant specs removed 2010-09-10 16:04:09 -07:00
Raphael
aa1f3c6438 Comments now use salmon, the whole salmon is encrypted, user querying moved to lib file 2010-09-10 10:31:23 -07:00
Raphael
a449afca8e RS IZ salmon back friend acceptances 2010-09-09 17:07:40 -07:00
Raphael
fcadf7ab96 Salmon the requests 2010-09-09 16:54:51 -07:00
Raphael
86d9a41d25 send_friend_request_to now takes a person and group, rather than a receive url and a group id 2010-09-09 16:06:42 -07:00
Raphael
2dd2f38442 Attempting to make comments from unknown users save 2010-08-26 19:15:22 -07:00
Raphael
84e2800c7d added a logger statement to the diaspora person parser 2010-08-26 17:16:11 -07:00
Raphael
94bb754c34 Changed parseing person from xml a little, using it for comments. 2010-08-26 15:06:39 -07:00
Raphael
72c41a5ff8 User post now requires a :to field 2010-08-24 15:42:24 -07:00
Raphael
db33d94f07 Render nothing on status_messages create, Websockets now honestly
support multiple groups.
2010-08-24 14:36:03 -07:00
Raphael
d1c540439e Moved friending out to a lib file, specs all pass 2010-08-24 12:13:10 -07:00
ilya
21f70c643d DG IZ; moved update_profile from Person into User. removed notify_people methods. temporarily broke album pushing 2010-08-18 16:15:10 -07:00
ilya
7d68089c8b DG IZ using group_id when passing the id around the app 2010-08-17 16:02:12 -07:00
ilya
87bc9dad1d DG IZ added group id to the action hash 2010-08-17 15:27:12 -07:00
ilya
1d92d11841 DG IZ; user refs are incremented as well as decremented for Posts 2010-08-16 20:39:24 -07:00
Raphael
b0537e2f34 Comments pushing in the right directions 2010-08-16 15:04:09 -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
11758beaf3 RS, DG; Removed <posts> from xml 2010-08-11 14:26:39 -07:00
Raphael
5abd604dad RS, DG; build_xml_for has been eliminated. 2010-08-11 14:21:53 -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
Raphael
599d1da620 Moved socket code out to lib, unsocketing from view should now work again 2010-08-11 12:03:26 -07:00
Raphael
683bb0dbef Took out create redirects on ajaxy things, authenticating statusmessages 2010-08-11 10:52:01 -07:00
maxwell
8d986a207e IZ MS; Socket test now passes 2010-08-10 17:50:17 -07:00
maxwell
a45d852f30 MS IZ request specs now PASS 2010-08-10 17:36:25 -07:00
maxwell
da4de20ce1 IZ MS made things push to the receive url 2010-08-10 15:24:51 -07:00
maxwell
3607601ea3 addded the right url to the push to method 2010-08-10 13:32:26 -07:00
maxwell
95c4de5d6c MS IZ fixed all of the request specs zomg 2010-08-10 11:26:32 -07:00
maxwell
38abd51666 MS IZ fixed a couple of failing specs in the parser 2010-08-09 21:09:51 -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
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
c14bb5a4f8 Changed info logging to debug logging almost everywhere 2010-08-09 14:39:37 -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
62e6ea0756 Error rescue in parser now is specific to not a real type error 2010-08-06 12:14:51 -07:00
maxwell
5d924dadf4 MS DG; 19 failing specs left 2010-08-05 17:16:51 -07:00
maxwell
7a1011c46c DG MS; webhook specs fixed 2010-08-05 15:41:32 -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
58addca8dd RS, IZ; extracted and murdered ostatus. 2010-08-04 16:00:01 -07:00
danielvincent
4179b94043 cleaned process function in ostatus parser 2010-08-04 01:40:11 -07:00
danielvincent
7142803bf2 Parser author and entry method polish 2010-08-04 01:31:47 -07:00
danielvincent
b7fb844fdf more cleanup on Diaspora::OStatusParser 2010-08-04 00:57:46 -07:00
danielvincent
2938341b54 removed parse_ from every method name in Diaspora::OStatusParser 2010-08-04 00:47:29 -07:00
danielvincent
c5ace3069d diaspora module correctly loads everything (lazy) 2010-08-04 00:41:23 -07:00
ilya
f191aef981 DG IZ profile profile photos should update, removed the scaled down hack 2010-07-29 19:44:58 -07:00
ilya
abc5ee412d DG IZ assiging the new profile to the person in the parse objects from xml 2010-07-29 19:24:52 -07:00
ilya
0aa268a62d DG IZ trying asymetric searization and marshaling 2010-07-29 19:12:20 -07:00
ilya
dea85f580f DG IZ testing profile on polk 2010-07-29 18:37:21 -07:00
maxwell
6aa1fa1826 DG MS profiles send? who knows... 2010-07-29 15:53:38 -07:00
maxwell
2040c0d347 MS fixed lots of debug messages 2010-07-29 10:05:02 -07:00
maxwell
7a0db375ab MS added rails 3rc 2010-07-29 09:59:03 -07:00
maxwell
049361ea15 MS profiles should send, need to just make the parser now 2010-07-28 18:32:00 -07:00
maxwell
d73d36f162 MS i had broke atom generation in my refactor. now it is fixed 2010-07-26 17:39:48 -07:00
maxwell
b797704a14 MS small pointless webhooks refactor 2010-07-24 16:11:32 -07:00
maxwell
416f128ba8 MS pushing code around into seperate files for clairty, many specs moved around to much more sane names. i still need to break out diaspora generator out of webhooks module 2010-07-24 15:48:42 -07:00
maxwell
9095a06738 MS just broke common.rb out into 3 files.... all tests pass, dont shoot me if something is broken, but on first pass we look ok 2010-07-24 01:56:07 -07:00