yujunjun/strapi
1
0
Fork 0
mirror of https://github.com/strapi/strapi.git synced 2025-07-29 11:58:29 +00:00
Code Issues Packages Projects Releases Wiki Activity
6,761 Commits 116 Branches 486 Tags
Commit Graph

1099 Commits

Author SHA1 Message Date
Jim LAURIE
0b8178fa71
Merge branch 'master' into master 2018-07-31 14:17:49 +02:00
Jim LAURIE
8930e2a072
Merge branch 'master' into translation-resolves-1625 2018-07-31 13:44:55 +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
Jim LAURIE
ba99e0f24d
Merge branch 'master' into feature/spanishTranslation 2018-07-31 13:38:18 +02:00
Jim LAURIE
6666444f48
Merge branch 'master' into master 2018-07-31 13:37:20 +02:00
Jim LAURIE
2b0f2d23cb
Merge branch 'master' into patch-2 2018-07-31 13:33:35 +02:00
soupette
aa343f4af3 Add custom drag layer 2018-07-30 19:08:13 +02:00
Aurélien GEORGET
72274cb3ff
Merge branch 'master' into master 2018-07-30 16:38:32 +02:00
Aurelsicoko
d8e5d0403b Update design, behavior and add link for selectMany 2018-07-30 16:33:50 +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
soupette
7847c8eb0a Fix json input that was sending undefined. 
The error was caused by a wrong path since the schema object has been changed
 2018-07-30 11:27:18 +02:00
Jim LAURIE
3e956670a9
Merge branch 'master' into fix/1609 2018-07-29 14:25:49 +02:00
Joao Bueno
9dd8706d09 Translation keys missing in PT-BR language (final cut) - Resolves #1625 2018-07-28 16:19:48 -03:00
Joao Bueno
721a14e3bf Translation keys missing in PT-BR language - Resolves #1625 2018-07-28 16:15:45 -03:00
soupette
54aef15b75 Handle add attr logic 2018-07-27 17:24:58 +02:00
Basile Bong
f10064e06c Change > DE translation keys > use familiar form 2018-07-27 17:05:44 +02:00
soupette
be73140600 Use toggle and fix editPage render loop 2018-07-27 16:15:26 +02:00
soupette
43cfa8a3a3 Change checkbox to toggle 2018-07-27 15:56:38 +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
soupette
bf0619a6d4 Fix begining drag sort 2018-07-26 19:27:27 +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
Basile Bong
25e32a5459 Add > DE translation keys > strapi-plugin-content-manager 2018-07-26 15:55:30 +02:00
soupette
c39e7f2603 Refacto code 2018-07-26 14:12:58 +02:00
soupette
fb8c3d2297 Handle display edit layout 2018-07-26 13:33:57 +02:00
soupette
5830ed4a73 Display empty block when no fields in the editPage 2018-07-26 13:10:26 +02:00
soupette
eeca356060 Handle remove field with edit logic. 
Prevent from having a view without any field
 2018-07-26 12:05:17 +02:00
Alberto Maturano
1cf5dac2a6 Improve spanish translation 
- Fix minor errors and improve translation after review it in context
(comments from PR #1566)

- Missing ES translations (issue #1621)

- Normalize tone using a formal style
 2018-07-25 12:18:58 -05:00
soupette
91838a8934 Start sort drag variable width 2018-07-25 19:18:36 +02:00
Jim LAURIE
927a900f5b 3.0.0-alpha.13 2018-07-25 17:31:16 +02:00
soupette
831de78567 Fix Remove element 2018-07-25 14:28:29 +02:00
bardaq
033219560a Add missing translation keys in RU language 🇷🇺 2018-07-25 10:14:55 +03:00
Aurelsicoko
37b9c2ee4c Remove front-end dependency from marketplace.strapi.io 2018-07-24 19:37:27 +02:00
soupette
0ebc1ba15d Fix remove element 2018-07-24 19:21:38 +02:00
Özgür ERSOY
e25f7fb2b5
Merge pull request #1 from moersoy/patch-2 
Patch 2
 2018-07-24 17:39:44 +03:00
Özgür ERSOY
0f4e1912be #1628 Missing translations 🇹🇷 2018-07-24 17:35:08 +03:00
Marianelli Michele
62ebbacb0e
Another update of it.json 2018-07-24 16:07:52 +02:00
soupette
4e05bd6359 Use the layout from the core_store in Manager.js 2018-07-24 15:16:47 +02:00
soupette
8adf547910 Fix delete variable width element 2018-07-24 11:30:57 +02:00
Arnaud Pichon
3b5c88a1ed
Fix search input extra scrollbar in Firefox 2018-07-23 20:00:11 +02:00
soupette
e4d68be3a3 Apply custom label and description for relations 2018-07-23 17:59:24 +02:00
soupette
02acfefd01 Add sortfield logic in editPage 2018-07-23 17:46:05 +02:00
Jim LAURIE
fcebf4fc6e
Merge branch 'master' into language/es 2018-07-23 17:32:58 +02:00
soupette
4916f9277b Use the default layout to prevent from displaying sensitive field in the admin 2018-07-23 16:59:30 +02:00
soupette
8bb43c9e6b Use layout from the core_store instead of fetching it 2018-07-23 15:56:14 +02:00
Jim LAURIE
5e9490e207 Merge branch 'settings-ctm-edit-view' of github.com:strapi/strapi into settings-ctm-edit-view 2018-07-23 15:13:21 +02:00
Jim LAURIE
87a051e712 Move layout files in core store 2018-07-23 15:12:33 +02:00
cyril lopez
88f8737e9d Handle add field 2018-07-23 13:49:28 +02:00