29765 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Aurelsicoko	d89888bb47	Add keep me updated checkbox on register	2018-03-14 13:18:05 +01:00
Aurelsicoko	0a2fd6dfcf	Update domain	2018-03-14 10:29:11 +01:00
Jim Laurie	b4be337249	Route to get layout to apply	2018-03-14 10:22:15 +01:00
Jim LAURIE	5d6968a0f3	Merge pull request #753 from abdonrd/mongodb-authsource-ssl ... Add authSource & ssl options to MongoDB connector	2018-03-14 10:01:34 +01:00
cyril lopez	ac3ea588fa	Add eslint to strapi-helper-plugin!	2018-03-14 09:59:42 +01:00
cyril lopez	bf9451d720	Clean code	2018-03-13 21:39:27 +01:00
cyril lopez	0cd6f1cedf	Add forceSelection, handle B, I , U, code block	2018-03-13 20:47:57 +01:00
Aurelsicoko	1e9e684eb5	Remove no-cors from register request	2018-03-13 18:25:27 +01:00
Aurelsicoko	1304a5cde0	Fix config policies aggregation & improve post-install script	2018-03-13 17:14:33 +01:00
Jim Laurie	3c1ec20155	Fix form data update user	2018-03-13 15:57:41 +01:00
cyril lopez	43fe22a88b	Add styles to inline button and init convert from md	2018-03-13 13:46:42 +01:00
cyril lopez	07661c6ca7	Add wysiwg md controls	2018-03-13 13:12:06 +01:00
Abdón Rodríguez Davila	02c136b915	Update default value for auth database	2018-03-13 09:23:25 +00:00
Abdón Rodríguez Davila	23f95f8def	Add missed config	2018-03-13 09:23:25 +00:00
cyril lopez	1d0ef6062e	Merge branch 'master' of github.com:strapi/strapi into wysiwyg	2018-03-13 10:16:36 +01:00
cyril lopez	5b2444663f	Add draftjs	2018-03-13 10:16:25 +01:00
cyril lopez	2c4f0c71a0	Add draftjs	2018-03-13 10:15:12 +01:00
cyril lopez	03195550aa	Fix edit user	2018-03-13 09:28:17 +01:00
Abdón Rodríguez Davila	1100d79d1c	Merge branch 'master' into mongodb-authsource-ssl	2018-03-12 18:28:35 +00:00
Jim LAURIE	9c0444e085	Merge pull request #772 from strapi/fix-ctm-layout ... Fix ctm layout bug	2018-03-12 18:31:00 +01:00
Jim LAURIE	dabe53dac2	Merge branch 'master' into fix-ctm-layout	2018-03-12 17:57:39 +01:00
Jim LAURIE	bead53c946	Merge pull request #738 from mtringuyen/master ... Add authSource & ssl options to MongoDB connector fix	2018-03-12 17:57:25 +01:00
Jim LAURIE	d2672572c0	Merge branch 'master' into master	2018-03-12 17:21:23 +01:00
Jim Laurie	c1d8d33c83	Update grant provider documentation	2018-03-12 17:15:20 +01:00
Jim LAURIE	ecccb1adf9	Merge branch 'master' into master	2018-03-12 16:55:31 +01:00
Jim Laurie	72877c3074	Rename Guest to Public role	2018-03-12 16:37:20 +01:00
Jim Laurie	88afad1502	Use default role on register action	2018-03-12 16:06:54 +01:00
cyril lopez	adb104f666	Fix editorState bug	2018-03-12 16:05:36 +01:00
Jim Laurie	9b7a216411	Add default role in advanced settings	2018-03-12 15:56:25 +01:00
cyril lopez	fb70b174d2	Add fullscreen mode ... the wysiwyg in full screen is still buggy	2018-03-12 15:38:38 +01:00
Jim Laurie	2b0ab41a66	Add registered role and fix update role name & description	2018-03-12 14:04:43 +01:00
cyril lopez	4c6adde386	Created WysiwigEditor component	2018-03-12 14:02:34 +01:00
cyril lopez	1187605c2a	Remove comments	2018-03-12 13:30:41 +01:00
cyril lopez	42bbaf1a28	Created WysiwygBottomControls component	2018-03-12 13:26:07 +01:00
cyril lopez	a474d8d389	Fix ctm layout bug	2018-03-12 12:45:00 +01:00
cyril lopez	50914d5258	Change Controls to markdown	2018-03-12 12:05:29 +01:00
Abdón Rodríguez Davila	f6acd1d17e	Merge branch 'master' into mongodb-authsource-ssl	2018-03-11 22:04:59 +01:00
Jim LAURIE	82abc27bb2	Merge pull request #769 from strapi/3.0.0-alpha.11.1 ... 3.0.0-alpha.11.1	2018-03-11 15:58:47 +01:00
Jim Laurie	6cd0ec730e	3.0.0-alpha.11.1 v3.0.0-alpha.11.1	2018-03-11 15:54:56 +01:00
cyril lopez	82b779aa6f	Fix conflict and start fixineg eslint on helper plugin	2018-03-09 16:41:24 +01:00
Abdón Rodríguez Davila	d5e70bc81d	Merge branch 'master' into mongodb-authsource-ssl	2018-03-09 13:17:30 +01:00
Jim LAURIE	d255b611d6	Merge pull request #760 from strapi/fix-upload ... Fix upload	2018-03-09 13:08:55 +01:00
Jim LAURIE	1d91544b4f	Merge branch 'master' into fix-upload	2018-03-09 13:08:33 +01:00
Jim LAURIE	d37f02d710	Merge pull request #754 from strapi/3.0.0-alpha.11 ... 3.0.0 alpha.11	2018-03-09 13:08:20 +01:00
cyril lopez	2139ec3da9	Use ref function instead of string in WYSIWYG	2018-03-09 12:45:37 +01:00
cyril lopez	1688e01be9	Display WYSIWYG in ctb	2018-03-09 12:10:58 +01:00
cyril lopez	5542d32941	Fixes #759	2018-03-09 11:22:37 +01:00
cyril lopez	c7f2eaac9f	Fixes #758	2018-03-09 11:19:34 +01:00
cyril lopez	828e808fa8	Add select titles	2018-03-08 18:55:49 +01:00
Jim Laurie	2e86678af4	Update doc versions v3.0.0-alpha.11	2018-03-08 17:34:06 +01:00