3943 Commits

Author SHA1 Message Date
cyril lopez
eed3bb059c Handle auto add li for ul 2018-03-15 15:14:17 +01:00
Aurelsicoko
684a70c665 Fix dominant true when updating relationship 2018-03-15 12:56:21 +01:00
Jim LAURIE
358b24f111
Merge pull request #776 from strapi/fix-users
Fix edit user
2018-03-15 12:36:48 +01:00
Jim LAURIE
e0501b5adf
Merge branch 'master' into fix-users 2018-03-15 12:02:25 +01:00
cyril lopez
724ec3fb7a Handle ul block 2018-03-15 12:01:58 +01:00
Jim Laurie
54af44901b Remove useless clone object 2018-03-15 12:01:10 +01:00
Jim Laurie
2f4635bf4c Fix PR feedback 2018-03-15 11:51:40 +01:00
cyril lopez
8207c2f45d Merge branch 'wysiwyg' of github.com:strapi/strapi into wysiwyg 2018-03-15 11:32:22 +01:00
cyril lopez
8f6d732228 Handle add new IMG 2018-03-15 11:31:07 +01:00
Jim Laurie
d77fb19592 Fix set attr name get model 2018-03-15 10:42:23 +01:00
cyril lopez
54e4531997 Fix ctb edit attribute 2018-03-15 00:41:34 +01:00
cyril lopez
81a1a382ad Fix baseline 2018-03-14 23:10:36 +01:00
cyril lopez
3733d37a48 Handle file upload on wysiwyg 2018-03-14 22:47:56 +01:00
cyril lopez
01278f017b Merge branch 'wysiwyg' of github.com:strapi/strapi into wysiwyg 2018-03-14 22:21:55 +01:00
cyril lopez
8e3e385f26 Init drag and drop files 2018-03-14 22:20:39 +01:00
Jim Laurie
0a5b178ccc Send appearance in model definition 2018-03-14 17:44:11 +01:00
Jim LAURIE
bbf2c5f0cd
Merge pull request #773 from strapi/role-registered
Role registered
2018-03-14 17:38:59 +01:00
Jim LAURIE
19fdb4d279
Merge branch 'master' into role-registered 2018-03-14 17:13:57 +01:00
cyril lopez
3841ae20dd Merge branch 'master' of github.com:strapi/strapi into wysiwyg 2018-03-14 16:59:00 +01:00
Jim Laurie
489aefba06 Rename role registered to authenticated 2018-03-14 16:56:12 +01:00
Jim LAURIE
75cee0b3b7
Merge pull request #777 from strapi/enhance/register
Enhance/register
2018-03-14 16:27:37 +01:00
Jim Laurie
e1b727ee09 Write appearance in layout.json file 2018-03-14 16:24:11 +01:00
Jim LAURIE
31ee1583b4
Merge branch 'master' into enhance/register 2018-03-14 16:12:23 +01:00
Aurelsicoko
94dc9305b1 Update URL 2018-03-14 16:08:33 +01:00
Aurelsicoko
d59025de06 Replace usage URLs 2018-03-14 15:58:12 +01:00
cyril lopez
24d3eaa16b Fix wysiwyg underline 2018-03-14 15:12:06 +01:00
Jim Laurie
169c9742bb Merge branch 'wysiwyg' of github.com:strapi/strapi into wysiwyg 2018-03-14 15:10:35 +01:00
cyril lopez
b010175ab1 Fix ctb appearance 2018-03-14 15:00:04 +01:00
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