882 Commits

Author	SHA1	Message	Date
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
Miloslav Voloskov	1cd3fe3c5c	Merge branch 'master' into master	2018-09-23 08:04:20 +03:00
Tarun Thakurani	d1427cb6c8	[#932] fixed Setting user with numeric password fails	2018-09-22 18:45:49 +05:30
Jim LAURIE	6c897555a0	Merge branch 'master' into improvement/pluralize-routes	2018-09-18 13:47:13 +02:00
Jason Lei	a3bdd9b3fb	Merge branch 'master' into graphql/mutations-aggregations-decimals	2018-09-15 19:53:48 +08:00
Jim LAURIE	4d8ace2db7	3.0.0-alpha.14.1.1	2018-09-13 18:39:37 +02:00
Jim LAURIE	67112e92cd	Merge branch 'master' into graphql/mutations-aggregations-decimals	2018-09-13 15:00:02 +02:00
Jim LAURIE	70507078d5	Merge branch 'master' into graphql/mutations-aggregations-decimals	2018-09-13 14:20:25 +02:00
Jim LAURIE	f10335d717	3.0.0-alpha.14.1	2018-09-12 12:41:11 +02:00
uyouthe	2f2ad51804	Font-family declarations fixed	2018-09-10 20:59:33 +03:00
Jim LAURIE	d2eb881ca8	Merge branch 'master' into master	2018-09-10 17:38:12 +02:00
Jason Lei	3378403954	GraphQL Mutations, Aggregations, Decimals ... Merging Mutations and Aggregations. Fixed Mongoose Hook to use Decimals (2 decimal places) and Floats (20 decimal places).	2018-09-10 16:05:00 +08:00
Jim LAURIE	34124bd6a3	Check user exist before user is blocked	2018-09-05 11:14:03 +02:00
Jim LAURIE	3a396972f0	Fix #1882	2018-09-03 14:19:51 +02:00
Jim LAURIE	19486ded6e	Merge branch 'master' into fixRegisterTemplate	2018-08-27 18:05:02 +02:00
DMehaffy	56de235297	Modify template for english	2018-08-27 08:11:23 -07:00
Jim LAURIE	cecef7385f	3.0.0-alpha.14	2018-08-27 16:30:16 +02:00
Jim LAURIE	cee9fe2811	Merge branch 'master' into email-validation	2018-08-23 18:46:48 +02:00
Jim LAURIE	7fdccc62ee	PR feedback	2018-08-23 18:28:13 +02:00
Aurélien GEORGET	e8b7bd478a	Update bootstrap.js	2018-08-23 12:00:46 +02:00
soupette	8003982b08	Fix conflicts	2018-08-22 14:17:09 +02:00
soupette	38c4fd6a47	Fix first part of PR feedback	2018-08-21 14:01:15 +02:00
Jim LAURIE	f27b2ae2f6	Merge branch 'master' into email-validation	2018-08-21 11:54:22 +02:00
Jim LAURIE	ed3f7d9018	Merge branch 'master' into fix-it-users-permissions	2018-08-21 11:40:31 +02:00
Jim LAURIE	e97fa20ba3	Merge branch 'master' into master	2018-08-21 11:25:22 +02:00
Jim LAURIE	ef97f72ff7	Merge branch 'master' into improvement/remember-me	2018-08-21 09:00:41 +02:00
soupette	f120413d26	Fixes 1741	2018-08-20 17:54:00 +02:00
Jim LAURIE	df49f3b8e8	Merge branch 'master' into fix/rgpd	2018-08-20 17:42:27 +02:00