kikito 5903ebe857 merges master and fix conflicts

2015-09-12 19:54:15 +02:00

..

assets

Fixes add flags on mobile devices

2015-09-12 18:05:33 +02:00

controllers

merges master and fix conflicts

2015-09-12 19:54:15 +02:00

helpers

refactors method to keep consistency in sync

2015-09-12 14:29:26 +02:00

mailers

adds text_with_links helper and use that in any comment.body in views, adds test to check for malicious injections in comment body

2015-09-10 18:28:10 +02:00

models

merges master and fix conflicts

2015-09-12 19:54:15 +02:00

views

merges master and fix conflicts

2015-09-12 19:54:15 +02:00