323 Commits

Author	SHA1	Message	Date
invader	7659bdb697	admin: update Russian translations in users and permissions plugin	2019-01-11 02:26:44 +03:00
Jim LAURIE	2b3af8300c	Add migration of jwt.json file	2019-01-06 14:00:04 +01:00
Jim LAURIE	f2ec28907e	Merge branch 'master' into master	2018-11-29 11:45:42 +01:00
Jim LAURIE	7e00be7057	Merge branch 'master' into master	2018-11-22 12:57:16 +01:00
Jim LAURIE	ef0f40701f	Merge branch 'master' into fix/css-container-fluid	2018-11-21 11:56:19 +01:00
Jesús Pérez	e03fd96e1a	Add missing Twitter provider redirect URI configuration	2018-11-20 16:55:20 +01:00
Alberto Maturano	8fcbb1978f	refactor: Fix misuse of map method ... `map` should create a new Array so a `return` is expected inside the callback param. `forEach` is the corrent method to use for just iterate over array elements.	2018-11-15 15:51:23 -06:00
Dimitri Nicolas	e18bf9198b	Change containerFluid child margin for better grid alignement	2018-11-13 17:21:31 +01:00
Jim LAURIE	66a1e0c291	Merge branch 'master' into feature/2108_handle_redirect_after_password_reset	2018-11-08 11:28:44 +01:00
aDeve	0674002553	code review : syntax	2018-11-07 19:29:37 +01:00
aDeve	d07edb0c5b	fix error : add _.get to prevent it	2018-11-05 13:34:45 +01:00
dimitrinicolas	f168da8acc	Fix responsive admin headers	2018-11-04 12:47:55 +01:00
dimitrinicolas	3d4d4c0525	Update FR translations	2018-11-04 12:28:04 +01:00
Leo	03803780bf	Fix a missing translation	2018-11-03 16:56:21 +08:00
Leo	b160fdf79e	Translations final fix	2018-11-03 15:03:31 +08:00
Leo	6dc594217c	Translations for ZH completed	2018-11-03 14:30:22 +08:00
aDeve	429973f814	code review : remove longline, and invers logic condition	2018-11-02 11:47:04 +01:00
aDeve	f39e917ab1	fix #2108 : handle redirect after reset password	2018-10-31 17:36:00 +01:00
Jim LAURIE	32b7db465d	Merge branch 'master' into japanese_localization	2018-10-25 13:54:50 +02:00
Jim LAURIE	bcb71242a8	Revert "Font-family declarations fixed"	2018-10-09 12:31:16 +02:00
takeshi_matsushita	930d0170f9	Add ja.json	2018-10-09 07:49:55 +09:00
Jim LAURIE	dfee8052de	Merge branch 'master' into bug/minorChanges	2018-10-08 11:20:03 +02:00
IdaszakDaniel	207676e123	PL missing translation keys	2018-10-05 21:40:27 +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
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
uyouthe	2f2ad51804	Font-family declarations fixed	2018-09-10 20:59:33 +03:00