yujunjun/strapi
1
0
Fork 0
mirror of https://github.com/strapi/strapi.git synced 2025-08-17 21:28:23 +00:00
Code Issues Packages Projects Releases Wiki Activity
9,273 Commits 117 Branches 489 Tags
Commit Graph

1304 Commits

Author SHA1 Message Date
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
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
395111170f
Merge branch 'master' into patch-1 2018-07-31 13:32:42 +02:00
soupette
3db2cc1ca1 Merge branch 'master' of github.com:strapi/strapi into settings-ctm-edit-view 2018-07-30 14:40:05 +02:00
Joshua F. Rountree
6eba67a1d0 Fixes height of buttons. 2018-07-29 15:46:46 -04:00
Joshua F. Rountree
89b0fdeecb Fixes admin buttons for links 2018-07-29 15:45:08 -04:00
Jim LAURIE
b29e03d032 Patch security command injection 2018-07-29 19:30:55 +02:00
Jim LAURIE
3e956670a9
Merge branch 'master' into fix/1609 2018-07-29 14:25:49 +02:00
Joao Bueno
721a14e3bf Translation keys missing in PT-BR language - Resolves #1625 2018-07-28 16:15:45 -03:00
Basile Bong
3bc0742abe Change > DE translation keys > use Inhaltstyp instead of Content-Typ 2018-07-27 17:14:45 +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
d7b12f1871 Merge branch 'master' of github.com:strapi/strapi into settings-ctm-edit-view 2018-07-27 12:19:19 +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
0796dd4876 Add > DE translation keys > strapi-admin 2018-07-26 13:21:41 +02:00
soupette
5830ed4a73 Display empty block when no fields in the editPage 2018-07-26 13:10:26 +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
Jim LAURIE
927a900f5b 3.0.0-alpha.13 2018-07-25 17:31:16 +02:00