J. Bruni e257cfc56c Merge branch 'master' into pt_BR

2013-07-22 16:00:09 -03:00

..

assets

FIX: The previous flag reason was selected when opening the modal.

2013-07-22 12:05:13 -04:00

controllers

allow end user to recover a post they delete

2013-07-22 17:48:47 +10:00

helpers

Fix recommendations from #1145

2013-07-05 15:59:39 +04:00

mailers

Private messages have instructions for reply by email. We also strip X-Discourse headers

2013-06-25 11:35:26 -04:00

models

Merge pull request #1222 from ZogStriP/fix-s3-related-issues

2013-07-22 07:30:41 -07:00

serializers

allow end user to recover a post they delete

2013-07-22 17:48:47 +10:00

services

Refactor code that raises deprecating warnings in Rails 4

2013-07-08 18:35:11 +02:00

views

Merge branch 'master' into pt_BR

2013-07-22 16:00:09 -03:00