Neil Lalonde 67b262b93e Merge branch 'master' of github.com:discourse/discourse

2015-01-29 17:39:52 -05:00

..

assets

Merge branch 'master' of github.com:discourse/discourse

2015-01-29 17:39:52 -05:00

controllers

Merge branch 'master' of github.com:discourse/discourse

2015-01-29 17:39:52 -05:00

helpers

UX: Update 404 page category badge to use centralized helper and style

2015-01-28 14:56:38 -05:00

jobs

FEATURE: background job to make sure emoticons aren't too big

2015-01-29 18:36:35 +01:00

mailers

UX: Update 404 page category badge to use centralized helper and style

2015-01-28 14:56:38 -05:00

models

Allow code to save custom fields without saving the attached object

2015-01-29 17:17:52 -05:00

serializers

Merge branch 'master' of github.com:discourse/discourse

2015-01-29 17:39:52 -05:00

services

FIX: Respect user locale for reply notifications

2015-01-17 23:17:50 -08:00

views

UX: Update 404 page category badge to use centralized helper and style

2015-01-28 14:56:38 -05:00