326 Commits

Author SHA1 Message Date
Jim LAURIE
236d2a62ed
Merge branch 'master' into language-ko_kr 2018-07-10 10:44:25 +02:00
Taihoon Kim
414453e02e fixed typos in Korean language 2018-07-10 14:13:13 +09:00
Jim LAURIE
13170a7678
Merge branch 'master' into fix-1387 2018-07-09 14:36:50 +02:00
cyril lopez
f8b6edb23f Fix display with onWay relation 2018-07-09 14:04:20 +02:00
cyril lopez
3f6da374cb Fixes #1387 #1374 2018-07-06 14:39:18 +02:00
Taihoon Kim
5cfb9e9439 Korean Language Support 2018-07-06 15:34:20 +09:00
Carlos Guimaraes
57cffecc4a
Brazilian Portuguese Language Support 2018-07-01 17:21:59 -03:00
Faustino Kialungila
c8a74b9e69 Portuguese Language Support 2018-06-23 12:11:20 +02:00
cyril lopez
6f156144b5
Merge branch 'master' into add-loader 2018-06-20 15:15:34 +02:00
Jim LAURIE
2761f3949f
Merge branch 'master' into master 2018-06-20 09:33:30 +02:00
Alessio Koci
c8f9b2f07c fix directories structure 2018-06-20 09:31:25 +02:00
mathb67
1576da293f
Merge branch 'master' into master 2018-06-19 18:13:00 +02:00
math_b67
a7a06cc05d Correct the link to the documentation 2018-06-19 18:06:30 +02:00
Alessio Koci
18c02e7afd Translation IT - Plugin content type 2018-06-19 14:37:10 +02:00
Özgür ERSOY
d6b6beb3c4 fix missing translations 2018-06-18 13:46:05 +03:00
soupette
372842ef5c Merge branch 'master' of github.com:strapi/strapi into add-loader 2018-06-18 11:11:38 +02:00
Salem
617d20466d
Rename sa.json to ar.json 2018-06-17 16:06:11 +03:00
Salem
c613d997b1
Rename ar.json to sa.json 2018-06-17 16:03:12 +03:00
Jim LAURIE
e8d435989c
Merge branch 'master' into master 2018-06-17 14:16:33 +02:00
Dominik Opyd
34e125f504 polish language | strapi-plugin-content-type-builder 2018-06-14 19:04:49 +02:00
Dominik Opyd
7186cd6e49 polish language | upgrade 2018-06-14 15:59:24 +02:00
soupette
dee1ecd23f Change users-permissions hp reducer 2018-06-14 11:35:40 +02:00
Jim Laurie
25efd6bced Fix enum icon 2018-06-13 14:02:32 +02:00
Jim LAURIE
ddad496f87
Merge branch 'master' into improve-ctb-ux 2018-06-13 11:38:48 +02:00
soupette
8e1b3cb3c1 Add redirection to choose attributes modal 2018-06-12 14:15:04 +02:00
soupette
10cc2f813e Handle nav with keyboard in popup choose relation 2018-06-11 19:01:01 +02:00
Jim LAURIE
0a759bc3f2
Merge branch 'master' into patch-builder-enum 2018-06-11 18:26:12 +02:00
Jim LAURIE
d588a54729
Merge branch 'master' into fix-1269 2018-06-11 17:19:45 +02:00
soupette
4d7b7fa1e0 Fixes #1269 2018-06-07 19:33:25 +02:00
soupette
e9e7d48119 Fix PR feedback 2018-06-06 17:46:18 +02:00
soupette
40b267a6a6 Merge branch 'master' of github.com:strapi/strapi into fix-1262 2018-06-06 17:46:04 +02:00
soupette
8302d32d71 Merge branch 'master' of github.com:strapi/strapi into content-manager-filters 2018-06-05 12:06:17 +02:00
soupette
1af3ff7eff Fixes #1186 2018-06-04 19:24:08 +02:00
Johann Pinson
8884a81994 feat(plugin): add enum icon inside table row 2018-06-04 12:05:17 +02:00
Johann Pinson
e594f311f7 feat(plugin): add enumeration to content type builder 2018-06-04 11:57:14 +02:00
soupette
78c9c8b936 Merge branch 'master' of github.com:strapi/strapi into content-manager-filters 2018-06-01 14:55:12 +02:00
soupette
71b017468d Fix PR feedback 2018-06-01 14:51:12 +02:00
Salem
82508698d3
Create ar.json 2018-06-01 01:10:51 +03:00
soupette
7f4488f65f Remove NoTableWarning int ctb since we automatically creates table 2018-05-31 16:14:08 +02:00
soupette
09ad42d1d2 Fixes #1262 2018-05-29 17:56:07 +02:00
soupette
85e638c901 Set values in placeholders when change the ct targets 2018-05-29 16:47:50 +02:00
soupette
a7808b24e9 Refacto RelationBoc 2018-05-29 15:13:55 +02:00
Jim LAURIE
f9b3f27c6f
Merge branch 'master' into patch-ui-table 2018-05-28 16:03:49 +02:00
Jim LAURIE
5d89f1ef2f
Merge branch 'master' into oneway-relation-frontend 2018-05-28 15:09:52 +02:00
Johann Pinson
93151ac2e2 fix(ui): add min-height for line in table content-type-builder #1076 2018-05-24 17:51:55 +02:00
Yakup AD
58e4b27ddb update Turkish language translates 2018-05-20 14:08:47 +03:00
Okaris
0d5e657a5a Fixed relation picker icon padding 2018-05-17 12:41:04 +03:00
Okaris
0408368481 Added oneWay relation option on frontend 2018-05-17 09:53:25 +03:00
Jim Laurie
4fe7b6176e Fix conflicts & lint 2018-05-16 12:07:02 +02:00
Jim Laurie
e082672d53 Fix feedback PR 2018-05-15 17:20:46 +02:00