7989 Commits

Author	SHA1	Message	Date
barisusakli	799f688503	closes #5463 , invitation tests	2017-02-21 15:08:17 +03:00
barisusakli	ef90702049	closes #5459	2017-02-20 21:28:02 +03:00
Barış Soner Uşaklı	1b43faba1a	closes #5441	2017-02-19 02:44:38 +03:00
barisusakli	b33d34f7cf	refactor user/picture.js	2017-02-18 20:27:58 +03:00
Barış Soner Uşaklı	23ed1af282	Merge pull request #5457 from pichalite/image-extension ... Add extensions for cropped images	2017-02-18 15:06:45 +02: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
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	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	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
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	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	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	ab7867d4b5	topic follow tests, fix filterIgnoring	2017-02-09 13:15:43 +03:00
Peter Jaszkowiak	0fffde67b5	Undeprecate /uploads	2017-02-08 14:24:09 -07: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	ce2bda0648	utilising async series if OS reports that system only contains one CPU processor	2017-02-08 10:42:55 -05:00
Peter Jaszkowiak	b530701cff	Fix tabs 😡	2017-02-06 15:54:21 -07:00
Peter Jaszkowiak	bb1bfb0449	Merge branch 'master' into assets-route	2017-02-06 15:52:54 -07:00
psychobunny	df1a1811f2	add horizontal rule on top of image crop tools	2017-02-06 16:18:36 -05:00
pichalite	2c5f8ed8e6	Add image options to cropper modal	2017-02-06 21:00:21 +00: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
pichalite	b757f563df	Move tpl and less to core	2017-02-06 19:11:58 +00:00
Peter Jaszkowiak	d31499a860	Fix tests rewriting logo.png	2017-02-03 18:29:09 -07:00
pichalite	6a073277ac	Fix ACP layout on tablets	2017-02-03 22:12:47 +00:00
barisusakli	a15aaaf389	closes #5394 ... dont allow socket.emits during maintenance mode	2017-02-03 19:02:43 +03: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	5aa3e6b95b	Merge branch 'master' into nodebb-executable-refactor	2017-02-02 19:19:02 -07: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	ae7f9bac98	prevent crash if uri is malformed	2017-02-02 13:11:33 +03:00