14347 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Julian Lam	a122aad54d	updating fallbacks	2017-02-07 20:54:03 +00: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
psychobunny	034f3f0268	Merge pull request #5417 from pichalite/cropper-options ... Add image options to cropper modal	2017-02-06 16:17:49 -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
barisusakli	959315c8f7	test admin/search	2017-02-06 13:43:51 +03:00
Misty (Bot)	f046ea012d	Latest translations and fallbacks	2017-02-06 09:21:40 +00:00
Misty (Bot)	b9ae02583e	Latest translations and fallbacks	2017-02-05 09:21:54 +00:00
Misty (Bot)	5ea5d11646	Latest translations and fallbacks	2017-02-04 09:21:31 +00:00
Peter Jaszkowiak	d43564dbbd	No need to build multiple times	2017-02-03 23:55:33 -07: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	d31499a860	Fix tests rewriting logo.png	2017-02-03 18:29:09 -07:00
Peter Jaszkowiak	44a59ac435	Fix tests to use default activated plugin	2017-02-03 16:37:03 -07:00
Julian Lam	9ceeff6f0a	Merge pull request #5414 from pichalite/fix-acp ... Fix ACP layout on tablets	2017-02-03 17:57:46 -05:00
pichalite	a3df9132f7	Fix styling	2017-02-03 22:19:19 +00:00
pichalite	a41acead44	Fix tabs	2017-02-03 22:16:04 +00:00
pichalite	6a073277ac	Fix ACP layout on tablets	2017-02-03 22:12:47 +00:00
pichalite	a808d1b4d9	Set aspect ratio to square and confine crop box to image	2017-02-03 17:43:51 +00:00
barisusakli	a15aaaf389	closes #5394 ... dont allow socket.emits during maintenance mode	2017-02-03 19:02:43 +03:00
Julian Lam	06bf631445	increased file watch interval to reduce high CPU usage when using grunt	2017-02-03 10:24:55 -05:00
barisusakli	76254942b2	closes #5190	2017-02-03 16:25:02 +03:00
Misty (Bot)	d4e4b4bfa2	Latest translations and fallbacks	2017-02-03 09:21:41 +00: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
Julian Lam	1012368acd	Merge pull request #5413 from NodeBB/nodebb-executable-refactor ... Refactor `nodebb`, move `build.js`, add `--dev`	2017-02-02 22:04:19 -05: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	700e2cf800	linting	2017-02-03 01:00:09 +00:00
pichalite	702561a6ab	Ability to crop profile images before uploading	2017-02-03 00:48:27 +00:00
pichalite	de28ff5d43	Ability to crop profile images before uploading	2017-02-03 00:47:09 +00:00
Julian Lam	70b20e3ff1	Up markdown	2017-02-02 15:19:05 -05:00
Misty (Bot)	a70051b30c	Incremented version number	2017-02-02 17:16:01 +00:00
Julian Lam	adb66c71b8	up markdown	2017-02-02 11:58:34 -05:00
Julian Lam	5de67f9607	excluding tx managed language files from grunt	2017-02-02 10:52:20 -05:00
Barış Soner Uşaklı	b08acd197c	up socket.io deps	2017-02-02 17:49:27 +02:00
barisusakli	5c217e873e	build all targets before test	2017-02-02 16:08:19 +03:00
barisusakli	ae7f9bac98	prevent crash if uri is malformed	2017-02-02 13:11:33 +03:00
Misty (Bot)	48b8b6cf95	Latest translations and fallbacks	2017-02-02 09:21:39 +00:00
Julian Lam	bc3f28e473	Merge pull request #5411 from NodeBB/language-dep-warn ... Better deprecation warning for old language route	2017-02-01 12:53:15 -05:00
Peter Jaszkowiak	bf44ca20f2	Better deprecation warning for old language route	2017-02-01 10:36:15 -07:00
Misty (Bot)	975f2a669d	Latest translations and fallbacks	2017-02-01 09:22:09 +00:00
barisusakli	51981ffb99	get extention from content type	2017-01-31 22:18:22 +03:00
Julian Lam	409b8d8ebc	Merge pull request #5409 from NodeBB/translator-no-catch ... Fix translator catching JS errors in callbacks	2017-01-31 14:10:56 -05:00
Peter Jaszkowiak	bb7a35b85c	Fix translator catching JS errors in callbacks	2017-01-31 12:04:31 -07:00
Julian Lam	ff301aeaf7	up vanilla	2017-01-31 12:12:13 -05:00
Misty (Bot)	988c71d9c9	Latest translations and fallbacks	2017-01-31 09:21:38 +00:00
Julian Lam	b230dbaff4	Merge pull request #5408 from NodeBB/language-404s ... Remove requests to nonexistent language files	2017-01-30 17:12:11 -05:00