11415 Commits

Author	SHA1	Message	Date
Peter Jaszkowiak	879470f417	ESlint brace-style	2017-02-17 22:11:35 -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
pichalite	7f4e4c8e2e	Fix styling	2017-02-17 20:02:26 +00:00
pichalite	4d755bad0c	Use typeToExtension from file.js	2017-02-17 19:57:18 +00:00
pichalite	8dab8864f6	Add extensions for cropped images	2017-02-17 19:42:02 +00:00
barisusakli	aa64ec7db1	remove unnecessary code	2017-02-17 22:33:41 +03:00
Peter Jaszkowiak	9f15008247	Address review issues	2017-02-17 11:19:30 -07:00
Julian Lam	f7f5b2c8d9	Merge remote-tracking branch 'origin/master' into develop	2017-02-17 09:10:25 -05:00
Julian Lam	5ee2aa8adb	Merge pull request #5453 from NodeBB/patch_5369 ... Fix #5368	2017-02-17 08:48:57 -05:00
barisusakli	e009ce5609	closes #5443	2017-02-17 16:46:30 +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
Peter Jaszkowiak	3d56dc4857	Fix #5368	2017-02-16 13:33:28 -07:00
Julian Lam	8bf719b258	Merge pull request #5431 from NodeBB/ajaxify-cache-buster ... Ajaxify improvements, `/assets/uploads/` fixes, cache buster improvements	2017-02-15 13:49:47 -05:00
Julian Lam	fcaefbadca	Merge remote-tracking branch 'origin/master' into develop	2017-02-15 12:06:52 -05:00
Julian Lam	9e23d09e5e	removing outdated logic to call process.exit on reset completion as all invocations use callbacks now. Allowing invocation of reset -p and -t without nodebb-plugin- or nodebb-theme- prefix	2017-02-15 09:47:38 -05:00
Anil Mandepudi	c25836b5fc	Option to upload without cropping (#5447) ... * Option to upload without cropping * Fix styling * Fix styling * Add missing semi-colon * I fail at styling :fail:	2017-02-14 16:31:51 -05: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
psychobunny	0667870286	set an active state for pageview options	2017-02-13 15:50:12 -05:00
psychobunny	3d1425605a	prettification of pageview stats	2017-02-13 15:40:20 -05:00
psychobunny	5e35170805	ghfw :rage1:	2017-02-13 15:28:56 -05:00
psychobunny	ccfec622d4	Merge branch 'develop' of https://github.com/NodeBB/NodeBB into develop	2017-02-13 15:28:30 -05:00
psychobunny	9e354a09d1	prettier stats on dashboard	2017-02-13 15:28:26 -05:00
barisusakli	30f35c42f6	fix eslint	2017-02-13 22:42:47 +03:00
barisusakli	a3cbe5e090	#5436	2017-02-13 22:24:26 +03:00
barisusakli	21eefb9760	closes #5436	2017-02-12 20:36:12 +03:00
barisusakli	8b006fb1ab	closes #5434	2017-02-12 20:11:49 +03:00
Peter Jaszkowiak	b553236620	Better defaults if cache buster read fails	2017-02-10 21:18:09 -07:00
Julian Lam	eae541d040	Merge branch 'master' into develop	2017-02-10 16:22:12 -05:00
Julian Lam	21bc1fba3f	Merge pull request #5429 from BenLubar/redis-drops-socket-messages ... Fix forum instances using Redis dropping socket.io messages.	2017-02-10 16:21:38 -05:00
Julian Lam	6289f118ae	updated cron strings with 5-digit strings instead of 6-digit ones	2017-02-10 15:52:05 -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	6b2e40a8ce	promoting digest output to info, instead of verbose	2017-02-10 12:54:17 -05:00
barisusakli	f4a6527ce6	getRecentPosterUids test	2017-02-10 15:26:24 +03:00
Peter Jaszkowiak	8f27d7810b	Ajaxify improvement, /assets/uploads	2017-02-09 15:50:05 -07:00
Julian Lam	7ba111acdd	Merge pull request #5420 from NodeBB/assets-route ... /assets/uploads	2017-02-09 16:08:12 -05:00
Barış Soner Uşaklı	a3e327301b	update regex	2017-02-09 20:21:35 +02:00
barisusakli	b1511a1870	change client route	2017-02-09 21:15:50 +03:00
Julian Lam	a17c26ea45	Merge branch 'master' into develop	2017-02-09 12:53:07 -05:00
barisusakli	2c527cdfeb	more fixes	2017-02-09 14:38:06 +03:00
barisusakli	ae5deff3d5	fix uids	2017-02-09 14:36:00 +03:00
barisusakli	21861fa931	fix next	2017-02-09 14:31:29 +03:00
barisusakli	4f02775bdf	replies change	2017-02-09 14:30:02 +03:00
barisusakli	ab7867d4b5	topic follow tests, fix filterIgnoring	2017-02-09 13:15:43 +03:00
psychobunny	570efb9e4b	Merge branch 'develop' into threads-enhancement	2017-02-08 16:41:16 -05:00