Commit Graph

17122 Commits

Author SHA1 Message Date
Misty (Bot)
65eb47a2a7 Latest translations and fallbacks 2018-05-06 09:27:13 +00:00
Misty (Bot)
2b59a4c799 Latest translations and fallbacks 2018-05-05 09:26:39 +00:00
Julian Lam
8e275df803 closes #6487 2018-05-04 12:39:00 -04:00
Barış Soner Uşaklı
96d2980472 fix updrade error if file is not found closes #6485 2018-05-03 16:06:56 -04:00
Julian Lam
4b25414c0b one more check 2018-05-03 12:13:42 -04:00
Julian Lam
9751c4b8db reworked logic in user.blocks.filter 2018-05-03 12:06:01 -04:00
Julian Lam
341a8d5046 guard against crashes if set is null or not passed in 2018-05-03 11:45:22 -04:00
Misty (Bot)
6dbe0b68e1 Incremented version number - v1.9.0 2018-05-02 19:26:22 +00:00
Julian Lam
44f8e6d3bb Revert "closes #6483"
This reverts commit 5d198491d5.
2018-05-02 14:03:47 -04:00
Julian Lam
445b92ae38 Revert "fix some tests"
This reverts commit 2551df80f7.
2018-05-02 14:03:39 -04:00
Barış Soner Uşaklı
cdc3ef09e9 closes #6481 2018-05-02 13:49:08 -04:00
Barış Soner Uşaklı
1f8b000530 log and show last restart on ACP dashboard 2018-05-02 13:38:36 -04:00
Julian Lam
2551df80f7 fix some tests 2018-05-02 13:37:58 -04:00
Julian Lam
5d198491d5 closes #6483 2018-05-02 13:13:15 -04:00
Julian Lam
99f1a5380e closes #6483 2018-05-02 13:02:18 -04:00
Barış Soner Uşaklı
9132743870 #6481 2018-05-02 12:43:13 -04:00
Misty (Bot)
d42ffdae77 Latest translations and fallbacks 2018-05-02 09:25:39 +00:00
Julian Lam
c9d8fc3f58 one more minor fix to req.flash err 2018-05-01 15:25:11 -04:00
Julian Lam
4533a311e1 possible fix to req.flash err crash 2018-05-01 15:21:15 -04:00
Julian Lam
e7300fb0e6 closes #6437 2018-05-01 14:58:34 -04:00
Julian Lam
3b9f246b38 updated right to erasure description 2018-05-01 14:57:56 -04:00
Misty (Bot)
d2cfef677a Latest translations and fallbacks 2018-05-01 09:25:08 +00:00
Julian Lam
43ffe3f9b5 updated text and fallbacks for #6479 2018-04-30 13:01:05 -04:00
Julian Lam
083ff9f637 bump themes, closes #6479 2018-04-30 12:51:10 -04:00
Julian Lam
178d4b2f92 don't allow room owner to kick themselves out 2018-04-30 12:49:42 -04:00
Julian Lam
5dc25a3c00 Merge remote-tracking branch 'origin/master' into chat-kick-support 2018-04-30 12:43:49 -04:00
Julian Lam
a08572b800 kick support for chats, #6479 2018-04-30 12:35:17 -04:00
Misty (Bot)
054755d3d4 Latest translations and fallbacks 2018-04-30 09:25:50 +00:00
Barış Soner Uşaklı
8ed86aaf13 closes #6476 2018-04-29 19:32:39 -04:00
Misty (Bot)
f6fdf27b14 Latest translations and fallbacks 2018-04-29 09:25:12 +00:00
Barış Soner Uşaklı
beadcd7857 fix tests, remove dupe exposeUid 2018-04-28 10:25:17 -04:00
Misty (Bot)
1e63d32e78 Latest translations and fallbacks 2018-04-28 09:25:00 +00:00
Julian Lam
30cdeb6f32 closes #6463 2018-04-27 16:03:40 -04:00
Julian Lam
dc386b5b23 Merge branch 'master' into user-blocking 2018-04-27 15:58:04 -04:00
Julian Lam
a0643b63df uncommenting tests again 2018-04-27 15:55:36 -04:00
Julian Lam
21b621e91b bumping theme versions for develop merge 2018-04-27 15:40:12 -04:00
Julian Lam
53296c46e5 Merge remote-tracking branch 'origin/master' into develop 2018-04-27 15:37:58 -04:00
Julian Lam
4bac78a568 wrapping up basic blocking UCP for #6463 2018-04-27 15:37:00 -04:00
Julian Lam
8db98b5cf4 additional UCP integration for #6463 2018-04-27 12:51:04 -04:00
Julian Lam
fdc30537cb Merge remote-tracking branch 'origin/master' into user-blocking 2018-04-27 10:55:50 -04:00
Barış Soner Uşaklı
7c43c7e0f9 closes #6473 2018-04-26 14:38:36 -04:00
Barış Soner Uşaklı
bc18b489e6 fix group test 2018-04-26 12:42:19 -04:00
Barış Soner Uşaklı
9ae5946e7a Merge remote-tracking branch 'refs/remotes/origin/master' into develop 2018-04-26 12:17:51 -04:00
Barış Soner Uşaklı
7e00d6b91e https://github.com/NodeBB/NodeBB/issues/6433 2018-04-26 12:16:22 -04:00
Barış Soner Uşaklı
896b8553f7 up composer 2018-04-26 12:01:51 -04:00
Julian Lam
3951bb9532 Merge remote-tracking branch 'origin/master' into user-blocking 2018-04-26 09:59:37 -04:00
Barış Soner Uşaklı
505e511e4d fix tests 2018-04-25 13:21:39 -04:00
Barış Soner Uşaklı
adf9d8eb83 closes #6469 2018-04-25 12:45:25 -04:00
Barış Soner Uşaklı
14914b7610 handle missing config.json 2018-04-24 13:26:08 -04:00
Julian Lam
7089e5c6a6 Merge remote-tracking branch 'origin/master' into develop 2018-04-24 11:55:17 -04:00