Commit Graph

9469 Commits

Author SHA1 Message Date
Barış Soner Uşaklı
cefab04a63 use different event names for each call of getTotalGuestCount 2018-05-15 15:27:44 -04:00
Julian Lam
943d33ed09 closes #6502, also fixed issue with type: 'literal' in config.json 2018-05-15 15:26:06 -04:00
Julian Lam
9b592c2ed1 prettify last restart date in acp just a bit 2018-05-14 14:13:46 -04:00
Julian Lam
896a5325a5 added gdpr check socket method 2018-05-11 12:18:51 -04:00
Julian Lam
71c8a78748 updated properties to match other similar calls
re: #6501
2018-05-11 10:26:53 -04:00
Julian Lam
5eeec6f470 closes #6501 2018-05-11 10:25:12 -04:00
Barış Soner Uşaklı
3b5d6951bb closes #6499 2018-05-10 16:31:16 -04:00
Julian Lam
d648e55493 closes #6494 2018-05-09 13:09:33 -04:00
Julian Lam
d1fd07f42f remove console.log, #6486 2018-05-08 16:19:33 -04:00
Julian Lam
18bde866ff Append file name to the JSON payload returned
... during file upload process... closes #6486
2018-05-08 16:18:28 -04:00
Barış Soner Uşaklı
cc3569bf51 closes #6491 2018-05-08 13:33:30 -04:00
Julian Lam
f2d3111114 disable strict checking of object schema in post upload CSV generation, #6490 2018-05-08 10:01:39 -04:00
Barış Soner Uşaklı
4ee2284066 closes #6489 2018-05-07 12:23:08 -04: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
Julian Lam
44f8e6d3bb Revert "closes #6483"
This reverts commit 5d198491d5.
2018-05-02 14:03:47 -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
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
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
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
Barış Soner Uşaklı
beadcd7857 fix tests, remove dupe exposeUid 2018-04-28 10:25:17 -04:00
Julian Lam
dc386b5b23 Merge branch 'master' into user-blocking 2018-04-27 15:58:04 -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ı
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
Julian Lam
3951bb9532 Merge remote-tracking branch 'origin/master' into user-blocking 2018-04-26 09:59:37 -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
Barış Soner Uşaklı
5461f9fa5f don't crash if there is no pluginData 2018-04-24 10:26:23 -04:00
Julian Lam
f0f30041f5 re: #6408 2018-04-24 10:11:53 -04:00
Andrew Rodrigues
73bc96528a better to use theme_templates_path instead 2018-04-23 17:21:49 -04:00
Andrew Rodrigues
ebd0899714 closes #6471 2018-04-23 17:11:35 -04:00
Julian Lam
9eac794e8e normalising behaviour for subfolder installs, #6410 2018-04-23 16:05:37 -04:00
Barış Soner Uşaklı
6659a520e0 closes #6465 2018-04-22 09:10:02 -04:00
Julian Lam
ca932d30d2 basic UCP integration #6463 2018-04-20 15:04:42 -04:00
Julian Lam
4f6cc20457 completed basic integration for #6463 2018-04-20 14:48:10 -04:00