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

975 Commits

Author SHA1 Message Date
cyril lopez
f593a441e6 Fixes 1823 2018-09-28 12:24:11 +02:00
Jim LAURIE
1f56c823e9
Merge branch 'master' into order-translation-key 2018-09-27 18:39:22 +02:00
Jim LAURIE
29409f9531
Merge branch 'master' into master 2018-09-27 18:32:03 +02:00
Jim LAURIE
8ea46642dc
Merge branch 'master' into bf/1847-drag-drop-image-save 2018-09-27 17:20:40 +02:00
Jim LAURIE
070f398044 Reorder translation keys 2018-09-26 15:15:48 +02:00
Jim LAURIE
46c9b0f966 3.0.0-alpha.14.2 2018-09-26 11:08:10 +02:00
Jim LAURIE
a818c1258b
Merge branch 'master' into master 2018-09-25 10:11:59 +02:00
Alberto Maturano
154fc28a57 Normalize to standar file permissions 
As a result of taking a look on PR #1967 I realized there is 819
executable files in this repository. It is obvious this is an error.
 2018-09-24 12:33:09 -05:00
Miloslav Voloskov
1cd3fe3c5c
Merge branch 'master' into master 2018-09-23 08:04:20 +03:00
Anthony Guimard
5128157c8f Fix drag drop image not saved in WYSIWYG. 
In order to fix this issue we have to invoke the sendData method
just before updating the state of the WYSIWYG otherwhise the sendData
method is not triggered because currentState === updatedState.
 2018-09-19 02:41:31 -04:00
Anthony Guimard
2884c924a7 Remove moveFocusToEnd in addContent and addBlock WYSIWYG methods. 
Remove moveFocusToEnd in order to prevent cursor which going to the bottom
of the textarea when user put text in bold, italic, line-through or add header.
 2018-09-19 01:31:34 -04:00
Jim LAURIE
4d8ace2db7 3.0.0-alpha.14.1.1 2018-09-13 18:39:37 +02:00
Jim LAURIE
f10335d717 3.0.0-alpha.14.1 2018-09-12 12:41:11 +02:00
uyouthe
2f2ad51804 Font-family declarations fixed 2018-09-10 20:59:33 +03:00
Jim LAURIE
d9e3fde726
Merge branch 'master' into fix/remove-old-file 2018-09-09 14:32:33 +02:00
DmitryKlymenko
fdddab4ca8
Update ru.json 2018-09-09 12:43:19 +03:00
Salem
80d40db66c
Merge branch 'master' into master 2018-09-07 21:42:51 +03:00
soupette
c865109337 Fixes #1914 2018-09-07 17:29:33 +02:00
Jim LAURIE
1eb944b7f1
Merge branch 'master' into fix-date 2018-09-07 12:32:40 +02:00
Salem Yaslem
51d64acb1e update strapi-plugin-content-manager arabic translate 2018-09-07 02:34:57 +03:00
Vladislav Arsenev
e96d048381 fix: remove-old-files - fix lost file remove and one new was added 2018-09-04 17:57:10 +03:00
Vladislav Arsenev
8eb37c2b6b fix: success-delete-notification - add success notification 2018-09-04 10:30:54 +03:00
Jim LAURIE
96e716abaf Fix saved date format content manager 2018-08-31 14:33:42 +02:00
Jim LAURIE
cecef7385f 3.0.0-alpha.14 2018-08-27 16:30:16 +02:00
Jim LAURIE
44294d228d Add missing pluralize dep fix #1690 2018-08-27 14:57:47 +02: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
14fc74def4 Add comments to ctm/ bootstrap file and split functions 2018-08-21 17:43:17 +02:00
soupette
d113234a95 Add comments 2018-08-21 16:40:53 +02:00
soupette
38c4fd6a47 Fix first part of PR feedback 2018-08-21 14:01:15 +02:00
Aurelsicoko
238ce9dbf7 Enhance UX & CSS of displayed attributes box 2018-08-20 15:16:46 +02:00
Aurelsicoko
4f16144ee9 Update & enhance CSS 2018-08-20 14:18:37 +02:00
Jan Brachhold
dbc2a223c3 Update DE translations - strapi-plugin-content-manager 2018-08-16 14:33:55 +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
688defca70 Fix conflict 2018-08-10 12:52:11 +02:00
soupette
edf81024c1 Fix design 2018-08-10 12:45:56 +02:00
soupette
3feae01952 Fix edit view drag-n-drop design 2018-08-09 18:21:31 +02:00
soupette
3d42a91a0c Remove react-sortable-hoc 2018-08-09 17:02:15 +02:00
soupette
afa4c28378 Remove sortable-hoc and use react-dnd 2018-08-09 14:59:33 +02:00
Jim LAURIE
b4d97fb9db 3.0.0-alpha.13.1 2018-08-09 13:39:34 +02:00
soupette
5a441a69af Fix conflict 2018-08-09 13:39:21 +02:00
soupette
4068b02091 Move react-dnd into the shared dependencies 2018-08-09 13:36:25 +02:00
Jim LAURIE
90041a5fba
Merge branch 'master' into master 2018-08-06 09:43:14 +02:00
Jim LAURIE
1dbbea458d
Merge branch 'master' into translation/fr 2018-08-06 09:27:28 +02:00
soupette
34111caed5 Remove duplicate description in SelectMany 2018-08-03 18:05:22 +02:00
soupette
39a937851a Display updatedAt and createdAt fields in both the edit and list view of the ctm 2018-08-03 17:40:39 +02:00
soupette
ef158bff2e Fix last element dragged bug which returned undefined 2018-08-03 16:37:51 +02:00