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

602 commits

Author SHA1 Message Date
Raphael
fd8028db33 Revert "Revert "Merge remote branch 'upstream/master'"" 
This reverts commit 1481056af2.
 2010-10-20 09:51:55 -07:00
ilya
4d1ce410d7 Merge branch 'master' of github.com:diaspora/diaspora 2010-10-20 09:39:32 -07:00
Alec Leamas
1481056af2 Revert "Merge remote branch 'upstream/master'" 
This reverts commit fb70dc8c99, reversing
changes made to 53fef63a9a.

Conflicts:

	pkg/fedora/diaspora-setup
	pkg/ubuntu/diaspora-setup
	public/stylesheets/sass/application.sass
	spec/models/user/attack_vectors_spec.rb
 2010-10-20 14:59:55 +02:00
maxwell
e7f764ffeb attack vector where you take posts from valid (unknown) diaspora people is now fixed 2010-10-20 00:42:33 -07:00
maxwell
e7f84f5434 fix hcard when parsing friend photo 2010-10-19 20:46:43 -07:00
ilya
e3ffd2ffe7 Merge branch 'master' of github.com:diaspora/diaspora 2010-10-19 18:26:06 -07:00
ilya
b31b2de6f5 MS IZ aspect add and delete for a person 2010-10-19 18:25:59 -07:00
Raphael
9309be2d69 Merge branch 'import' 
Conflicts:
	spec/models/user/invite_spec.rb
 2010-10-19 16:06:48 -07:00
Joseph Method
e3e4a6b319 Continuation of previous commit 2010-10-17 19:07:54 -04:00
ilya
9727b356e1 the invitations add requests which are now correctly auto accepted 2010-10-15 17:20:04 -07:00
maxwell
11925ded2b moving branches 2010-10-14 19:15:32 -07:00
maxwell
e218ab6780 Merge branch 'master' of github.com:diaspora/diaspora into import 
Conflicts:
	app/controllers/users_controller.rb
 2010-10-13 23:09:48 -07:00
maxwell
a86d965079 DG MS; importer now takes params for username, password, and diaspora handle 2010-10-13 17:07:16 -07:00
maxwell
f04934cbae DG MS; ensure aspect post_ids are only for user 2010-10-13 16:54:18 -07:00
maxwell
b395208a51 DG MS; added more stuff to importer. 2010-10-13 16:42:27 -07:00
maxwell
637a79a99d DG MS; spec for clean_aspects 2010-10-13 13:28:10 -07:00
maxwell
55227f3f72 DG MS; filter_post method, aspect_clean method 2010-10-13 13:10:08 -07:00
Raphael
9a1590fa02 Move user module requires out to the user modules definition file 2010-10-13 11:18:06 -07:00
danielvincent
0315869a24 all specs should pass again after merge 2010-10-13 09:43:58 -07:00
danielvincent
59c3be41b3 Merge branch 'master' of github.com:diaspora/diaspora into import 2010-10-13 09:21:27 -07:00
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
ilya
b53462ee93 Merge branch 'malicious_friend_refactor' of github.com:diaspora/diaspora 2010-10-12 15:55:02 -07:00
ilya
c00a70dde1 Merge branch 'master' of github.com:diaspora/diaspora 2010-10-12 15:54:37 -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
1d1ff7e330 Merge branch 'master' of github.com:diaspora/diaspora into import 2010-10-12 11:34:31 -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
Raphael
c8f864a69b Finish fixing move_private_key 2010-10-11 17:22:53 -07:00
danielvincent
b2f3074eb0 DG MS; scenario for importer spec 2010-10-11 17:00:42 -07:00
Raphael
a372ec33be fixing uninitialized constant in rake task 2010-10-11 16:36:34 -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
Sarah Mei
c646db956e CI does a proper export. FINALLY. 2010-10-08 21:13:13 -06: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
Sarah Mei
bc75c4acf5 Let's try putting display in the rake command. 2010-10-08 15:22:02 -06:00
Sarah Mei
4e3e6d9562 rake task starts a virtual framebuffer before running tests, stops it after 2010-10-08 14:55:53 -06:00
Sarah Mei
ebef212079 Merge branch 'master' of github.com:diaspora/diaspora 2010-10-08 14:14:48 -06:00
Sarah Mei
564217684f Fail CI if exitstatus isn't 0. *sigh* 2010-10-08 14:14:39 -06:00
Raphael
76e77c2bf1 refactor hcard for faster testing 2010-10-08 13:06:21 -07:00
Sarah Mei
b02e266130 Don't need a bundle install in the ci task 2010-10-08 01:07:07 -06:00
Sarah Mei
c0bf7ab5cd Rake task for CI that includes a bundle install 2010-10-08 00:39:30 -06:00
danielvincent
7a56d82873 Merge branch 'master' of github.com:diaspora/diaspora 2010-10-07 16:56:22 -07:00
danielvincent
4deea95057 DG MS; export photos button in users#edit 2010-10-07 16:56:10 -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
ilya
bb6866fa0f removed depricated non-encrypted author info fields from salmon 2010-10-06 23:20:28 -07:00
danielvincent
ee4c197b89 fixed hcard finder on image 2010-10-06 18:32:56 -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
fc31eb405d removing logging messages 2010-10-05 18:34:56 -07:00
danielvincent
7f652eb81c more logging 2010-10-05 18:03:17 -07:00
danielvincent
57e47e5a68 removed excess dumb. pubsub should work now 2010-10-05 17:58:56 -07:00
danielvincent
cc01345edd debug statements 2010-10-05 17:56:13 -07:00
danielvincent
a063207a0a logger instead of debug 2010-10-05 17:52:21 -07:00
danielvincent
d890b57b13 temp logger message 2010-10-05 17:45:35 -07:00
danielvincent
e01eedef95 Merge branch 'master' of github.com:diaspora/diaspora 2010-10-05 17:26:41 -07:00
danielvincent
0e8b84fb96 publish instead of get 2010-10-05 17:26:26 -07:00
Raphael
2df3cf353b Merge branch 'master' of github.com:diaspora/diaspora 2010-10-05 17:24:18 -07:00
Raphael
5847e7767d Add profile photo url to hcard parser 2010-10-05 17:24:01 -07:00
danielvincent
c01bbbb3e0 capitalization error. should push to pubsub now. 2010-10-05 17:24:00 -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
danielvincent
f3c34692d8 pubsub support 2010-10-05 13:39:56 -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
dadacbd092 removed whitespace striping 2010-10-03 13:33:01 -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
46bf0cfd99 roundtrip done, just need to clean and move to the new api 2010-09-28 15:11:01 -07:00
ilya
c7d29b29c8 the salmon now encrypts the activity, and stores the aes key in the header 2010-09-28 13:22:19 -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
ilya
904143d100 rake task to move the private key 2010-09-28 11:25:18 -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
ilya
1225291fc2 Merge branch 'master' of github.com:diaspora/diaspora 2010-09-27 19:01:25 -07:00
danielvincent
26a4dc76a6 Merge branch 'master' of github.com:diaspora/diaspora 2010-09-27 18:34:55 -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
Raphael
efe85a4c28 db:reset should call db:seed:dev, not db:seed:tom 2010-09-27 16:54:42 -07:00
ilya
b823213c0d added a generate:secret_token task, and added an initializer to generate one if the file does not exist 2010-09-27 15:29:55 -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
e792344c0e Use improved whitespace:scrub_gratuitous_newlines 2010-09-26 12:52:39 -04:00
Dorian
4223769df0 Improve task which remove consecutive blank lines 2010-09-26 12:50:25 -04:00
Dorian
d8c497177f Improve whitespace:cleanup and whitespace:retab 2010-09-26 12:50:18 -04:00
Dorian
6ffc03a4c9 Big clean up: delete trailing whitespace 2010-09-26 12:48:40 -04:00
Stephen Caudill
3e499c0f1b Hack the rake tasks to run cucumber + rspec 2010-09-26 11:39:35 -04:00
Stephen Caudill
05c2da81e5 Add cucumber and run the generator 2010-09-26 11:35:50 -04:00
Stephen Caudill
af938fe74f Remove unused/broken Selenium tests 2010-09-26 11:33:41 -04:00
Stephen Caudill
ebf4999054 Task to remove consecutive blank lines 2010-09-25 12:11:04 -04:00
Stephen Caudill
536cea5e44 Remove consecutive empty lines 2010-09-25 12:06:39 -04:00
Stephen Caudill
4cfc7e2f89 Add description for retab task 2010-09-25 11:03:12 -04:00
Raphael
5c32cbaee8 Fix requires in rake task 2010-09-24 14:40:30 -07:00
Raphael
f11a481ed7 Actually do something 2010-09-22 22:59:17 -07:00
Raphael
494f765066 fix_diaspora_handle rake task 2010-09-22 22:57:53 -07: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
Raphael
08df7e1250 Merge branch 'master' of github.com:diaspora/diaspora 2010-09-21 11:03:32 -07:00
Raphael
50414fef40 Remove unused method from message handler 2010-09-21 11:03:21 -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
Raphael
b0c87fcffa Add a little more feedback to rake task 2010-09-16 17:04:59 -07:00
Raphael
dea0912c28 Do a more specific query in the fix rake task 2010-09-16 16:41:28 -07:00
maxwell
bbc7492af4 Merge branch 'master' of github.com:diaspora/diaspora 2010-09-16 16:17:23 -07:00
maxwell
1e8f10f1af MS rake task to fix broken local people.... let me test it first on a server, but then you can run rake db:fix_diaspora_handle 2010-09-16 16:12:45 -07:00
danielvincent
0c7ba49e34 DG IZ; aspect deletion 2010-09-16 16:03:18 -07:00
Jamie Wilkinson
295ae7fa93 'rake whitespace:clean' => 'rake whitespace:cleanup' 2010-09-16 13:19:03 +08:00
Stephen Caudill
3d939a1119 Add task for retabbing all files in project 
Replace hard tabs with two character soft tabs.
 2010-09-16 13:16:10 +08:00
Jamie Wilkinson
fbdd50172d Cleanup stray whitespace 2010-09-16 10:07:59 +08:00
Jamie Wilkinson
0c6c4af277 'rake whitespace:cleanup' task 2010-09-16 10:07:58 +08:00
Raphael
708e9f88a5 Spell our own name right 2010-09-15 17:56:18 -07:00
maxwell
84c60e5f2e DG MS fixing webfinger, i hope to goodness 2010-09-15 13:28:06 -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
Raphael
ab6d631a27 White space in user file, deleting net/curl as unused 2010-09-10 16:25:19 -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
d03c8e3323 removed the gen key method from encryptor 2010-09-09 16:31:10 -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
67f9d9dab5 Add hcard, add id for pod_location 2010-09-09 15:34:20 -07:00
Raphael
240dda4eab Salmon for posts is in, old cruft has not been taken out and requests and comments are unfinished 2010-09-09 12:21:36 -07:00
Raphael
4fd0853e71 Moving to salmon 2010-09-08 18:29:39 -07:00
maxwell
804777f9ae MS; updated to released rails 2010-09-07 16:47:53 -07:00
Raphael
f76c4bd390 Revert "Change ObjectID to ObjectId" 
This reverts commit efcc112397a8080fbfabd15dab30036bbb6c7140.
 2010-08-28 13:32:51 -07:00
Raphael
12b28b4f48 Change ObjectID to ObjectId 2010-08-28 13:31:07 -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
00f8a3e628 removed ensure_bson in user. added to_id method to String and ObjectID classes 2010-08-25 17:11:57 -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
maxwell
f172c9e1d2 Merge branch 'master' of github.com:diaspora/diaspora 2010-08-23 18:45:31 -07:00
maxwell
a37b5ae09b IZ MS; added a basic salmon library to help with directed messages, and made an keyhash method 2010-08-23 18:45:20 -07:00
Raphael
ed99532a83 memory leak gone for real 2010-08-23 16:52:19 -07:00
Raphael
74be86395b Changing env back to development mode, the memory leak is likely fixed 2010-08-23 16:33:44 -07:00
danielvincent
ee7005ad74 db:purge now deletes everything in uploads folder 2010-08-23 16:11:39 -07:00
maxwell
20678060e7 selenium, ymls, a sample test 2010-08-19 15:44:23 -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
Raphael
4a4686ce6e refactored signature validation got specs passing 2010-08-17 23:21:00 -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
5dff3369ad DG IZ; removed puts statements. 2010-08-17 10:48:40 -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
eae4053902 Encryption removed from callbacks, except retractions sort of. verification is in user.receive 2010-08-16 17:23:54 -07:00
Raphael
b0537e2f34 Comments pushing in the right directions 2010-08-16 15:04:09 -07:00
ilya
23c57c653f RS, IZ; Trying to speed up cap db reset 2010-08-13 12:34:24 -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
Raphael
cd875d06db RS, DG; DB purge now deletes tmp folder 2010-08-10 11:13:37 -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
73a6cd911b DG, RS; User person delegation fixed 2010-08-09 10:46:02 -07:00
Raphael
7076097ee4 RS, IZ; The tests are green. 2010-08-06 16:56:13 -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
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
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
f8e7d3f313 RS, IZ; Rolling back special casing of friend-request 2010-08-05 11:14:40 -07:00
Raphael
ebe14b5afd RS, IZ; Not using person in friend request verification 2010-08-05 11:09:36 -07:00
Raphael
15f1527a72 RS, IZ; Adding logging to verify_signature 2010-08-05 10:56:38 -07:00
Raphael
d75c8870dd RS, IZ; Removing gpg infrastructure 2010-08-05 10:46:29 -07:00
Raphael
f487e271c0 RS, IZ; Posts now sign, signatures and keys now serialize 2010-08-05 10:43:02 -07:00
ilya
4a3f6b2986 need to serialize key to bson 2010-08-04 21:08:25 -07:00
ilya
5dfc097c88 replaced the functionality with openssl, didn't do the encryption spec 2010-08-04 20:32:15 -07:00
Raphael
5a802299d5 IZ, RS; Retractions should now be signed 2010-08-04 17:06:15 -07:00
Raphael
58addca8dd RS, IZ; extracted and murdered ostatus. 2010-08-04 16:00:01 -07:00
danielvincent
9a134555d7 message handler was calling find_hub instead of hub 2010-08-04 09:49:59 -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
Raphael
848acff02a drop the database on purge 2010-08-02 18:08:07 -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
Raphael
3376057c33 Merge branch 'master' of github.com:diaspora/diaspora_rails 2010-07-29 13:58:49 -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
Raphael
1e954eae4f took out old puts, put in new one 2010-07-28 20:37:42 -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
maxwell
ebe2d5a7ac MS found my bug, i think 2010-07-23 22:07:49 -07:00