198 Commits

Author	SHA1	Message	Date
Peter Jaszkowiak	23540afaeb	Resolve merge conflicts	2017-02-18 19:14:39 -07:00
Peter Jaszkowiak	93f38d4f30	ESlint no-multi-assign ... and max-nested-callbacks, no-mixed-requires, max-statements-per-line	2017-02-18 18:06:28 -07:00
Peter Jaszkowiak	4bb49a7171	ESlint no-unused-vars	2017-02-18 15:05:36 -07:00
Peter Jaszkowiak	c18808fdeb	ESlint no-useless-concat, no-mixed-spaces-and-tabs	2017-02-18 14:42:15 -07:00
Peter Jaszkowiak	fdf4f873bf	ESlint eqeqeq ... and require-jsdoc, no-negated-condition	2017-02-18 14:36:16 -07:00
Peter Jaszkowiak	09e868ce5f	ESlint no-useless-escape, no-else-return	2017-02-18 14:27:26 -07:00
Peter Jaszkowiak	896c8c7343	ESlint object-curly-spacing	2017-02-18 12:30:49 -07:00
barisusakli	7842c3411c	remove logs	2017-02-18 20:52:45 +03:00
barisusakli	b33d34f7cf	refactor user/picture.js	2017-02-18 20:27:58 +03: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	f3a8256f35	ESlint strict	2017-02-18 02:23:47 -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	2e031f3759	ESlint comma-spacing	2017-02-18 01:31:47 -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	d7526b5e44	ESlint array-bracket-spacing ... and object-property-newline	2017-02-18 00:04:34 -07:00
Peter Jaszkowiak	52f2028206	ESlint no-multiple-empty-lines	2017-02-17 22:08:23 -07:00
Peter Jaszkowiak	b09b3aef7f	ESlint no-undef, remove global comments	2017-02-17 22:03:55 -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
pichalite	aacd8a2422	Fix return and tests	2017-02-17 20:36:13 +00:00
barisusakli	4d8d23830d	utils tests	2017-02-14 15:47:36 +03:00
barisusakli	4bbf517af3	rewards test	2017-02-14 15:04:48 +03:00
barisusakli	9f67142786	closes #5440	2017-02-14 14:16:31 +03:00
barisusakli	f4a6527ce6	getRecentPosterUids test	2017-02-10 15:26:24 +03:00
Julian Lam	7ba111acdd	Merge pull request #5420 from NodeBB/assets-route ... /assets/uploads	2017-02-09 16:08:12 -05:00
barisusakli	667582744e	fix eslint	2017-02-09 13:22:03 +03:00
barisusakli	ab7867d4b5	topic follow tests, fix filterIgnoring	2017-02-09 13:15:43 +03: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
Peter Jaszkowiak	bb1bfb0449	Merge branch 'master' into assets-route	2017-02-06 15:52:54 -07:00
barisusakli	959315c8f7	test admin/search	2017-02-06 13:43:51 +03:00
Peter Jaszkowiak	fdad66f58e	Revert "Fix tests to use default activated plugin" ... This reverts commit 44a59ac435.	2017-02-03 23:48:43 -07:00
Peter Jaszkowiak	44a59ac435	Fix tests to use default activated plugin	2017-02-03 16:37:03 -07:00
barisusakli	e3a2e13438	build test	2017-02-03 11:39:31 +03:00
Peter Jaszkowiak	360a35d0a6	Resolve merge conflicts	2017-02-02 22:15:26 -07:00
Peter Jaszkowiak	553567c3b2	Refactor nodebb, move build.js, add --dev	2017-02-02 19:15:01 -07:00
Peter Jaszkowiak	001aa3d1a8	Fix tests, npm Windows fixes	2017-01-21 19:21:02 -07:00
Dominic Lennon	691b46d38b	Fixing lint issues	2017-01-16 14:43:34 +00:00
Dominic Lennon	f0add97cf9	Fixing tests	2017-01-16 14:37:14 +00:00
Peter Jaszkowiak	05b68391dd	Use /assets for client assets ... - Route `/assets` -> `build/public`, falling back on `public` - Moved destinations for `nodebb.min.js`, `acp.min.js`, `admin.css`, `stylesheet.css`, `templates`, and `sounds` to `build/public` - r.js modules previously routed through express are now symlinked into `public/build/src/modules` - minfiles no longer served from a memory cache - use config `views_dir` setting everywhere template directory is used - fix cache buster `v=v=`	2017-01-14 22:38:40 -07:00
barisusakli	6b2dde02b5	closes #5333	2017-01-03 15:08:16 +03:00
pichalite	a0ff3734cf	Add more user tests	2016-12-30 00:51:22 +00:00
pichalite	0ea477abde	Add more user tests	2016-12-29 23:16:23 +00: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