17052 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
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
Barış Soner Uşaklı	5461f9fa5f	don't crash if there is no pluginData	2018-04-24 10:26:23 -04:00
Julian Lam	58ca093c28	closes #6408	2018-04-24 10:11:53 -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	1c09094011	show success alert + rebuild msg when ordering plugins	2018-04-23 17:18:31 -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
Misty (Bot)	bb3f98eb05	Latest translations and fallbacks	2018-04-21 09:26:25 +00: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
Julian Lam	322d8236d2	added test for User.blocks.is, re: #6463	2018-04-20 14:15:52 -04:00
Julian Lam	032ec8b443	tests!!! glorious tests!!! ... re: #6463	2018-04-20 14:12:15 -04:00
Julian Lam	a367b698e3	a bit more integration for #6463	2018-04-20 13:49:23 -04:00
Julian Lam	bfee23adee	basic methods and initial integration for #6463	2018-04-20 12:20:48 -04:00
Julian Lam	877b45ab00	adding old path to uploads as well, to ajaxify shirt-circuit	2018-04-20 10:35:54 -04:00
Misty (Bot)	03758a41c3	Latest translations and fallbacks	2018-04-20 09:26:33 +00:00
Julian Lam	bdbdf510e0	closes #6462	2018-04-19 14:24:01 -04:00
Misty (Bot)	2482696e35	Latest translations and fallbacks	2018-04-19 09:26:18 +00:00
Andrew Rodrigues	a3224cc4ba	added missing language key	2018-04-18 18:04:05 -04:00