824 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
Jim LAURIE
81b3149655
Fix space 2018-09-25 10:11:44 +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
Jim LAURIE
4d8ace2db7 3.0.0-alpha.14.1.1 2018-09-13 18:39:37 +02:00
uyouthe
4c0b26ea6a Indentation fixed 2018-09-12 22:24:30 +03:00
Jim LAURIE
f10335d717 3.0.0-alpha.14.1 2018-09-12 12:41:11 +02:00
Jim LAURIE
5ae787f4cb Add missing cross-spawn dependency 2018-09-12 12:39:53 +02:00
Salem
95448e161f
Update ar.json 2018-09-11 21:43:24 +03:00
uyouthe
2f2ad51804 Font-family declarations fixed 2018-09-10 20:59:33 +03:00
Salem
80d40db66c
Merge branch 'master' into master 2018-09-07 21:42:51 +03:00
soupette
c865109337 Fixes #1914 2018-09-07 17:29:33 +02:00
soupette
1e0b45f32a Remove loadable 2018-09-07 13:09:35 +02:00
Salem Yaslem
3debbddaeb update strapi-admin arabic translate 2018-09-07 02:07:06 +03: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
Jim LAURIE
6cf9d47272
Merge branch 'master' into improvement/notifications-display 2018-08-21 11:49:07 +02:00
Jim LAURIE
62c458741d
Merge branch 'master' into patch-2 2018-08-21 09:46:09 +02:00
Jim LAURIE
4f2e0b639f
Merge branch 'master' into improvement/left-menu-links 2018-08-21 08:57:43 +02:00
Jim LAURIE
9651549207
Fix end line 2018-08-21 08:57:34 +02:00
Jim LAURIE
21843d2650
Merge branch 'master' into enhancement/home-admin 2018-08-21 08:55:20 +02:00
Jim LAURIE
2ace38322d
Merge branch 'master' into fix/installed-plugins 2018-08-20 17:20:14 +02:00
Aurelsicoko
4f16144ee9 Update & enhance CSS 2018-08-20 14:18:37 +02:00
Jan Brachhold
95ce4091f7 Update DE translations - strapi-admin 2018-08-16 14:33:37 +02:00
soupette
9e191ebc8c Fix z-index 2018-08-14 18:29:59 +02:00
soupette
7a0e216b9b Merge branch 'master' of github.com:strapi/strapi into settings-ctm-edit-view 2018-08-14 10:56:46 +02:00
soupette
688defca70 Fix conflict 2018-08-10 12:52:11 +02:00
Jim LAURIE
63bd63bd49
Merge branch 'master' into fix-1660 2018-08-10 09:36:55 +02:00
Jim LAURIE
b4d97fb9db 3.0.0-alpha.13.1 2018-08-09 13:39:34 +02:00
Pierre Burgy
00b4fc0238 Disable eslint for app.js log 2018-08-08 17:27:47 +02:00
Pierre Burgy
2980c200af Fix download display 2018-08-08 17:25:25 +02:00
Aurelsicoko
f0c331bd91 Send the user to the right section in the Quickstart tutorial 2018-08-08 16:43:50 +02:00
Pierre Burgy
a7f5942a72 Fix multi active left menu links 2018-08-08 16:30:24 +02:00
Pierre Burgy
e404d4cac2 Fix multi active left menu links 2018-08-08 16:30:04 +02:00
Pierre Burgy
2979cf4324 Center notifications 2018-08-08 12:39:37 +02:00
Jim LAURIE
70e9523ba8 Fix policy error 2018-08-06 16:59:14 +02:00
soupette
9101ba2efd Fixes #1660 2018-08-06 15:00:49 +02:00
Jim LAURIE
90041a5fba
Merge branch 'master' into master 2018-08-06 09:43:14 +02:00
Chris Dekker
049d9c87b8 removed NL flag icon 2018-08-06 09:33:49 +02:00
Jim LAURIE
1dbbea458d
Merge branch 'master' into translation/fr 2018-08-06 09:27:28 +02:00
soupette
ccb4fe0270 Pull enhancement/sortable-input because master is too buggy with my modifications 2018-08-02 15:51:10 +02:00
Jim LAURIE
4dc4db24bf
Merge branch 'master' into security-patch 2018-08-01 10:21:51 +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
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