Jonne Haß fd069af2c6 Merge branch 'activity_more' of git://github.com/movilla/diaspora into movilla-activity_more ... Conflicts: Changelog.md		2013-04-13 12:53:31 +02:00
..
controllers	Always redirect user to downcase version of tags on UTF-8 encoding	2013-04-10 00:08:58 -03:00
fixtures	replace the monstrous link regex with a slightly less complicated one,	2012-10-11 23:39:44 +02:00
helpers	Fix show more post in my activity mobile page. Close #4108	2013-04-08 00:04:42 +02:00
integration	Bye Resque. Ohai Sidekiq.	2013-03-21 23:39:07 +01:00
javascripts	Merge pull request #4096 from RoonyH/3897-submit_a_comment_by_shift+enter	2013-04-13 03:49:40 -07:00
lib	Bye Resque. Ohai Sidekiq.	2013-03-21 23:39:07 +01:00
mailers	New configuration system	2012-09-26 20:19:37 +02:00
models	Merge pull request #3993 from MrZYX/sidekiq	2013-04-03 15:19:15 -07: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	Bye Resque. Ohai Sidekiq.	2013-03-21 23:39:07 +01:00
workers	Bye Resque. Ohai Sidekiq.	2013-03-21 23:39:07 +01: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	Bye Resque. Ohai Sidekiq.	2013-03-21 23:39:07 +01:00