yujunjun/strapi
1
0
Fork 0
mirror of https://github.com/strapi/strapi.git synced 2025-10-10 23:54:03 +00:00
Code Issues Packages Projects Releases Wiki Activity
6,955 Commits 107 Branches 503 Tags
Commit Graph

303 Commits

Author SHA1 Message Date
Jim LAURIE
f7e25c34e8
Merge branch 'master' into ui/minor-updates 2019-01-31 18:08:15 +01:00
soupette
8b602c6273 Fix links HomePage and remove letter-spacing in ctm table 2019-01-30 15:21:31 +01:00
soupette
e4ffd70b90 Split view 2019-01-24 18:30:51 +01:00
soupette
7e79864259 Split content-manager setting view into tabs. 
Allow to change the textarea type so the wysiwyg can be displayed without having to set it back in the content type builder.
Fixes #2307
 2019-01-20 12:52:08 +01:00
soupette
08cc82d09e Add selectors to react select and fix json validations 2018-11-21 18:15:43 +01:00
soupette
a225d144c6 Add selector for errors 2018-11-21 12:57:20 +01:00
soupette
bba6f9d85f Merge branch 'master' of github.com:strapi/strapi into add-cypress 2018-11-20 18:46:31 +01:00
soupette
11064ca997 Add specific selector to CTM add component 2018-11-20 18:44:49 +01:00
soupette
ff501df0cf Add easier selectors 2018-11-20 18:00:00 +01:00
soupette
16e34102f5 Add ids to ctm 2018-11-20 15:25:32 +01:00
Marcello
5eed701b22
Placed handleInputChange after getOptions 
Refactoring for continuous-integration build error
 2018-11-19 19:07:17 +01:00
cyril lopez
958f4f7516
Merge branch 'master' into master 2018-11-19 15:00:44 +01:00
soupette
69ae95726f Prevent all bugs from strings 2018-11-09 14:36:17 +01:00
cyril lopez
93b190eada Fixes #2253 2018-11-05 22:10:19 +01:00
Jim LAURIE
e42e532f1a
Merge branch 'master' into revert-1928-master 2018-10-18 10:41:38 +02:00
cyril lopez
baae144799 Fix warning for controlled input without onChange handler in WYSIWYG 2018-10-10 14:56:21 +02:00
Jim LAURIE
bcb71242a8
Revert "Font-family declarations fixed" 2018-10-09 12:31:16 +02:00
cyril lopez
13f2193f73 Merge branch 'improve-ctm/delete-edit-view' of github.com:strapi/strapi into improve-ctm/delete-edit-view 2018-10-09 12:02:25 +02:00
cyril lopez
d186d33e39 Revert "Fix font-family" 
This reverts commit 220fb2caf8f8ca46ffff5646d62c3adc62c69819.
 2018-10-09 11:49:16 +02:00
Jim LAURIE
40a3c0418d
Merge branch 'master' into improve-ctm/delete-edit-view 2018-10-08 20:07:22 +02:00
Jim LAURIE
9f67701183
Merge branch 'master' into fix/1077 2018-10-08 11:54:46 +02:00
Jim LAURIE
35b94db32e Fix numerical 0 display in data list 2018-10-07 19:36:51 +02:00
Alberto Maturano
7721f38ee6 Fix defaultProps declaration 
Was done in multiple places.
 2018-10-04 15:18:56 -05:00
Alberto Maturano
6574ede348 Fix handleClick invocation 
`handleClick` declared at line 69 expects 0 arguments, wrong invocation
was done.
 2018-10-04 15:18:56 -05:00
cyril lopez
08eae80563 Add delete button 2018-10-03 17:22:08 +02:00
cyril lopez
220fb2caf8 Fix font-family 2018-10-03 12:49:43 +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
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
Marcello Vetro
07524dde85 Fixed SelectMany Dropdown Input search Ajax Call on search 2018-09-17 12:46:22 +02:00
uyouthe
2f2ad51804 Font-family declarations fixed 2018-09-10 20:59:33 +03:00
soupette
81c19fb3bc Fix conflicts 2018-08-22 14:20:03 +02:00
soupette
0fd23f4c16 Add comments to Manager 2018-08-22 14:10:50 +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
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
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
soupette
34111caed5 Remove duplicate description in SelectMany 2018-08-03 18:05:22 +02:00
soupette
6165ba01ad Fix duplicate key bug 2018-08-03 16:07:23 +02:00
soupette
ccb4fe0270 Pull enhancement/sortable-input because master is too buggy with my modifications 2018-08-02 15:51:10 +02:00