8214 Commits

Author	SHA1	Message	Date
Julian Lam	a8fd1440d4	fixed incorrect language key in ip blacklist page	2017-02-09 14:42:21 -05: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
pichalite	cc160d77e7	Fix scrolling issues on mobile	2017-02-09 17:33:31 +00: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	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	daa63909f3	Merge remote-tracking branch 'origin/master' into develop	2017-02-08 10:29:06 -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	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	bb1bfb0449	Merge branch 'master' into assets-route	2017-02-06 15:52:54 -07: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
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
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
Julian Lam	bfd16d188e	Merge branch 'master' into develop	2017-02-03 10:04:49 -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
Peter Jaszkowiak	360a35d0a6	Resolve merge conflicts	2017-02-02 22:15:26 -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	6b9bafc6cd	adding missing flag strings	2017-02-02 11:53:37 -05:00
Misty (Bot)	48b8b6cf95	Latest translations and fallbacks	2017-02-02 09:21:39 +00:00
Misty (Bot)	975f2a669d	Latest translations and fallbacks	2017-02-01 09:22:09 +00:00
Peter Jaszkowiak	bb7a35b85c	Fix translator catching JS errors in callbacks	2017-01-31 12:04:31 -07:00
Julian Lam	cae2bf346f	Merge branch 'master' into develop	2017-01-31 11:48:01 -05:00
Misty (Bot)	988c71d9c9	Latest translations and fallbacks	2017-01-31 09:21:38 +00:00
Peter Jaszkowiak	c14a31644b	Merge branch 'master' into 'develop'	2017-01-30 15:41:14 -07:00
Peter Jaszkowiak	bc9fa0a990	Remove requests to nonexistent language files	2017-01-30 15:08:03 -07:00
Misty (Bot)	b222dd653f	Latest translations and fallbacks	2017-01-30 09:23:52 +00:00
Misty (Bot)	da295bb5e6	Latest translations and fallbacks	2017-01-29 09:21:51 +00:00
Misty (Bot)	3ddfa7715f	Latest translations and fallbacks	2017-01-28 09:50:47 +00:00
barisusakli	f1f00b63fb	closes #5400	2017-01-27 20:38:00 +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	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
Misty (Bot)	c81c756e57	Latest translations and fallbacks	2017-01-27 09:22:33 +00:00
psychobunny	9d069d76db	random \t's in language string	2017-01-26 14:17:04 -05:00