942 Commits

Author SHA1 Message Date
Jim LAURIE
c58606e847
Merge branch 'master' into improve-ctm/delete-edit-view 2018-10-04 18:33:48 +02:00
Jim LAURIE
468c5acd82
Merge branch 'master' into fix/2035 2018-10-03 19:44:25 +02:00
Jim LAURIE
b741507aec
Merge branch 'master' into master 2018-10-03 19:42:05 +02:00
Jim LAURIE
d0f3b90524
Merge branch 'master' into feature/spanishTranslation 2018-10-03 19:37:30 +02:00
cyril lopez
4cc41331ce Change button secondary class 2018-10-03 16:19:04 +02:00
sennahLessert
4daa7c643f fix_Issue1620 - add some missing translation keys in DE language 2018-10-03 14:22:09 +02:00
cyril lopez
220fb2caf8 Fix font-family 2018-10-03 12:49:43 +02:00
Alberto Maturano
bb66b76087 Improve spanish translation
fix #1621
2018-10-02 22:44:14 -05:00
Pedro Caseiro
403c5d0567 issue #1626: pt translations 2018-10-02 22:53:00 +01:00
Daan De Deckere
a805567c43 Add missing translation keys for NL language. Fixes #2035 2018-10-02 20:41:40 +02:00
Jim LAURIE
263c8fc127
Remove log 2018-09-29 14:57:52 +02:00
Özgür ERSOY
0994b05142 Update TR translations - 2 #1634 2018-09-27 22:53:39 +03:00
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
cyril lopez
57ef0ce36f Merge branch 'master' of github.com:strapi/strapi into improve/admin-auth 2018-09-26 15:42:28 +02:00
Jim LAURIE
070f398044 Reorder translation keys 2018-09-26 15:15:48 +02:00
cyril lopez
77d9677c03 Fix proptypes 2018-09-26 15:07:53 +02:00
cyril lopez
c49cc5f97b Check auth on aws 2018-09-26 14:43:10 +02:00
Jim LAURIE
46c9b0f966 3.0.0-alpha.14.2 2018-09-26 11:08:10 +02:00
cyril lopez
01f88c43dc Change register condition 2018-09-25 17:38:38 +02:00
cyril lopez
d96b888cc6 Improve login 2018-09-25 17:11:14 +02:00
cyril lopez
989b867714 Split admin entry point between dev and prod 2018-09-25 15:01:06 +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