yujunjun/strapi
1
0
Fork 0
mirror of https://github.com/strapi/strapi.git synced 2025-11-02 02:44:55 +00:00
Code Issues Packages Projects Releases Wiki Activity
6,072 Commits 121 Branches 507 Tags
Commit Graph

1011 Commits

Author SHA1 Message Date
Jim LAURIE
02d935188d Fix test launch 2018-10-31 17:20:09 +01:00
Jim LAURIE
e42e532f1a
Merge branch 'master' into revert-1928-master 2018-10-18 10:41:38 +02:00
cyril lopez
b3e9c0ec48
Merge branch 'master' into fix/#2097 2018-10-18 10:39:22 +02:00
Daniel Król
fb7e9c2a8f Add missing PL translations 2018-10-13 10:49:36 +02:00
cyril lopez
baae144799 Fix warning for controlled input without onChange handler in WYSIWYG 2018-10-10 14:56:21 +02:00
cyril lopez
d45a4378ed
Merge branch 'master' into improve/admin-auth 2018-10-10 10:56:08 +02:00
cyril lopez
fff21e8afb Fixes #1856 #1233 2018-10-09 15:17:43 +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
cyril lopez
5c391f49e4 Merge branch 'master' of github.com:strapi/strapi into improve/admin-auth 2018-10-08 17:50:13 +02:00
Jim LAURIE
4dd93f4b78
Merge branch 'master' into split-admin-dev 2018-10-08 17:44:35 +02:00
Jim LAURIE
87c3af3d1e 3.0.0-alpha.14.3 2018-10-08 17:14:19 +02:00
Jim LAURIE
9f67701183
Merge branch 'master' into fix/1077 2018-10-08 11:54:46 +02:00
Jim LAURIE
dfee8052de
Merge branch 'master' into bug/minorChanges 2018-10-08 11:20:03 +02:00
Jim LAURIE
35b94db32e Fix numerical 0 display in data list 2018-10-07 19:36:51 +02:00
Daniel Król
6642c640bf Add missing translations 2018-10-07 19:27:22 +02:00
IdaszakDaniel
207676e123 PL missing translation keys 2018-10-05 21:40:27 +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
segush11
2c72115088 Add missing translation keys in RU language 2018-10-05 00:48:05 +05:00
Jim LAURIE
c58606e847
Merge branch 'master' into improve-ctm/delete-edit-view 2018-10-04 18:33:48 +02:00
Jim LAURIE
468c5acd82
Merge branch 'master' into fix/2035 2018-10-03 19:44:25 +02:00
Jim LAURIE
b741507aec
Merge branch 'master' into master 2018-10-03 19:42:05 +02:00
Jim LAURIE
d0f3b90524
Merge branch 'master' into feature/spanishTranslation 2018-10-03 19:37:30 +02:00
cyril lopez
08eae80563 Add delete button 2018-10-03 17:22:08 +02:00
cyril lopez
4cc41331ce Change button secondary class 2018-10-03 16:19:04 +02:00
sennahLessert
4daa7c643f fix_Issue1620 - add some missing translation keys in DE language 2018-10-03 14:22:09 +02:00
cyril lopez
220fb2caf8 Fix font-family 2018-10-03 12:49:43 +02:00
Alberto Maturano
bb66b76087 Improve spanish translation 
fix #1621
 2018-10-02 22:44:14 -05:00
Pedro Caseiro
403c5d0567 issue #1626: pt translations 2018-10-02 22:53:00 +01:00
Daan De Deckere
a805567c43 Add missing translation keys for NL language. Fixes #2035 2018-10-02 20:41:40 +02:00
Jim LAURIE
e98589e130
Merge branch 'master' into master 2018-09-29 14:29:25 +02:00
cyril lopez
f593a441e6 Fixes 1823 2018-09-28 12:24:11 +02:00
Özgür ERSOY
0994b05142 Update TR translations - 2 #1634 2018-09-27 22:53:39 +03: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
cyril lopez
989b867714 Split admin entry point between dev and prod 2018-09-25 15:01:06 +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