yujunjun/strapi
1
0
Fork 0
mirror of https://github.com/strapi/strapi.git synced 2025-08-09 01:07:27 +00:00
Code Issues Packages Projects Releases Wiki Activity
3,943 Commits 115 Branches 488 Tags
Commit Graph

3943 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Jim Laurie
932bf6da23 3.0.0-alpha.11 2018-03-08 17:31:25 +01:00
Abdón Rodríguez Davila
3d1613df2d Add authenticationDatabase setting 2018-03-08 15:51:03 +01:00
cyril lopez
0f6c3192fc Remove useless const 2018-03-08 15:50:28 +01:00
Abdón Rodríguez Davila
ca864ae711 Add environment variable for SSL 2018-03-08 15:34:24 +01:00
Abdón Rodríguez Davila
b02db9ea1b Merge branch 'master' into mongodb 2018-03-08 15:32:14 +01:00
Jim LAURIE
96996999a1
Merge pull request #743 from strapi/feature/upload 
Feature/upload
 2018-03-08 15:25:55 +01:00
Jim LAURIE
87216d10d8
Merge branch 'master' into feature/upload 2018-03-08 15:11:12 +01:00
cyril lopez
ffbc3298c8 Add header controls 2018-03-08 14:24:26 +01:00
cyril lopez
edc9f82b34 Add controls to wysiwyg start to fix eslint for helper components 2018-03-08 12:56:44 +01:00
Jim Laurie
ce3deaf862 Fix dependencies upload provider 2018-03-08 12:14:51 +01:00
cyril lopez
27eacc674b Merge branch 'feature/upload' of github.com:strapi/strapi into feature/upload 2018-03-08 10:43:55 +01:00
cyril lopez
589d3f5a3f Fix app environments bug 2018-03-08 10:32:01 +01:00
Jim Laurie
117d9534c9 Remove logs 2018-03-08 10:11:06 +01:00
Aurelsicoko
d406c456eb Fix bookshelf manage relation 2018-03-07 18:47:46 +01:00
Aurelsicoko
31d9fd0df9 Update bookshelf manage relations business logic 2018-03-07 18:15:45 +01:00
cyril lopez
e848b3a091 Merge branch 'feature/upload' of github.com:strapi/strapi into feature/upload 2018-03-07 18:01:21 +01:00
cyril lopez
bb65ff70da Fix upload update 
Co-authored-by: Aurelsicoko <aurelsicoko@gmail.com>
 2018-03-07 17:48:40 +01:00
Jim Laurie
94381bd24b Remove log 2018-03-07 16:36:45 +01:00
Jim Laurie
8b6a52dbff Replace index action name 2018-03-07 16:25:56 +01:00
Aurelsicoko
17c1e8397d Update example section importance 2018-03-07 16:18:55 +01:00
Aurelsicoko
c68b111ea2 Enhance upload documentation 2018-03-07 16:16:22 +01:00
Aurelsicoko
40de531e7c Update upload documentation 2018-03-07 15:50:59 +01:00