yujunjun/strapi
1
0
Fork 0
mirror of https://github.com/strapi/strapi.git synced 2025-08-07 08:16:35 +00:00
Code Issues Packages Projects Releases Wiki Activity
5,877 Commits 112 Branches 488 Tags
Commit Graph

628 Commits

Author SHA1 Message Date
cyril lopez
56152f4462 Update schema in ctm bootstrap file to reflect the updated values 2018-07-05 17:09:34 +02:00
cyril lopez
b396b29624 Fix ListView with new data 2018-06-28 12:12:54 +02:00
cyril lopez
799c6c3f0f Remove webpack warnings and react-intl errors 2018-06-28 10:01:59 +02:00
cyril lopez
f09cace582 Remove JSON & Wysiwyg from helper-plugin and move them to content-manager 2018-06-28 09:46:10 +02:00
Aurelsicoko
0b1241300c Update CSS & improve error management 2018-06-21 13:06:52 +02:00
cyril lopez
6f156144b5
Merge branch 'master' into add-loader 2018-06-20 15:15:34 +02: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
soupette
bc0edd96d2 Fix error highlight 2018-06-18 11:02:14 +02:00
soupette
e4ed3b4d11 Merge master 2018-06-18 10:16:32 +02:00
soupette
7ffb90621a Handle JSON errors 2018-06-15 16:48:29 +02:00
Jim Laurie
192c2ff1a9 Fix admin start fix #1371 2018-06-15 11:59:26 +02:00
soupette
cf6a2bdd25 merge 2018-06-14 16:49:39 +02:00
soupette
b749d8312b Remove loadable import of wys 2018-06-14 16:21:25 +02:00
soupette
f47aed1d3e Add loaders to hp 2018-06-13 18:27:03 +02:00
soupette
b76574714c Create specific loader for the WYSIWYG 2018-06-13 17:48:37 +02:00
soupette
5cae072b19 Add loaders to ctm listpage 2018-06-13 16:17:19 +02:00
Johan Baath
5859af4027 don't update the state of the form if wysiwyg content has not changed 2018-06-13 14:57:07 +02:00
soupette
84871a0fd5 Add full page loader 2018-06-13 10:39:50 +02:00
soupette
1536896f62 Add loadable to plugins 2018-06-12 17:27:40 +02:00
soupette
4d7b7fa1e0 Fixes #1269 2018-06-07 19:33:25 +02:00
Jim Laurie
cc9abff66d Fix build assets 2018-06-06 14:18:23 +02:00
soupette
8302d32d71 Merge branch 'master' of github.com:strapi/strapi into content-manager-filters 2018-06-05 12:06:17 +02:00
Cyril lopez
cb895ab586 Fix PR feedback 2018-06-04 17:46:08 +02:00
Jim Laurie
c9b4e29c65 Merge branch 'test-suits' of github.com:strapi/strapi into test-suits 2018-06-04 14:43:09 +02:00
Jim Laurie
ec5ef9a240 Fix PR feedback 2018-06-04 14:39:26 +02:00
Jim LAURIE
3d3d75b135
Merge branch 'master' into test-suits 2018-06-03 20:59:57 +02:00
soupette
44cff94989 Fix conflicts 2018-05-31 15:31:46 +02:00
Johann Pinson
fc85f8b47e
Merge branch 'master' into patch-content-manager 2018-05-29 12:01:37 +02:00
soupette
e0376cdd28 Merge branch 'master' of github.com:strapi/strapi into content-manager-filters 2018-05-29 11:46:56 +02:00
soupette
e73b44b6da Fix styled-components webpack config 2018-05-29 10:49:59 +02:00
Jim LAURIE
f3df2fa77f
Merge branch 'master' into patch-input-ui 2018-05-28 16:21:57 +02:00
Johann Pinson
28b2512484 fix(admin): handle click if specified - update PropTypes 2018-05-28 15:47:51 +02:00
soupette
688f44be7c Fix inputCheckbox proptypes 2018-05-25 14:43:04 +02:00
Johann Pinson
93151ac2e2 fix(ui): add min-height for line in table content-type-builder #1076 2018-05-24 17:51:55 +02:00
Johann Pinson
340aecc743 fix(ui): input min-width for helper #1214 2018-05-24 17:06:47 +02:00
Johann Pinson
6ddafb4fe3 fix(admin): handle click if specified #1257 2018-05-24 16:04:00 +02:00
soupette
20d896c92a Open FilterPickWrapper when clicking on a filter with correct input autofocus 2018-05-24 14:40:43 +02:00
soupette
2ece502650 Add refs to inputs Date Select & Select 2018-05-24 13:59:58 +02:00
soupette
739447b5c6 Use reactstrap instead of csstransition 2018-05-23 17:40:36 +02:00
soupette
1fae3e9852 Fix ctm bookshelf find query with sort 2018-05-22 18:23:03 +02:00
soupette
e9ce813474 Handle change input filters 2018-05-18 17:54:38 +02:00
Jim Laurie
6c194ff333 Init create new app test 2018-05-18 14:22:24 +02:00
Jim LAURIE
74d3987a11
Merge branch 'master' into add-styled-component 2018-05-18 11:07:32 +02:00
soupette
1543160819 Add Loadable to inputs 2018-05-18 10:58:51 +02:00
soupette
d0e27e95a4 Created SlideDown components in helper plugin 
Move LoadingIndicator into the helper.
Start to use react-loadable in the content manager
 2018-05-17 15:38:06 +02:00
soupette
220e6baaef Harmonize content manager filters options to match the generated APIs 
Change the GlobalPagination & PageFooter params type
Apply these modifications into the plugins that were using those compos
 2018-05-16 17:10:43 +02:00
soupette
97d8200c6c Merge branch 'master' of github.com:strapi/strapi into content-manager-filters 2018-05-16 14:41:28 +02:00
Jim Laurie
4fe7b6176e Fix conflicts & lint 2018-05-16 12:07:02 +02:00
soupette
51f5adc56a Add styled-components 2018-05-15 14:07:18 +02:00