11415 Commits

Author	SHA1	Message	Date
psychobunny	575a3c7b9d	no need for a call to count replies	2017-02-08 16:39:44 -05:00
Peter Jaszkowiak	0fffde67b5	Undeprecate /uploads	2017-02-08 14:24:09 -07:00
psychobunny	83cd960ffa	improved threaded view design	2017-02-08 14:46:39 -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	87e02b264c	Merge branch 'master' into develop	2017-02-08 11:23:44 -05: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
barisusakli	387110fecc	closes #5315	2017-02-08 18:23:34 +03:00
Julian Lam	8a0a74d95e	Merge remote-tracking branch 'origin/master' into develop	2017-02-07 16:03:54 -05:00
Julian Lam	b5daedb7a3	Merge remote-tracking branch 'origin/master' into develop	2017-02-07 15:45:21 -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
Julian Lam	bfd16d188e	Merge branch 'master' into develop	2017-02-03 10:04:49 -05: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
Peter Jaszkowiak	bf44ca20f2	Better deprecation warning for old language route	2017-02-01 10:36:15 -07:00
barisusakli	51981ffb99	get extention from content type	2017-01-31 22:18:22 +03:00
barisusakli	b37d52c089	closes #5407	2017-01-31 18:38:06 +03:00
Peter Jaszkowiak	c14a31644b	Merge branch 'master' into 'develop'	2017-01-30 15:41:14 -07:00
Peter Jaszkowiak	54ac23cc7a	Revert "No 404 responses for missing language files" ... This reverts commit f0c941e5ae.	2017-01-30 15:22:20 -07:00
Stephan	0c6679ca9c	Update dashboard.js	2017-01-30 17:45:48 +01:00
Julian Lam	debffe385f	closes #5316	2017-01-27 16:29:42 -05:00
barisusakli	366ab103a4	closes #5405	2017-01-27 20:38:01 +03:00
Julian Lam	3ab631c82e	Merge pull request #5391 from Pappmann/patch-4 ... added missing translation in dashboard	2017-01-27 11:32:02 -05:00
Julian Lam	7c7517d72b	Merge pull request #5392 from Pappmann/patch-5 ... fixed missing translation string	2017-01-27 11:31:46 -05:00
Julian Lam	7414482753	Merge branch 'master' into develop	2017-01-27 11:27:21 -05:00
Julian Lam	05c724de30	added new hook for messaging teaser retrieval, and casting input as String before execuring stripTags templates helper	2017-01-27 11:26:08 -05:00
psychobunny	e2b30d6329	improve regex for unwanted whitespace in cover:url	2017-01-26 18:04:51 -05:00
barisusakli	3fb7f9fce5	closes #5398	2017-01-26 22:18:16 +03:00
barisusakli	a143a15f5d	closes #5397	2017-01-26 20:44:26 +03:00
Julian Lam	4df8832c8d	adding conditional to upgrade script to handle cases where an upgrade is performed on a flag that is already in database	2017-01-25 11:02:46 -05:00
Peter Jaszkowiak	f4147f7922	Generate cache buster on build	2017-01-24 20:24:28 -07:00
barisusakli	2a33991f0d	read usercount from global object	2017-01-25 01:32:29 +03:00
Julian Lam	ae279fe57f	casting some values as int, in ensureSelfOrPrivileged middleware	2017-01-24 12:33:27 -05:00
Peter Jaszkowiak	f0c941e5ae	No 404 responses for missing language files	2017-01-23 17:09:32 -07:00
Julian Lam	dbb71423a8	executing core middlewares first before secondary or plugin middlewares	2017-01-23 15:17:53 -05:00
Julian Lam	ea7d61e2e4	handling err in src/meta/languages.js	2017-01-23 11:40:51 -05:00
Julian Lam	372138c789	Revert "fixing bug that caused plugin language files to not be parsed" ... This reverts commit b2bb1a7c24.	2017-01-23 11:27:35 -05:00
Julian Lam	b2bb1a7c24	fixing bug that caused plugin language files to not be parsed	2017-01-23 11:25:19 -05:00
Julian Lam	a7aaf8ea96	fixing bug that caused plugin language files to not be parsed	2017-01-23 11:25:05 -05:00