Julian Lam
|
8eb47e1987
|
added back missing next(), @baris
|
2017-01-11 14:43:56 -05:00 |
|
barisusakli
|
0c8aa599a0
|
closes #5357
|
2017-01-11 14:40:52 +03:00 |
|
barisusakli
|
37bb6e9b6d
|
action:user.removeUploadedPicture
|
2017-01-11 13:59:27 +03:00 |
|
Julian Lam
|
3861b2dd80
|
Merge remote-tracking branch 'origin/master' into develop
|
2017-01-03 13:39:11 -05:00 |
|
pichalite
|
ab797b91a4
|
Let global mods change user avatar
|
2016-12-28 19:00:14 +00:00 |
|
Julian Lam
|
29c7ae7645
|
Merge remote-tracking branch 'origin/master' into develop
|
2016-12-22 09:21:32 -05:00 |
|
Barış Soner Uşaklı
|
c4d4d2385b
|
closes #3973 closes #5303
|
2016-12-22 01:48:41 +03:00 |
|
barisusakli
|
a1af59def3
|
add missing return, fix tests
|
2016-12-21 00:31:20 +03:00 |
|
Julian Lam
|
c640bdf2b9
|
Merge branch 'master' into develop
|
2016-12-20 13:29:44 -05:00 |
|
barisusakli
|
988c485874
|
post tools test
|
2016-12-20 16:03:01 +03:00 |
|
barisusakli
|
f8d958e065
|
rooms.getAll test
|
2016-12-20 13:53:32 +03:00 |
|
Julian Lam
|
76bcc1c327
|
Merge branch 'flagging-refactor' into develop
|
2016-12-19 13:00:31 -05:00 |
|
barisusakli
|
009da723c5
|
meta.configs tests
|
2016-12-16 15:55:34 +03:00 |
|
barisusakli
|
835669805a
|
tag tests
|
2016-12-15 17:26:54 +03:00 |
|
barisusakli
|
3bd1c6c2b5
|
notification tests
|
2016-12-15 16:08:32 +03:00 |
|
barisusakli
|
55b68197aa
|
closes #4544
|
2016-12-15 14:47:42 +03:00 |
|
Julian Lam
|
5e109bb4a8
|
Merge remote-tracking branch 'origin/master' into flagging-refactor
|
2016-12-14 14:45:25 -05:00 |
|
barisusakli
|
e17b37edb6
|
closes #5287
|
2016-12-14 21:58:20 +03:00 |
|
barisusakli
|
9e52d5ec04
|
new hook, action:user.delete
|
2016-12-14 16:49:09 +03:00 |
|
Julian Lam
|
831c2064a0
|
For #5232, added tests and returning flag data on socket flag creation
|
2016-12-13 12:11:51 -05:00 |
|
Julian Lam
|
451c2838d0
|
Merge remote-tracking branch 'origin/master' into flagging-refactor
|
2016-12-13 09:37:19 -05:00 |
|
barisusakli
|
fba28791f5
|
missing ;
|
2016-12-13 16:08:54 +03:00 |
|
barisusakli
|
c32e6aaabb
|
use build module instead of forking
|
2016-12-13 15:43:20 +03:00 |
|
Julian Lam
|
dc508fa0cb
|
Merge remote-tracking branch 'origin/master' into flagging-refactor
|
2016-12-09 14:54:01 -05:00 |
|
barisusakli
|
0b9829850c
|
closes #5273
|
2016-12-09 18:53:08 +03:00 |
|
Julian Lam
|
5d63c0aa3b
|
Merge remote-tracking branch 'origin/master' into flagging-refactor
|
2016-12-08 14:25:53 -05:00 |
|
psychobunny
|
6b7b51eaf0
|
Merge pull request #5170 from pitaj/master
ACP search updated to support translations
|
2016-12-06 17:45:19 -05:00 |
|
Julian Lam
|
9f9051026b
|
more work on #5232
|
2016-12-06 16:11:56 -05:00 |
|
Peter Jaszkowiak
|
9fd64549a3
|
Use async instead of Promises
|
2016-12-05 17:55:04 -07:00 |
|
Julian Lam
|
cd3002e812
|
removed user flag reset method and associated socket call from ACP
|
2016-12-05 15:52:01 -05:00 |
|
Julian Lam
|
b7217e8841
|
Merge remote-tracking branch 'origin/master' into flagging-refactor
|
2016-12-05 11:28:10 -05:00 |
|
barisusakli
|
7d47f4b067
|
tag tests
|
2016-12-05 15:09:13 +03:00 |
|
Julian Lam
|
753d4b0275
|
wrapped up basic functionality of list and detail for flags, filter support. #5232
|
2016-12-02 15:28:28 -05:00 |
|
Julian Lam
|
dde3d2b135
|
Merge remote-tracking branch 'origin/master' into flagging-refactor
|
2016-12-02 11:01:35 -05:00 |
|
barisusakli
|
69b766bbc8
|
more tests
|
2016-12-02 17:05:46 +03:00 |
|
barisusakli
|
1440139903
|
more tests
|
2016-12-02 16:10:07 +03:00 |
|
barisusakli
|
4b6e4f085d
|
more tests
group cover upload tests
registration approval queue tests
|
2016-12-02 14:05:59 +03:00 |
|
Julian Lam
|
c36fe3389e
|
Merge remote-tracking branch 'origin/master' into flagging-refactor
|
2016-12-01 17:06:02 -05:00 |
|
Julian Lam
|
f1d144f15e
|
history appending, finished up notes, #5232
|
2016-12-01 16:22:10 -05:00 |
|
Peter Jaszkowiak
|
5223bb5191
|
Merge branch 'master' of github.com:nodebb/nodebb
|
2016-12-01 13:40:07 -07:00 |
|
Julian Lam
|
d9d60c20bd
|
flag updating and note appending, #5232
|
2016-12-01 11:42:06 -05:00 |
|
barisusakli
|
7f90e31a38
|
more socket user tests
|
2016-12-01 18:59:24 +03:00 |
|
Julian Lam
|
c5b9c1e2a4
|
Merge remote-tracking branch 'origin/master' into flagging-refactor
|
2016-12-01 09:26:26 -05:00 |
|
barisusakli
|
9ba93d8be9
|
group search tests
|
2016-12-01 17:21:09 +03:00 |
|
Julian Lam
|
0bf82c0e47
|
Merge branch 'master' into flagging-refactor
|
2016-11-29 21:20:24 -05:00 |
|
Peter Jaszkowiak
|
77e58f31c5
|
Fixes, passes tests
|
2016-11-28 18:16:13 -07:00 |
|
Peter Jaszkowiak
|
a431dc0305
|
ACP search updated to support translations
|
2016-11-28 12:52:26 -07:00 |
|
barisusakli
|
49267d54b7
|
topics unread tests
|
2016-11-28 14:15:20 +03:00 |
|
Julian Lam
|
1aa70c57eb
|
WIP
|
2016-11-25 13:28:55 -05:00 |
|
barisusakli
|
aa69481a0c
|
dont mark chat notifications read if you are not in the room
|
2016-11-25 20:50:45 +03:00 |
|