Jonne Haß b8128d356b Merge branch 'hotfix/0.0.2.4' into develop ... Conflicts: Changelog.md app/views/people/show.html.haml config/defaults.yml spec/helpers/layout_helper_spec.rb		2013-02-01 22:24:37 +01:00
..
controllers	Merge branch 'hotfix/0.0.2.4' into develop	2013-02-01 22:24:37 +01:00
fixtures	replace the monstrous link regex with a slightly less complicated one,	2012-10-11 23:39:44 +02:00
helpers	Merge branch 'hotfix/0.0.2.4' into develop	2013-02-01 22:24:37 +01:00
integration	update factory girl	2012-09-12 13:24:23 +02:00
javascripts	Merge branch 'hotfix/0.0.2.4' into develop	2013-02-01 22:24:37 +01:00
lib	update spec to match overriden translation	2013-01-31 19:25:30 +01:00
mailers	New configuration system	2012-09-26 20:19:37 +02:00
models	Do not strip "markdown" in links when posting to services, fix #3765	2012-11-26 14:16:43 +01:00
presenters	bootstrap my_aspects data	2013-01-16 19:33:20 -02:00
shared_behaviors	remove unnecesary stuff from specs	2012-11-21 18:26:17 -02:00
support	remove unused methods	2012-11-21 18:26:17 -02:00
factories.rb	query the set url only through #pod_uri in the app	2012-09-26 20:19:37 +02:00
helper_methods.rb	add specs for chromeframe	2012-09-30 17:04:50 +01:00
locale_spec.rb	fix french javascript pluralization rule and add specs for locale loading	2012-10-09 22:36:30 +02:00
misc_spec.rb	update factory girl	2012-09-12 13:24:23 +02:00
spec-doc.rb	This fixes issue #2298.	2011-11-02 23:51:12 -04:00
spec_helper.rb	New configuration system	2012-09-26 20:19:37 +02:00