304 Commits

Author	SHA1	Message	Date
Jim LAURIE	32b7db465d	Merge branch 'master' into japanese_localization	2018-10-25 13:54:50 +02:00
Jim LAURIE	404afec5de	Prefix providers	2018-10-19 09:26:09 +02:00
takeshi_matsushita	930d0170f9	Add ja.json	2018-10-09 07:49:55 +09: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
Daniel Król	d2beb2732d	Merge branch 'master' into translate/pl-email-and-settings-manager	2018-10-07 19:12:43 +02:00
Daniel Król	540d5571ab	Add missing translations for 2 plugins	2018-10-07 19:03:05 +02:00
IdaszakDaniel	207676e123	PL missing translation keys	2018-10-05 21:40:27 +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	989b867714	Split admin entry point between dev and prod	2018-09-25 15:01:06 +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
cyril lopez	d5aa66a5ff	Change path for overrides files	2018-09-21 16:08:09 +02:00
Aurelsicoko	25e8ef587a	Add documentation email and upload	2018-09-20 16:52:51 +02:00
Aurelsicoko	140e32bbe4	Merge branch 'add-description-to-plugins-routes' of github.com:strapi/strapi into add-description-to-plugins-routes	2018-09-20 11:42:25 +02:00
Aurelsicoko	9da6da036b	Add example POST upload	2018-09-20 11:40:37 +02:00
cyril lopez	59961edf44	Merge branch 'master' of github.com:strapi/strapi into add-description-to-plugins-routes	2018-09-19 17:36:59 +02:00
cyril lopez	bc49c3842c	Change gitignore	2018-09-19 17:36:43 +02:00
cyril lopez	f002a0d144	Add override documentation to upload and users-permissions	2018-09-18 20:39:31 +02:00
Jim LAURIE	84d9070de0	Fix #1858 send email service	2018-09-18 13:20:55 +02:00
soupette	7906e43129	Fix conflicts	2018-09-14 13:48:43 +02:00
Jim LAURIE	4d8ace2db7	3.0.0-alpha.14.1.1	2018-09-13 18:39:37 +02:00
Jim LAURIE	f10335d717	3.0.0-alpha.14.1	2018-09-12 12:41:11 +02:00
soupette	9daf8c4403	Add descriptions to email routes	2018-09-06 10:11:38 +02:00
Jim LAURIE	cecef7385f	3.0.0-alpha.14	2018-08-27 16:30:16 +02:00
Jim LAURIE	7fdccc62ee	PR feedback	2018-08-23 18:28:13 +02:00
Jim LAURIE	b4d97fb9db	3.0.0-alpha.13.1	2018-08-09 13:39:34 +02:00
Jim LAURIE	90041a5fba	Merge branch 'master' into master	2018-08-06 09:43:14 +02:00
Chris	78e8cb96ea	Added the Dutch (NL) language	2018-08-01 09:17:53 +02:00
Basile Bong	260a9bf69b	Add > FR translation keys	2018-07-31 19:26:51 +02:00
Jim LAURIE	a66c3d8eb0	Merge branch 'master' into translation/de	2018-07-31 13:42:51 +02:00
Jim LAURIE	a912976282	Merge branch 'master' into translation-keys-ru	2018-07-31 13:41:23 +02:00
Jim LAURIE	3e956670a9	Merge branch 'master' into fix/1609	2018-07-29 14:25:49 +02:00
Basile Bong	f0b8b411e6	Add > DE translation keys > strapi-plugin-email	2018-07-26 16:38:33 +02:00
Jim LAURIE	a0c49e3340	Fix package conflicts	2018-07-26 16:19:28 +02:00
Jim LAURIE	09a2a4b73d	3.0.0-alpha.13.0.1	2018-07-26 16:12:17 +02:00
Jim LAURIE	927a900f5b	3.0.0-alpha.13	2018-07-25 17:31:16 +02:00
bardaq	033219560a	Add missing translation keys in RU language 🇷🇺	2018-07-25 10:14:55 +03:00
Aurelsicoko	37b9c2ee4c	Remove front-end dependency from marketplace.strapi.io	2018-07-24 19:37:27 +02:00
Jim LAURIE	fcebf4fc6e	Merge branch 'master' into language/es	2018-07-23 17:32:58 +02:00
soupette	3890bc1211	Fix conflict	2018-07-13 12:33:52 +02:00
Alexis Vassilopoulos	7e94324189	Spanish Translations	2018-07-12 19:32:34 +02:00
Jim LAURIE	fa94d12e4f	3.0.0-alpha.12.7.1	2018-07-10 18:10:42 +02:00
Jim LAURIE	a6d48caad9	3.0.0-alpha.12.7	2018-07-10 15:37:47 +02:00
Taihoon Kim	5cfb9e9439	Korean Language Support	2018-07-06 15:34:20 +09:00
cyril lopez	3e42d86460	Merge branch 'master' of github.com:strapi/strapi into settings-ctm	2018-07-03 18:31:41 +02:00
Carlos Guimaraes	fe87d4f710	Brazilian Portuguese Language Support	2018-07-01 17:23:02 -03:00
cyril lopez	c0c99d443a	Fix conflicts and add pt.json translation files in usr-perm plugin	2018-06-28 12:54:39 +02:00