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

548 commits

Author SHA1 Message Date
maxwell
c1c045a4cd mocking 2010-10-29 16:21:39 -07:00
Raphael
5b78a31d29 make_user now makes a user from fixtures 2010-10-29 15:53:21 -07:00
maxwell
7e7c4c3431 refactored message handler spec 2010-10-29 14:26:11 -07:00
maxwell
f75bd6bc2e whoops, taking out queue stuff untill i finish 2010-10-29 13:05:35 -07:00
maxwell
c6fbcd28f7 stubbing out the hub publish method 2010-10-29 12:09:10 -07:00
maxwell
a5eb4bf1a7 Merge branch 'emw-merge' 2010-10-29 11:38:47 -07:00
maxwell
39f66cc5d9 tests are green 2010-10-29 11:19:07 -07:00
maxwell
7c32649df4 rebasing master 2010-10-29 11:18:20 -07:00
maxwell
6d139ab946 more tests pass 2010-10-29 11:17:39 -07:00
maxwell
1b48572674 MS tests are now green 2010-10-29 11:16:50 -07:00
maxwell
b8a9025616 bad merge in receive 2010-10-29 11:16:11 -07:00
maxwell
a5ba14f89c nope that last fix I was too tired. the problem is when someone sends me a request saying it is a response from me 2010-10-29 11:16:11 -07:00
maxwell
09c4def70b bug; when someone sends you an unknown request, your server crashes. 2010-10-29 11:16:11 -07:00
maxwell
9f314f44d9 typo 2010-10-29 11:15:14 -07:00
zhitomirskiyi
d1de921d46 longer timeout 2010-10-29 11:15:14 -07:00
zhitomirskiyi
483960ae98 MS IZ more begin rescue 2010-10-29 11:15:14 -07:00
maxwell
68a44af856 making a few more cleanup and tests 2010-10-29 11:13:08 -07:00
maxwell
eddcb71fcb EM websocket cleanly merged with master. webfingering is now async 2010-10-29 11:11:05 -07:00
maxwell
9a2e3ef158 making a few more cleanup and tests 2010-10-29 11:05:17 -07:00
maxwell
8fe339b03b EM websocket cleanly merged with master. webfingering is now async 2010-10-29 11:05:17 -07:00
Derrick Camerino
5d0700001e changing shell command to use FileUtils 2010-10-28 20:46:45 -07:00
zhitomirskiyi
f484eb957f comments now don't imbed the person in the xml 2010-10-28 12:13:39 -07:00
zhitomirskiyi
21c75c08bb removed the http inspect 2010-10-26 19:19:34 -07:00
zhitomirskiyi
708927cc6d more debugging on remote, back to 5 sec timeout 2010-10-26 18:31:06 -07:00
zhitomirskiyi
d61ec0186f debugging, trying increasing the timeout 2010-10-26 18:21:47 -07:00
zhitomirskiyi
8b16dd25e7 trying better logging 2010-10-26 18:16:10 -07:00
zhitomirskiyi
0b2e00b7d6 MS IZ the mailer will not be setup unless turned on in the APP_CONFIG 2010-10-26 17:46:19 -07:00
zhitomirskiyi
fa484e95e4 MS IZ refactored querying 2010-10-26 17:05:38 -07:00
zhitomirskiyi
acdbbe4dfc no mail for debugging for now 2010-10-26 15:34:02 -07:00
zhitomirskiyi
c0c8c6253c added a logging line for debugging 2010-10-26 15:13:16 -07:00
zhitomirskiyi
1024b8a3a7 Merge branch 'master' of github.com:diaspora/diaspora into contact-refactor 
Conflicts:
	app/controllers/aspects_controller.rb
 2010-10-26 14:57:52 -07:00
zhitomirskiyi
8acdf21234 MS IZ got rid of the requests for me scope in the user 2010-10-26 14:49:37 -07:00
zhitomirskiyi
917d1838de MS IZ specs are green 2010-10-25 18:55:51 -07:00
ilya
c27f05ed42 Initial refactor done, need to stop mapping user.friends to people so much 2010-10-22 18:11:04 -07:00
ilya
7083d2aa03 Moving friendships into a 'Contact' proxy object. 2010-10-22 18:11:04 -07:00
ilya
cbd3487705 moved the nailer to the end so setup of mailer doesnt mess with the communitcation 2010-10-22 12:00:14 -07:00
ilya
9a217d1fa8 MS IZ request acceptance email 2010-10-22 11:55:50 -07:00
maxwell
5701c3a873 should send the email when a new request is received. emails in dev should be intercepted to email@joindiaspora.com for now 2010-10-22 00:49:01 -07:00
ilya
80cd4761f3 started the new invitation email 2010-10-22 00:49:01 -07:00
Sarah Mei
669a7cabb2 Use diaspora gemset. Simplify rake runner. 2010-10-20 21:43:03 -07:00
Sarah Mei
560910b53d More cruisecontrol bits 2010-10-20 20:47:07 -07:00
Sarah Mei
73f0e17f5a Converting to cruisecontrol.rb 2010-10-20 20:39:13 -07:00
ilya
554adeae69 MS IZ; querying through for person not in aspect is tested 2010-10-20 16:39:37 -07:00
ilya
8fddb4ecf5 MS IZ added test concerning people in multiple aspects 2010-10-20 13:19:32 -07:00
ilya
992bd42b55 Merge branch 'master' of github.com:diaspora/diaspora 
Conflicts:
	spec/models/aspect_spec.rb
 2010-10-20 11:30:06 -07:00
Raphael
0758f9245f Clean up specs a little, fix unfriending 2010-10-20 10:28:08 -07:00
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