975 Commits

Author SHA1 Message Date
Jim LAURIE
534b17f77f 3.0.0-alpha.12.6 2018-06-26 18:23:36 +02:00
Broc Gailit
9226147e7c
Merge branch 'master' into master 2018-06-26 08:20:07 -07:00
Jim LAURIE
a686949d55
Merge branch 'master' into patch-sql-timezone 2018-06-26 13:28:53 +02:00
Faustino Kialungila
c8a74b9e69 Portuguese Language Support 2018-06-23 12:11:20 +02:00
Broc Gailit
81ccc526bc
Merge branch 'master' into master 2018-06-21 18:44:40 -07:00
Johann Pinson
d9f5af24d5 fix(admin): change timezone manager from admin when db is sql 2018-06-20 16:49:21 +02:00
Broc Gailit
da319dcb25
Merge branch 'master' into master 2018-06-20 07:31:34 -07:00
cyril lopez
6f156144b5
Merge branch 'master' into add-loader 2018-06-20 15:15:34 +02:00
Jim LAURIE
c93fef17dc
Merge branch 'master' into input-json 2018-06-20 12:28:59 +02:00
Jim LAURIE
9be5655d00 Fix PR feedback 2018-06-20 12:19:58 +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
Broc Gailit
bc2f3256c5
Merge branch 'master' into master 2018-06-19 09:02:35 -07:00
Broc Gailit
0f556b5aca
Use empty array as default value in handleChange
Fixes TypeError (null conversion)
2018-06-19 08:47:28 -07:00
Jim LAURIE
0deebb55a6
Merge branch 'master' into master 2018-06-19 17:40:15 +02:00
Alessio Koci
fe2154e1d0 Language IT - Strapi Content Manager 2018-06-19 14:35:20 +02:00
Broc Gailit
609dd1b394 Implement sorting for SelectMany in Frontend 2018-06-18 09:41:31 -07:00
Jim LAURIE
92bdb4e758 3.0.0-alpha.12.5 2018-06-18 16:49:28 +02:00
Özgür ERSOY
d6b6beb3c4 fix missing translations 2018-06-18 13:46:05 +03:00
soupette
da865168e8 Fix css 2018-06-18 12:27:57 +02:00
soupette
372842ef5c Merge branch 'master' of github.com:strapi/strapi into add-loader 2018-06-18 11:11:38 +02:00
soupette
e4ed3b4d11 Merge master 2018-06-18 10:16:32 +02:00
Salem
28be24bc75
Rename sa.json to ar.json 2018-06-17 16:06:00 +03:00
Salem
fb43b7c052
Rename ar.json to sa.json 2018-06-17 16:02:54 +03:00
Jim LAURIE
e8d435989c
Merge branch 'master' into master 2018-06-17 14:16:33 +02:00
soupette
7ffb90621a Handle JSON errors 2018-06-15 16:48:29 +02:00
Aurelsicoko
e543ae28a1 Uncomment tests and clean code 2018-06-15 14:03:55 +02:00
Aurelsicoko
75b39b0a4e Resolve conflicts 2018-06-15 13:51:19 +02:00
Aurelsicoko
76200871e6 Add tests for oneWay relationship 2018-06-15 13:38:34 +02:00
Dominik Opyd
734ecc1cfc polish language | strapi-plugin-content-manager 2018-06-14 18:58:05 +02:00
Aurelsicoko
94200636da Refetch related data before attach new entry on manyToMany relationship 2018-06-14 18:27:44 +02:00
soupette
cf6a2bdd25 merge 2018-06-14 16:49:39 +02:00
Dominik Opyd
7186cd6e49 polish language | upgrade 2018-06-14 15:59:24 +02:00
soupette
f52880e810 Init loader plugin users 2018-06-13 22:12:11 +02:00
Aurelsicoko
18d3b9cf1e Resolve merge 2018-06-13 17:56:41 +02:00
Aurelsicoko
a850410009 Change test side on manyToMany delete all 2018-06-13 17:45:39 +02:00
Jim Laurie
69157dbba2 3.0.0-alpha.12.4 2018-06-13 17:39:37 +02:00
soupette
4268f788c9 Add loading view to editpage 2018-06-13 17:36:02 +02:00
soupette
915d419a59 Fix conflicts 2018-06-13 16:34:28 +02:00
soupette
5cae072b19 Add loaders to ctm listpage 2018-06-13 16:17:19 +02:00
Aurelsicoko
208319b8a2 Update request helper 2018-06-13 16:16:46 +02:00
Aurelsicoko
7e5b859575 Split tests in packages 2018-06-13 15:31:33 +02:00
Jim LAURIE
e5048b00ed
Merge branch 'master' into ctm-search 2018-06-13 12:09:18 +02:00
Jim Laurie
3a8173171e Clean some lint 2018-06-13 11:54:21 +02:00
Jim LAURIE
ddad496f87
Merge branch 'master' into improve-ctb-ux 2018-06-13 11:38:48 +02:00
Jim LAURIE
dbe235de3b
Merge branch 'master' into ctm-search 2018-06-13 10:34:12 +02:00
Aurelsicoko
c2d0e81f22 Run Jest in the monorepo packages 2018-06-12 17:41:28 +02:00
soupette
1536896f62 Add loadable to plugins 2018-06-12 17:27:40 +02:00
soupette
8e1b3cb3c1 Add redirection to choose attributes modal 2018-06-12 14:15:04 +02:00
soupette
b899bed52f Merge branch 2018-06-12 11:53:30 +02:00