Commit Graph

16 Commits

Author SHA1 Message Date
gaba 23c67b4a49 It fix the status change after merging master in. 2016-12-07 16:37:11 -10:00
gaba 15eb946f00 Trying to get the Dialog up. 2016-12-01 13:05:10 -08:00
gaba 27eb341fa8 Fix users and comments as a merge was weird before. 2016-11-29 10:56:44 -08:00
gaba 1ec7435ef4 Merge branch 'master' into ban-user 2016-11-28 11:41:31 -08:00
Wyatt Johnson b0f01cf00f Initial commit of asset queuing (#97)
* Initial commit of asset queuing

* Addresssing comments
2016-11-28 13:29:39 -05:00
gaba 822e13914a Fix changeStatus 2016-11-22 14:52:43 -08:00
gaba f7c4e8bf24 Merge branch 'master' into ban-user 2016-11-22 09:35:06 -08:00
gaba 0a8ab759b5 Move into setStatus and other actions when banned and unbanned. 2016-11-21 17:01:36 -08:00
gaba 8355f441e3 When banning without commentid. 2016-11-21 12:42:14 -08:00
gaba 3337e95a6c Move the change status of the user to a ban the user func. 2016-11-21 12:18:19 -08:00
David Jay 29bf5b9990 Adding author info to comments and author name display. 2016-11-18 14:22:21 -05:00
David Jay 7a6dfbcb4a Returning public user info. 2016-11-18 14:13:42 -05:00
gaba bc3f9bb0b4 Adds status to the user and tests on setStatus. 2016-11-16 12:44:34 -08:00
Wyatt Johnson c203bf16eb Improved tests and fixed them for new users model 2016-11-09 16:26:23 -07:00
Wyatt Johnson 4a9c1775f1 Updated linting rules + fixed test layout to standardize 2016-11-07 11:51:45 -07:00
David Jay 8e9ebfb1a9 Adding find functions and tests to user and action models. 2016-11-03 17:45:37 -07:00