972 Commits

Author	SHA1	Message	Date
ByoungYong Kim	a51b030e82	Made hold public base url and Auth controller utilize the value.	2018-10-09 13:03:59 +02:00
Jim LAURIE	bcb71242a8	Revert "Font-family declarations fixed"	2018-10-09 12:31:16 +02:00
ByoungYong Kim	1c7102381d	Using optional proxy config to generate url for and	2018-10-09 11:09:34 +02:00
takeshi_matsushita	930d0170f9	Add ja.json	2018-10-09 07:49:55 +09:00
ByoungYong Kim	94aa36bd20	Merge branch 'master' into fix/sso-not-working-in-the-wild	2018-10-08 18:39:12 +02:00
ByoungYong Kim	c6ee00003f	Revert "Fixed that protocol was hardcoded as 'http' and couldn't be configured regarding sso." ... This reverts commit 17d5e295b53953a97fb5636ba8f373d7ff60a4fe.	2018-10-08 18:37:24 +02:00
cyril lopez	5c391f49e4	Merge branch 'master' of github.com:strapi/strapi into improve/admin-auth	2018-10-08 17:50:13 +02:00
Jim LAURIE	4dd93f4b78	Merge branch 'master' into split-admin-dev	2018-10-08 17:44:35 +02:00
Jim LAURIE	87c3af3d1e	3.0.0-alpha.14.3	2018-10-08 17:14:19 +02:00
ByoungYong Kim	17d5e295b5	Fixed that protocol was hardcoded as 'http' and couldn't be configured regarding sso.	2018-10-08 13:18:34 +02:00
ByoungYong Kim	12cc6d6039	Added provider into user model as it seems to be required for SSO.	2018-10-08 13:16:28 +02:00
Jim LAURIE	dfee8052de	Merge branch 'master' into bug/minorChanges	2018-10-08 11:20:03 +02:00
Jim LAURIE	5684700a72	Merge branch 'master' into master	2018-10-07 17:00:42 +02:00
IdaszakDaniel	207676e123	PL missing translation keys	2018-10-05 21:40:27 +02:00
Benjamin Devaublanc	507ab8b922	Fix error on fetch permissions ... Can't fetch permissions if we have an api that contain a service with no controllers	2018-10-05 13:07:56 +02:00
Alberto Maturano	ac7aa86658	Fix conditional returning the same	2018-10-04 15:18:56 -05:00
segush11	2c72115088	Add missing translation keys in RU language	2018-10-05 00:48:05 +05:00
Jim LAURIE	9de6851aa3	Merge branch 'master' into fix-error-code	2018-10-04 17:27:21 +02:00
Jim LAURIE	807b511751	Merge branch 'master' into update/translation_fr	2018-10-04 14:59:05 +02:00
aDeve	c461629b3b	Fix #1622 ... Update Translation FR	2018-10-04 14:52:05 +02:00
Jim LAURIE	76aff17780	Merge branch 'master' into fix/1765	2018-10-03 20:29:41 +02:00
Jim LAURIE	468c5acd82	Merge branch 'master' into fix/2035	2018-10-03 19:44:25 +02:00
Jim LAURIE	b741507aec	Merge branch 'master' into master	2018-10-03 19:42:05 +02:00
Jim LAURIE	d0f3b90524	Merge branch 'master' into feature/spanishTranslation	2018-10-03 19:37:30 +02:00
sennahLessert	4daa7c643f	fix_Issue1620 - add some missing translation keys in DE language	2018-10-03 14:22:09 +02:00
Alberto Maturano	bb66b76087	Improve spanish translation ... fix #1621	2018-10-02 22:44:14 -05:00
Pedro Caseiro	403c5d0567	issue #1626: pt translations	2018-10-02 22:53:00 +01:00
Daan De Deckere	a805567c43	Add missing translation keys for NL language. Fixes #2035	2018-10-02 20:41:40 +02:00
Jim LAURIE	03b03deca3	Fix #1784 change error message incorrect code	2018-10-02 20:03:58 +02:00
cyril lopez	ad4919ff82	Merge branch 'master' of github.com:strapi/strapi into fix/1765	2018-10-01 14:31:57 +02:00
cyril lopez	d05f936ff5	Add plugin prefix to plugins routes. ... Fixes #1765	2018-10-01 14:29:11 +02:00
Özgür ERSOY	98ed66293a	update missing #2037	2018-09-30 12:21:06 +03:00
Jim LAURIE	e98589e130	Merge branch 'master' into master	2018-09-29 14:29:25 +02:00
Jim LAURIE	455077b786	Delete log	2018-09-28 19:43:03 +02:00
cyril lopez	3acec21d68	Add en trad	2018-09-28 12:53:14 +02:00
cyril lopez	d992fd7464	Fixes 1785	2018-09-28 12:52:27 +02:00
Özgür ERSOY	0994b05142	Update TR translations - 2 #1634	2018-09-27 22:53:39 +03:00
Jim LAURIE	1f56c823e9	Merge branch 'master' into order-translation-key	2018-09-27 18:39:22 +02:00
Jim LAURIE	29409f9531	Merge branch 'master' into master	2018-09-27 18:32:03 +02:00
Jim LAURIE	070f398044	Reorder translation keys	2018-09-26 15:15:48 +02:00
Jim LAURIE	46c9b0f966	3.0.0-alpha.14.2	2018-09-26 11:08:10 +02:00
cyril lopez	98d89475d4	Merge branch 'master' of github.com:strapi/strapi into split-admin-dev	2018-09-25 15:48:40 +02:00
cyril lopez	989b867714	Split admin entry point between dev and prod	2018-09-25 15:01:06 +02:00
Jim LAURIE	2aebb74424	Fix private key in User model	2018-09-25 14:42:15 +02:00
Jim LAURIE	1893a82bff	Merge branch 'master' into master	2018-09-25 11:08:40 +02:00
Jim LAURIE	86dea3279f	Merge branch 'master' into fixFilePermissions	2018-09-24 20:13:31 +02:00
Jim LAURIE	a09e88f567	Merge branch 'master' into graphql/mutations-aggregations-decimals	2018-09-24 19:42:57 +02:00
Alberto Maturano	154fc28a57	Normalize to standar file permissions ... As a result of taking a look on PR #1967 I realized there is 819 executable files in this repository. It is obvious this is an error.	2018-09-24 12:33:09 -05:00
cyril lopez	fd4fb0d529	Changes doc path by removing generatedFiles folders	2018-09-24 11:30:59 +02:00
Miloslav Voloskov	1cd3fe3c5c	Merge branch 'master' into master	2018-09-23 08:04:20 +03:00