1245 Commits

Author	SHA1	Message	Date
Julian Lam	a4c00663ff	Revert "adding origin to new local ioConfig var, as per @barisusakli, re: #5472" ... This reverts commit c1b1ff5c6e.	2017-02-23 13:13:59 -05:00
Julian Lam	8154e29ad5	Merge branch 'master' into develop	2017-02-23 13:08:20 -05:00
Julian Lam	c1b1ff5c6e	adding origin to new local ioConfig var, as per @barisusakli, re: #5472	2017-02-23 12:47:06 -05:00
Julian Lam	672d7352bb	Merge branch 'master' into develop	2017-02-23 12:32:03 -05:00
Julian Lam	d4c2fc3bc8	closes #5472	2017-02-23 11:54:51 -05:00
barisusakli	0de21cb3ff	fix tab	2017-02-23 17:12:46 +03:00
barisusakli	09d0ce4778	post tests	2017-02-23 17:02:54 +03:00
barisusakli	2dac3d2292	closes #5465, blacklist tests	2017-02-22 14:53:44 +03:00
Julian Lam	e427f1663e	Merge pull request #5456 from NodeBB/sounds-refactor ... Sound system improvements	2017-02-21 16:14:58 -05:00
Julian Lam	62e0f5f883	Merge remote-tracking branch 'origin/master' into develop	2017-02-21 11:21:51 -05:00
barisusakli	799f688503	closes #5463 , invitation tests	2017-02-21 15:08:17 +03:00
barisusakli	aa64ec7db1	remove unnecessary code	2017-02-17 22:33:41 +03:00
Peter Jaszkowiak	c75391f9f5	Sound system improvements ... - Fix sound ACP uploads - Display soundpack names with sound files - Soundpacks can have sounds with identical names - Link sounds during build step - Generate map of sound name to file name during build step - Change how soundpacks work. It's now done via a field in plugin.json	2017-02-16 22:58:15 -07:00
Julian Lam	fcaefbadca	Merge remote-tracking branch 'origin/master' into develop	2017-02-15 12:06:52 -05:00
barisusakli	4bbf517af3	rewards test	2017-02-14 15:04:48 +03:00
Julian Lam	eae541d040	Merge branch 'master' into develop	2017-02-10 16:22:12 -05:00
Ben Lubar	9fb16e3520	Fix forum instances using Redis dropping socket.io messages. ... Bug introduced in b08acd197c. https://github.com/socketio/socket.io-redis/releases/tag/3.0.0 https://github.com/socketio/socket.io-redis/issues/185	2017-02-10 14:28:53 -06:00
Julian Lam	7f124a3ccf	Merge branch 'master' into develop	2017-02-10 12:55:11 -05:00
Julian Lam	7ba111acdd	Merge pull request #5420 from NodeBB/assets-route ... /assets/uploads	2017-02-09 16:08:12 -05:00
Peter Jaszkowiak	aaacdb8413	Fix #5416, uploads path config setting ... - Finish moving uploads route to `/assets/uploads` - Remove `upload_url` config setting, it was broken	2017-02-08 11:41:34 -07:00
Julian Lam	b5daedb7a3	Merge remote-tracking branch 'origin/master' into develop	2017-02-07 15:45:21 -05:00
psychobunny	dbc3113940	Merge pull request #5412 from pichalite/cropperjs ... Ability to crop profile images before uploading	2017-02-06 14:33:49 -05:00
barisusakli	a15aaaf389	closes #5394 ... dont allow socket.emits during maintenance mode	2017-02-03 19:02:43 +03:00
Peter Jaszkowiak	553567c3b2	Refactor nodebb, move build.js, add --dev	2017-02-02 19:15:01 -07:00
pichalite	de28ff5d43	Ability to crop profile images before uploading	2017-02-03 00:47:09 +00:00
barisusakli	366ab103a4	closes #5405	2017-01-27 20:38:01 +03:00
barisusakli	3fb7f9fce5	closes #5398	2017-01-26 22:18:16 +03:00
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