Blake Erickson 1d0eccf710 Have activate user return json ...

- Change activate user from admin controller to return json
- Test that it returns json
- Remove unnessary test from log_out spec

This commit was created so that when you activate a user through the api
it returns a json response.

2014-12-08 11:16:57 -07:00

..

assets

add toolbar to pick emoji family, bump up number to 60

2014-12-08 16:45:24 +11:00

controllers

Have activate user return json

2014-12-08 11:16:57 -07:00

helpers

decrease size of cat color stripe in digests a bit

2014-11-29 03:58:44 -08:00

jobs

typo

2014-12-07 16:43:26 +11:00

mailers

FIX: if full user name is not provided, username should be present in email From header

2014-12-03 13:12:05 +05:30

models

FIX: remove links and html 'hellips' from topic/post summaries

2014-12-08 00:23:53 +01:00

serializers

Merge pull request #3009 from gdpelican/feature/new-private-message

2014-12-03 12:17:45 +01:00

services

FIX: roll up staff action wasn't working

2014-11-27 01:12:56 +01:00

views

Put Ember 1.8.1 + fixes back.

2014-12-04 08:51:35 -05:00