yujunjun/strapi
1
0
Fork 0
mirror of https://github.com/strapi/strapi.git synced 2025-08-14 03:34:53 +00:00
Code Issues Packages Projects Releases Wiki Activity
29,765 Commits 117 Branches 489 Tags
Commit Graph

29765 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
cyril lopez
f0298b1566 Remove old layout 2018-03-20 16:20:50 +01:00
cyril lopez
9354b7eeb1 Merge branch 'master' of github.com:strapi/strapi into wysiwyg 2018-03-20 16:13:27 +01:00
cyril lopez
32ce6d0a0e Clean code 2018-03-20 16:12:05 +01:00
cyril lopez
9b08f159ee Created addContent handler 2018-03-20 15:34:27 +01:00
cyril lopez
280d37c595 Handle selections when adding a new block 2018-03-20 15:17:33 +01:00
cyril lopez
9fa19f3cb1 Refacto add list block 2018-03-20 14:49:49 +01:00
cyril lopez
0d71844e29 Handle selection for link media 2018-03-20 13:27:42 +01:00
Jim LAURIE
b15c848cd8
Merge pull request #817 from Duske/patch-1 
(doc) fix collection name in many-to-many example
 2018-03-20 12:39:37 +01:00
Dustin
9c9225a8cd
(doc) fix collection name in many-to-many example 
Not sure if I understand the example correctly, but with the given config it does not work for me.
Shouldn't be the collection names the other way round?
 2018-03-20 12:17:07 +01:00
cyril lopez
cbee0345ea Add striked out control and fix css 2018-03-20 12:12:02 +01:00
Jim LAURIE
e7dfc222fa
Merge pull request #812 from strapi/design/logout 
Update styles.scss
 2018-03-20 12:07:39 +01:00
Jim LAURIE
a1372e84df
Merge branch 'master' into design/logout 2018-03-20 11:49:02 +01:00
Jim LAURIE
717e86ba29
Delete comment 2018-03-20 11:48:50 +01:00
Jim LAURIE
a1fa931d1c
Merge pull request #813 from strapi/design/logout-next 
Update index.js
 2018-03-20 11:47:48 +01:00
Aurélien GEORGET
17ef1682b1
Update index.js 2018-03-19 19:12:54 +01:00
Aurélien GEORGET
ca6077f9c9
Update styles.scss 2018-03-19 19:12:07 +01:00
cyril lopez
5e7e4b5f59 Fix selection on link 2018-03-19 19:01:05 +01:00
Jim LAURIE
58ff40a432
Merge pull request #809 from strapi/fix/update-email 
Update User.js
 2018-03-19 18:35:41 +01:00
cyril lopez
60d6306b59 Fix offsets algo 2018-03-19 18:22:09 +01:00
Jim LAURIE
2f182732dc
Merge branch 'master' into fix/update-email 2018-03-19 18:21:19 +01:00
Jim LAURIE
4d5e02cd8b
Merge pull request #811 from strapi/ga-admin 
Add ga in admin to improve Strapi
 2018-03-19 18:20:57 +01:00
cyril lopez
d87fce5365 Fix auto block 2018-03-19 18:06:48 +01:00
Jim LAURIE
46bcadaae5
Fix PR feedback 2018-03-19 18:00:04 +01:00
Jim LAURIE
792b909b85
Merge branch 'master' into ga-admin 2018-03-19 17:48:31 +01:00
Jim Laurie
9017c0d1d0 Add ga in admin to improve Strapi 2018-03-19 17:45:33 +01:00
Aurélien GEORGET
11c68bebf2
Update User.js 2018-03-19 17:31:04 +01:00
Adrien Lepoutre
d8281d7036 Add lodash to package.json to avoid version problem 2018-03-19 12:27:01 -04:00
cyril lopez
34e968077d Fix lineheight 2018-03-19 15:35:47 +01:00
Jim LAURIE
5d82812355
Merge pull request #789 from strapi/migration-10-to-11 
Add migration guide alpha 10 to 11
 2018-03-19 14:44:19 +01:00
Jim LAURIE
615e8e5e09
Merge branch 'master' into migration-10-to-11 2018-03-19 14:25:57 +01:00
Jim LAURIE
75fb9d1f60
Merge pull request #807 from strapi/design/auth-form 
Update styles.scss
 2018-03-19 14:25:47 +01:00
Aurélien GEORGET
c7fdd84340
Update styles.scss 2018-03-19 14:07:02 +01:00
Jim LAURIE
54d5104f30
Merge pull request #805 from strapi/prevent-ctb-from-breaking-unknown-attr 
Prevent the ctb from breaking
 2018-03-19 13:06:29 +01:00
cyril lopez
17aa4049d1 Merge branch 'master' of github.com:strapi/strapi into wysiwyg 2018-03-19 12:53:15 +01:00
cyril lopez
c6b24f046b Prevent the ctb from breaking if a user tries to edit an attribute that it cannot currently handle 2018-03-19 12:49:25 +01:00
cyril lopez
0952c9aaa9 Add new layout dynamic 2018-03-19 12:30:04 +01:00
Jim LAURIE
d78c0a0200
Merge pull request #792 from johannpinson/patch-1 
Update model.template for generate api
 2018-03-19 12:22:34 +01:00
Jim LAURIE
164a29a6b6
Fix PR feedback 2018-03-19 12:14:25 +01:00
Jim LAURIE
2ba257ce1c
Merge branch 'master' into patch-1 2018-03-19 12:08:05 +01:00
cyril lopez
67cb54ae12 Add request to fetch layout in ctm 2018-03-19 11:57:47 +01:00
Jim LAURIE
25b85830b5
Merge pull request #796 from abdonrd/array 
Allow Array type in the backend
 2018-03-19 10:33:50 +01:00
cyril lopez
06760f7dfd Fixes #799 2018-03-19 10:25:21 +01:00
Jim LAURIE
3d2f611af2
Merge branch 'master' into array 2018-03-19 10:15:14 +01:00
Jim LAURIE
38f2986c3c
Merge pull request #801 from abdonrd/paths 
Fix spaces path issues on npm run build --plugins
 2018-03-19 10:14:23 +01:00
cyril lopez
2098ff1782 Init preview HTML 
(still very buggy)
 2018-03-19 09:47:56 +01:00
Abdón Rodríguez Davila
1e7682eddd Fix spaces path issues on databases 2018-03-18 13:29:49 +01:00
Abdón Rodríguez Davila
1dd36a5eb6 Fix spaces path issues on npm run build --plugins 2018-03-18 13:11:11 +01:00
Abdón Rodríguez Davila
3cd5cff861 Add Array type 2018-03-17 16:43:25 +00:00
Abdón Rodríguez Davila
a186ac3d3b Sort types alphabetically 2018-03-17 16:42:28 +00:00
Jim LAURIE
4fb877d9c2
Merge pull request #790 from strapi/fix/mask 
Fix/mask
 2018-03-16 17:21:48 +01:00