yujunjun/strapi
1
0
Fork 0
mirror of https://github.com/strapi/strapi.git synced 2025-10-18 03:23:49 +00:00
Code Issues Packages Projects Releases Wiki Activity
12,648 Commits 108 Branches 504 Tags
Commit Graph

1325 Commits

Author SHA1 Message Date
Jim LAURIE
3fe7f0cf2a
Merge branch 'master' into fix/reset-image-preview 2018-09-06 18:15:29 +02:00
Vladislav Arsenev
19fba87e85 fix: reset-image-preview - clear label and icon preview 2018-09-05 12:59:24 +03:00
Vladislav Arsenev
b254d46607
Merge branch 'master' into fix/repeat-upload-the-same-file 2018-08-31 14:06:54 +03:00
Vladislav Arsenev
d75f3acae5 fix:repeat-upload-the-same-file - clear file input after trigger event 2018-08-31 13:30:39 +03:00
Vladislav Arsenev
e30e61c217
Merge branch 'master' into fix/files-required-validation 2018-08-30 14:50:20 +03:00
Vladislav Arsenev
5a666d80df fix(files-required-validation): fix required prop save. add error display for component. fix validation file repeatedly 2018-08-30 14:44:57 +03:00
Jim LAURIE
eace470998 Fix build 2018-08-29 12:14:54 +02:00
Jim LAURIE
d56d75b05b
Merge branch 'master' into fix/autoReload 2018-08-29 11:02:44 +02:00
Vladislav Arsenev
d234b20d88
Merge branch 'master' into fix/multiple-files-cancel 2018-08-28 19:02:29 +03:00
Jim LAURIE
ed2e4112b1
Merge branch 'master' into fix/validation-check-null 2018-08-27 17:32:04 +02:00
Jim LAURIE
cecef7385f 3.0.0-alpha.14 2018-08-27 16:30:16 +02:00
soupette
e5e2af960c Fix input toggle true false 2018-08-27 15:47:41 +02:00
Vladislav Arsenev
2887f6e7be fix: validation-check-null - add check for length property may not exist 2018-08-27 10:41:00 +03:00
Vladislav Arsenev
d266961881 fix(multiple-files-cancel): discard action if canceled select file 2018-08-24 15:05:12 +03:00
soupette
81c19fb3bc Fix conflicts 2018-08-22 14:20:03 +02:00
soupette
8003982b08 Fix conflicts 2018-08-22 14:17:09 +02:00
soupette
0fd23f4c16 Add comments to Manager 2018-08-22 14:10:50 +02:00
soupette
38c4fd6a47 Fix first part of PR feedback 2018-08-21 14:01:15 +02:00
Jim LAURIE
62c458741d
Merge branch 'master' into patch-2 2018-08-21 09:46:09 +02:00
Aurelsicoko
4f16144ee9 Update & enhance CSS 2018-08-20 14:18:37 +02:00
Luca
e90791ef4c
Merge branch 'master' into fix/autoReload 2018-08-17 16:04:19 +02:00
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
Jim LAURIE
3853e78452
Merge branch 'master' into bug/1590 2018-08-09 17:37:54 +02:00
Jim LAURIE
b4d97fb9db 3.0.0-alpha.13.1 2018-08-09 13:39:34 +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
Jim LAURIE
1fc9513d80 Change lodash version 2018-08-06 16:03:09 +02: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
Aurelsicoko
120f515e5e Better design many-to-many and add jump link 2018-07-31 16:57:16 +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
d7b12f1871 Merge branch 'master' of github.com:strapi/strapi into settings-ctm-edit-view 2018-07-27 12:19:19 +02:00
Jim LAURIE
a0c49e3340 Fix package conflicts 2018-07-26 16:19:28 +02:00
Jim LAURIE
09a2a4b73d 3.0.0-alpha.13.0.1 2018-07-26 16:12:17 +02:00
soupette
5830ed4a73 Display empty block when no fields in the editPage 2018-07-26 13:10:26 +02:00
Jim LAURIE
927a900f5b 3.0.0-alpha.13 2018-07-25 17:31:16 +02:00
soupette
02acfefd01 Add sortfield logic in editPage 2018-07-23 17:46:05 +02:00
Leon Kyneur
92b045f647 Include yarn.lock in packages .gitignore 2018-07-22 09:26:48 +08:00