yujunjun/strapi
1
0
Fork 0
mirror of https://github.com/strapi/strapi.git synced 2025-07-30 20:39:05 +00:00
Code Issues Packages Projects Releases Wiki Activity
6,761 Commits 116 Branches 487 Tags
Commit Graph

652 Commits

Author SHA1 Message Date
soupette
475e93c9b9 Fix conflicts 2018-08-14 18:34:03 +02:00
soupette
9e191ebc8c Fix z-index 2018-08-14 18:29:59 +02:00
soupette
97673e77e2 Store displayed fields in localstorage 2018-08-14 18:26:53 +02:00
soupette
97ae4b7659 Display or hide field directy from the list view 2018-08-14 17:10:23 +02:00
soupette
7a0e216b9b Merge branch 'master' of github.com:strapi/strapi into settings-ctm-edit-view 2018-08-14 10:56:46 +02:00
soupette
688defca70 Fix conflict 2018-08-10 12:52:11 +02:00
Jim LAURIE
63bd63bd49
Merge branch 'master' into fix-1660 2018-08-10 09:36:55 +02:00
soupette
3feae01952 Fix edit view drag-n-drop design 2018-08-09 18:21:31 +02:00
soupette
4068b02091 Move react-dnd into the shared dependencies 2018-08-09 13:36:25 +02:00
Luca
bc60bdb76a
fix(BlockerComponent): autoReload payload 2018-08-08 00:38:30 +02:00
Alberto Maturano
186eb4de47 Parse environment variables on build configuration 
Move existing code to a shared library and invoke it on the build
process to parse environment variables on configuration files.

Looking for a consistent behavior.

close #1590
 2018-08-06 12:38:20 -05:00
soupette
9101ba2efd Fixes #1660 2018-08-06 15:00:49 +02:00
soupette
6165ba01ad Fix duplicate key bug 2018-08-03 16:07:23 +02:00
soupette
3ed4c62f6c Fix bugs 2018-08-01 19:55:52 +02:00
soupette
11edb99900 Fix dup key in Manager.js 2018-07-30 14:38:10 +02:00
Joshua F. Rountree
aa6d222a51
Added white-space: nowrap; to buttons. 
Buttons are wrapping like crazy all over the app.
Let me know if this isn't the place to put this.
 2018-07-29 15:36:40 -04:00
soupette
be73140600 Use toggle and fix editPage render loop 2018-07-27 16:15:26 +02:00
soupette
34b7737a64 Set Manager in helper plugin 2018-07-27 15:33:37 +02:00
soupette
5830ed4a73 Display empty block when no fields in the editPage 2018-07-26 13:10:26 +02:00
soupette
02acfefd01 Add sortfield logic in editPage 2018-07-23 17:46:05 +02:00
soupette
3890bc1211 Fix conflict 2018-07-13 12:33:52 +02:00
soupette
0b1a280c7a Add PopUpWarning in edit page to warn before cancel changes 2018-07-13 12:19:07 +02:00
soupette
c2c9d95d1a Fix PR feedback 2018-07-13 11:48:35 +02:00
cyril lopez
d319d22f91 Fixes #1518 2018-07-06 14:15:59 +02:00
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