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

592 Commits

Author SHA1 Message Date
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
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
5fea994d99 Remove code update commited by error due to bad sync. 2018-09-18 07:17:38 -04:00
Anthony Guimard
2e5c1581bf CamelCased model name with whitespace on form submit. 
Model name is camelCased only on input blur, a getModelWithCamelCaseName
function has been added and is used for model object on form submission in order
to prevent name with whitespaces.
 2018-09-18 00:18:45 -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
Abhimanyu
6bba0c8db6 content-type-builder bugfix - Cannot read property 'toJS' of undefined 2018-09-10 17:04:21 +05:30
Jim LAURIE
145f22ee1e
Update random 2018-09-07 17:02:32 +02:00
Jim LAURIE
6fcaf96806 Clean layout on content tyep delete fix #1903 2018-09-07 15:59:59 +02:00
Salem Yaslem
8bde839f86 update strapi-plugin-content-type-builder arabic translate 2018-09-07 02:15:00 +03:00
Kati Frantz
3ee7bbacf3 add validation for title enumeration field 2018-09-02 19:41:09 +01: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
d56d75b05b
Merge branch 'master' into fix/autoReload 2018-08-29 11:02:44 +02:00
Jim LAURIE
cecef7385f 3.0.0-alpha.14 2018-08-27 16:30:16 +02:00
soupette
8003982b08 Fix conflicts 2018-08-22 14:17:09 +02:00
soupette
38c4fd6a47 Fix first part of PR feedback 2018-08-21 14:01:15 +02:00
Jim LAURIE
ff886cc3ba
Merge branch 'master' into fix-1704 2018-08-21 11:47:32 +02:00
Jim LAURIE
cef51dd9b0
Merge branch 'master' into improvement/content-type-autofocus 2018-08-21 09:06:21 +02:00
Jim LAURIE
515f04f41a
Merge branch 'master' into fix-1395 2018-08-21 08:58:54 +02:00
soupette
ef59452b9a Fixes #1704 2018-08-20 17:13:05 +02:00
Luca
e90791ef4c
Merge branch 'master' into fix/autoReload 2018-08-17 16:04:19 +02:00
soupette
688defca70 Fix conflict 2018-08-10 12:52:11 +02:00
soupette
3feae01952 Fix edit view drag-n-drop design 2018-08-09 18:21:31 +02:00
Jim LAURIE
b4d97fb9db 3.0.0-alpha.13.1 2018-08-09 13:39:34 +02:00
Pierre Burgy
5c72dbfb32 Autofocus name when creating a new Content Type #1718 2018-08-08 11:40:21 +02:00
Luca
a1ca701053
fix(content-type-builder): autoReload payload 2018-08-08 00:22:58 +02:00
soupette
eceafe7074 Fixes #1395 2018-08-06 16:18:37 +02:00
Jim LAURIE
90041a5fba
Merge branch 'master' into master 2018-08-06 09:43:14 +02:00
soupette
ccb4fe0270 Pull enhancement/sortable-input because master is too buggy with my modifications 2018-08-02 15:51:10 +02:00
soupette
4609394db5 Fix bugs and refactored code 2018-08-02 14:26:31 +02:00
Chris
78e8cb96ea Added the Dutch (NL) language 2018-08-01 09:17:53 +02:00
Basile Bong
260a9bf69b Add > FR translation keys 2018-07-31 19:26:51 +02:00
soupette
043838ba3f Handle added upload relations 2018-07-31 14:54:52 +02:00
soupette
2d4dded100 Improve ctb by making the continue button the submit one 2018-07-31 13:59:30 +02:00
Jim LAURIE
a66c3d8eb0
Merge branch 'master' into translation/de 2018-07-31 13:42:51 +02:00
Jim LAURIE
a912976282
Merge branch 'master' into translation-keys-ru 2018-07-31 13:41:23 +02:00
soupette
11edb99900 Fix dup key in Manager.js 2018-07-30 14:38:10 +02:00
soupette
6bf3ddeea9 Update displayed fields when removing a field from the content type builder 2018-07-30 13:59:25 +02:00
Jim LAURIE
3e956670a9
Merge branch 'master' into fix/1609 2018-07-29 14:25:49 +02:00
Basile Bong
3bc0742abe Change > DE translation keys > use Inhaltstyp instead of Content-Typ 2018-07-27 17:14:45 +02:00
soupette
be73140600 Use toggle and fix editPage render loop 2018-07-27 16:15:26 +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
Basile Bong
c2b34db19e Add > DE translation keys > strapi-plugin-content-type-builder 2018-07-26 16:34:36 +02:00