Kane York 6be78861ca Merge branch 'master' into signup-cta ...

Conflicts:
	app/assets/javascripts/discourse/lib/key-value-store.js.es6

2015-09-15 12:26:25 -07:00

..

assets

Merge branch 'master' into signup-cta

2015-09-15 12:26:25 -07:00

controllers

For now, restrict whispering to staff only.

2015-09-15 12:29:32 -04:00

helpers

FIX: Strip lightbox metadata from embedding comments

2015-08-21 15:22:50 -04:00

jobs

always use fetch_stats to get AdminDashboardData data

2015-09-14 16:10:54 -04:00

mailers

Remove hard-coded fallback to English locale

2015-09-06 21:24:38 +02:00

models

FIX: categories' notification_level wasn't serialized when hitting /categories

2015-09-15 14:58:22 +02:00

serializers

Merge pull request #3749 from riking/patch-1

2015-09-11 12:22:58 -04:00

services

FIX: send new email activation token if the original token expired

2015-08-24 12:00:00 +05:30

views

FIX: show category links if category has sub-categories in nojs view

2015-09-13 01:02:00 +05:30