712 Commits

Author	SHA1	Message	Date
Jim LAURIE	3e956670a9	Merge branch 'master' into fix/1609	2018-07-29 14:25:49 +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
Aurelsicoko	37b9c2ee4c	Remove front-end dependency from marketplace.strapi.io	2018-07-24 19:37:27 +02:00
Aurélien GEORGET	06bcac7ee2	Disconnect projects from marketplace.strapi.io	2018-07-24 18:54:50 +02:00
Jim LAURIE	fcebf4fc6e	Merge branch 'master' into language/es	2018-07-23 17:32:58 +02:00
Kati Frantz	f108494cd9	update connect function to check for duplicate email and not provider	2018-07-20 11:36:34 +01:00
Jim LAURIE	1dfd671c32	Merge branch 'master' into fix-user-roles-and-permissions	2018-07-17 12:08:09 +02:00
Jim LAURIE	ea00d491aa	Merge branch 'master' into fix-update-providers-issue	2018-07-16 16:07:30 +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	414453e02e	fixed typos in Korean language	2018-07-10 14:13:13 +09:00
kishu	5edf9111cf	fixed typos	2018-07-08 15:12:00 +09:00
Taihoon Kim	5cfb9e9439	Korean Language Support	2018-07-06 15:34:20 +09:00
Kati Frantz	3ea2c2023f	update ctx.request.body to be ctx.request.body.providers, to ensure only permissions are saved to database with no extra keys	2018-07-05 09:57:42 +01:00
Kati Frantz	d3ef2f8e3c	fetch current actions from database ... use results for comparing if new actions have been added to controllers	2018-07-05 09:57:12 +01: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	dff877eb41	Brazilian Portuguese Language Support	2018-07-01 17:25:43 -03:00
cyril lopez	7a9b3f6d59	Fix lint	2018-06-29 15:40:55 +02:00
cyril lopez	c0c99d443a	Fix conflicts and add pt.json translation files in usr-perm plugin	2018-06-28 12:54:39 +02:00
cyril lopez	799c6c3f0f	Remove webpack warnings and react-intl errors	2018-06-28 10:01:59 +02:00
cyril lopez	039d9e5856	Front-end config in core-store	2018-06-27 19:00:19 +02:00
Jim LAURIE	157c249382	Merge branch 'master' of github.com:strapi/strapi into tests/split	2018-06-27 14:28:30 +02:00
Jim LAURIE	534b17f77f	3.0.0-alpha.12.6	2018-06-26 18:23:36 +02:00
Jim LAURIE	561e910558	Fix empty string not require	2018-06-26 17:14:42 +02:00
Jim LAURIE	670f34d64a	Merge branch 'master' into fix-json-sql	2018-06-26 14:28:32 +02:00
Jim LAURIE	75c1c4bac5	Fix JSON type format SQL fix #1425	2018-06-20 16:21:09 +02:00
cyril lopez	6f156144b5	Merge branch 'master' into add-loader	2018-06-20 15:15:34 +02:00
Jim LAURIE	0deebb55a6	Merge branch 'master' into master	2018-06-19 17:40:15 +02:00
Jim LAURIE	92bdb4e758	3.0.0-alpha.12.5	2018-06-18 16:49:28 +02:00
Jim LAURIE	fd4b895d02	Merge branch 'master' into fix-reset-password-sql	2018-06-18 12:48:57 +02:00
Özgür ERSOY	d6b6beb3c4	fix missing translations	2018-06-18 13:46:05 +03:00
Özgür ERSOY	eab84232eb	fix spaces	2018-06-18 13:45:26 +03:00
soupette	da865168e8	Fix css	2018-06-18 12:27:57 +02:00
soupette	372842ef5c	Merge branch 'master' of github.com:strapi/strapi into add-loader	2018-06-18 11:11:38 +02:00
Salem	4a4d151cf4	Rename sa.json to ar.json	2018-06-17 16:06:46 +03:00
Salem	c2bd9ac4e5	Rename ar.json to sa.json	2018-06-17 16:04:02 +03:00
Jim LAURIE	e8d435989c	Merge branch 'master' into master	2018-06-17 14:16:33 +02:00
Salem	7b4af48154	Create ar.json	2018-06-17 13:22:10 +03:00
Aurelsicoko	75b39b0a4e	Resolve conflicts	2018-06-15 13:51:19 +02:00
Dominik Opyd	07bfbb2b3a	polish language | strapi-plugin-users-permissions	2018-06-14 19:19:28 +02:00
Jim Laurie	1c3e6a4664	Update comment on reset password	2018-06-14 17:20:45 +02:00
Jim Laurie	ad815eae20	Fix reset password SQL fix #1351	2018-06-14 17:15:49 +02:00
soupette	cf6a2bdd25	merge	2018-06-14 16:49:39 +02:00
soupette	d3914fdf84	Global loader editpage when editing	2018-06-14 15:30:54 +02:00
soupette	dfe1ff26bb	Add loaders to users-permissions HP	2018-06-14 12:33:57 +02:00
soupette	458116998f	Fix reducer with advanced settings	2018-06-14 11:41:43 +02:00