Steven Fuchs 9836860ca3 Merge remote branch 'upstream/master' into im-sorry-bye-vanna

2012-01-20 12:23:45 -05:00

..

chubbies

fix diaspora connect for the new oauth stuff WIP. There's one bug where the oauth_identifier changes but the client doesn't get informed or doesn't save it. I hope it's the last bug. Btw. this is all ugly

2011-12-10 12:54:39 +01:00

controllers

Merge remote branch 'upstream/master' into im-sorry-bye-vanna

2012-01-20 12:23:45 -05:00

fixtures

remove all references to the websocket. bang bang.

2012-01-10 12:28:19 -08:00

helpers

remove ajax_stream? logic from streams now that we're using backbone & never ajaxing on mobile; remove unreferenced community_spotlight stream & controller

2012-01-13 13:50:52 -08:00

integration

remove all references to the websocket. bang bang.

2012-01-10 12:28:19 -08:00

javascripts

Merge remote branch 'upstream/master' into im-sorry-bye-vanna

2012-01-20 12:23:45 -05:00

lib

rewrite webfinger client and specs; now this is much easier to maintain.

2012-01-18 01:21:28 -08:00

mailers

adding attachments to all recepients

2011-10-31 18:09:43 -07:00

models

Merge remote branch 'upstream/master' into im-sorry-bye-vanna

2012-01-20 12:23:45 -05:00

multi_server

simplify multi-server spec running with foreman. couldn't really get it automated tonight, not sure why.

2011-09-22 00:24:01 -04:00

shared_behaviors

remove ajax_stream? logic from streams now that we're using backbone & never ajaxing on mobile; remove unreferenced community_spotlight stream & controller

2012-01-13 13:50:52 -08:00

support

make jasmine view tests work, load templates, party

2012-01-07 14:23:21 -08:00

factories.rb

SM MS; Read email sent to diaspora-dev for more information about this

2012-01-17 19:29:01 -08:00

helper_methods.rb

ms iz rendering nothing for hcard and webfinger if account is closed, not showing aspect dropdown if the user account is closed

2011-12-08 16:32:18 -08:00

misc_spec.rb

ms iz rendering nothing for hcard and webfinger if account is closed, not showing aspect dropdown if the user account is closed

2011-12-08 16:32:18 -08:00

parallel_spec.opts

pull in parallel_testing to speed up rspec

2011-09-16 22:14:12 +02:00

spec_helper.rb

try loading app config in spec_helper to prevent bad fixtures from being generated

2012-01-13 23:15:32 -08:00

spec-doc.rb

This fixes issue #2298.

2011-11-02 23:51:12 -04:00