Jonne Haß 358ed79f99 Merge branch 'update_devise' ...

Conflicts:
	Gemfile.lock

2012-09-12 15:11:34 +02:00

..

controllers

update factory girl

2012-09-12 13:24:23 +02:00

fixtures

first working version of a 'post fetcher' for remote accounts

2012-08-04 13:22:03 +02:00

helpers

update factory girl

2012-09-12 13:24:23 +02:00

integration

update factory girl

2012-09-12 13:24:23 +02:00

javascripts

finish beta striping

2012-09-12 07:51:19 +02:00

lib

update factory girl

2012-09-12 13:24:23 +02:00

mailers

update factory girl

2012-09-12 13:24:23 +02:00

models

Merge branch 'update_devise'

2012-09-12 15:11:34 +02:00

presenters

update factory girl

2012-09-12 13:24:23 +02:00

shared_behaviors

freeze at a valid time, not 0000-01-01 ...

2012-04-15 13:03:33 +02:00

support

update factory girl

2012-09-12 13:24:23 +02:00

factories.rb

update factory girl

2012-09-12 13:24:23 +02: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

update factory girl

2012-09-12 13:24:23 +02:00

parallel_spec.opts

pull in parallel_testing to speed up rspec

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

spec_helper.rb

Get Spork running again

2012-06-14 00:53:10 -07:00

spec-doc.rb

This fixes issue #2298.

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