1274 Commits

Author	SHA1	Message	Date
Julian Lam	ddea9f534e	running eslint again	2017-02-24 12:47:46 -05:00
Julian Lam	72e77772db	Merge branch 'master' into develop	2017-02-24 12:46:40 -05:00
Julian Lam	e71bd7a27f	Merge branch 'master' into styleguide	2017-02-24 11:45:04 -05:00
barisusakli	3a87f2566a	more group tests	2017-02-24 15:05:00 +03:00
barisusakli	b7d5bc7dc8	more group tests	2017-02-24 12:54:16 +03:00
Peter Jaszkowiak	dd2b930824	Resolve merge conflicts, minify only .js files	2017-02-23 18:31:49 -07:00
Julian Lam	a9f144230e	Merge branch 'master' into develop	2017-02-23 13:57:46 -05:00
Julian Lam	25f6293821	using io.origins instead	2017-02-23 13:26:52 -05:00
Julian Lam	91d3ce1abc	Revert "adding origin to new local ioConfig var, as per @barisusakli, re: #5472" ... This reverts commit c1b1ff5c6e.	2017-02-23 13:26:52 -05:00
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
Peter Jaszkowiak	4bb49a7171	ESlint no-unused-vars	2017-02-18 15:05:36 -07:00
Peter Jaszkowiak	144fa8698c	Eslint no-lonely-if	2017-02-18 14:32:35 -07:00
Peter Jaszkowiak	57f89663aa	ESlint radix	2017-02-18 14:29:52 -07:00
Peter Jaszkowiak	09e868ce5f	ESlint no-useless-escape, no-else-return	2017-02-18 14:27:26 -07:00
Peter Jaszkowiak	11cb3a9554	ESlint operator-assignment, block-scoped-var	2017-02-18 14:20:58 -07:00
Peter Jaszkowiak	a0a50677da	ESlint n-loop-func, yoda	2017-02-18 14:00:29 -07:00
Peter Jaszkowiak	896c8c7343	ESlint object-curly-spacing	2017-02-18 12:30:49 -07:00
Peter Jaszkowiak	1493afee2a	ESlint indent	2017-02-18 02:38:03 -07:00
Peter Jaszkowiak	3b0dd2d1ef	ESlint padded-blocks	2017-02-18 02:32:24 -07:00
Peter Jaszkowiak	feb8405f95	ESlint eol-last	2017-02-18 02:30:48 -07:00
Peter Jaszkowiak	41896e1fc7	ESlint lines-around-directive	2017-02-18 02:28:54 -07:00
Peter Jaszkowiak	a038c66549	ESlint quotes	2017-02-18 01:56:23 -07:00
Peter Jaszkowiak	604358ecc4	ESlint keyword-spacing, no-multi-spaces	2017-02-18 01:52:56 -07:00
Peter Jaszkowiak	277a7fb8b4	ESlint key-spacing, no-trailing-spaces	2017-02-18 01:27:46 -07:00
Peter Jaszkowiak	34e233fe1d	ESlint spaced-comment	2017-02-18 01:25:46 -07:00
Peter Jaszkowiak	532951c24f	ESlint space-in-parens, block-spacing	2017-02-18 01:21:34 -07:00
Peter Jaszkowiak	3361a72725	ESlint no-plusplus ... and no-empty, space-unary-ops	2017-02-18 01:12:18 -07:00
Peter Jaszkowiak	52f2028206	ESlint no-multiple-empty-lines	2017-02-17 22:08:23 -07:00
Peter Jaszkowiak	2ba46808a1	ESlint one-var, fix comma-dangle	2017-02-17 20:20:42 -07:00
Peter Jaszkowiak	bc1d70c126	ESlint comma-dangle	2017-02-17 19:31:21 -07: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