Julian Lam 451c2838d0 Merge remote-tracking branch 'origin/master' into flagging-refactor

2016-12-13 09:37:19 -05:00

..

admin

removed user flag reset method and associated socket call from ACP

2016-12-05 15:52:01 -05:00

posts

flag updating and note appending, #5232

2016-12-01 11:42:06 -05:00

topics

closes #5273

2016-12-09 18:53:08 +03:00

user

closes #5219

2016-11-19 16:56:44 +03:00

admin.js

missing ;

2016-12-13 16:08:54 +03:00

blacklist.js

Fix space-before-function-paren linter rule

2016-10-13 11:43:39 +02:00

categories.js

socket.io/categories tests

2016-11-21 13:47:34 +03:00

flags.js

more work on #5232

2016-12-06 16:11:56 -05:00

groups.js

more tests

2016-12-02 14:05:59 +03:00

helpers.js

Fix space-before-function-paren linter rule

2016-10-13 11:43:39 +02:00

index.js

flag updating and note appending, #5232

2016-12-01 11:42:06 -05:00

meta.js

socket/meta test

2016-11-18 15:32:35 +03:00

modules.js

dont mark chat notifications read if you are not in the room

2016-11-25 20:50:45 +03:00

notifications.js

Fix space-before-function-paren linter rule

2016-10-13 11:43:39 +02:00

plugins.js

added some missing callbacks

2016-03-09 19:13:36 +02:00

posts.js

flag updating and note appending, #5232

2016-12-01 11:42:06 -05:00

topics.js

Fix space-before-function-paren linter rule

2016-10-13 11:43:39 +02:00

user.js

more tests

2016-12-02 17:05:46 +03:00