16569 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
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
Julian Lam	a8fd1440d4	fixed incorrect language key in ip blacklist page	2017-02-09 14:42:21 -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
Julian Lam	d61665c20a	updated copy for no-routes-not-found	2017-02-09 12:52:25 -05:00
Barış Soner Uşaklı	4f5b9f3a42	Merge pull request #5425 from pichalite/issue-5415 ... Fix scrolling issues on mobile	2017-02-09 19:51:41 +02:00
pichalite	cc160d77e7	Fix scrolling issues on mobile	2017-02-09 17:33:31 +00:00
barisusakli	b9244110d9	up dbsearch	2017-02-09 17:29:28 +03: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	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
Misty (Bot)	0409109faa	Latest translations and fallbacks	2017-02-09 09:21:45 +00:00
psychobunny	570efb9e4b	Merge branch 'develop' into threads-enhancement	2017-02-08 16:41:16 -05:00
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	a48c914a16	explicitly cast jobsDisabled as Boolean	2017-02-08 11:23:27 -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
Julian Lam	daa63909f3	Merge remote-tracking branch 'origin/master' into develop	2017-02-08 10:29:06 -05:00
Julian Lam	d5a45832c3	up composer	2017-02-08 10:26:05 -05:00
barisusakli	387110fecc	closes #5315	2017-02-08 18:23:34 +03:00
Misty (Bot)	d966b52dc7	Latest translations and fallbacks	2017-02-08 09:21:49 +00:00
Julian Lam	23d92c214d	up persona, vanilla, and markdown	2017-02-07 16:28:25 -05:00
Julian Lam	8a0a74d95e	Merge remote-tracking branch 'origin/master' into develop	2017-02-07 16:03:54 -05:00
Julian Lam	107abe3197	Merge pull request #5382 from pitaj/assets-route ... Move client-side assets to the `/assets` route	2017-02-07 16:02:56 -05:00
Julian Lam	a122aad54d	updating fallbacks	2017-02-07 20:54:03 +00: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
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