Riley Davis 9d1d109ec0 Merge branch 'master' ...

Conflicts:
	client/coral-admin/src/reducers/index.js

2016-12-22 12:28:55 -07:00

..

assets

Removing Next and Prev from pager and updating tests.

2016-12-21 12:11:42 -08:00

auth

Added asset settings + improved tests for routes

2016-11-28 17:13:11 -07:00

comments

Merge branch 'master'

2016-12-22 12:28:55 -07:00

queue

Add payload filtering and status_history updates

2016-12-08 15:56:52 -05:00

settings

Added status changing + history

2016-12-05 11:28:27 -05:00

stream

Add payload filtering and status_history updates

2016-12-08 15:56:52 -05:00

user

Moving action metadata to nested object.

2016-12-19 20:10:42 -05:00