maxwell fb310560df Merge branch 'master' of github.com:diaspora/diaspora

2010-12-04 19:37:47 -08:00

..

config

profile now knows about three images sizes, even in federation case

2010-11-30 15:58:25 -08:00

controllers

dispatch moved to resque. one failing test, globally stubbed out resque enqueue temporarily. TO AMEND.

2010-12-04 19:36:22 -08:00

fixtures

profile now knows about three images sizes, even in federation case

2010-11-30 13:40:41 -08:00

helpers

mardownify doesn't strip _/__/*/** without context anymore and allow __/** to be escaped with \__/\** instead of \_\_/\*\*. probably makes it less robust against weired constructs though

2010-12-02 13:54:39 +01:00

javascripts

Many JS improvements, moved a few things in view.js to stream.js, moved the clearForm plugin from view.js to rails.js (where we actually use it), refactored view.js and wrote specs

2010-12-04 11:54:59 +03:00

lib

MS RS Get the fake queue working when it's nested, and push local dispatch onto the queues

2010-12-04 19:36:22 -08:00

mailers

Add administrative mail method

2010-12-01 11:20:10 -08:00

models

Merge branch 'master' of github.com:diaspora/diaspora

2010-12-04 19:37:47 -08:00

factories.rb

DG MS; status messages can now have photos.

2010-11-21 16:13:01 -08:00

helper_methods.rb

MS RS Get the fake queue working when it's nested, and push local dispatch onto the queues

2010-12-04 19:36:22 -08:00

misc_spec.rb

MS RS Get the fake queue working when it's nested, and push local dispatch onto the queues

2010-12-04 19:36:22 -08:00

spec_helper.rb

MS RS Get the fake queue working when it's nested, and push local dispatch onto the queues

2010-12-04 19:36:22 -08:00