yujunjun/strapi
1
0
Fork 0
mirror of https://github.com/strapi/strapi.git synced 2025-09-27 09:25:46 +00:00
Code Issues Packages Projects Releases Wiki Activity
15,371 Commits 129 Branches 498 Tags
Commit Graph

1742 Commits

Author SHA1 Message Date
Lennart Stolz
9137233bea
Translations: Updated the 'terms' translations for 'de' (#5589) 
"Terms and Conditions" are called "Allgemeine Geschäftsbedingungen" in
German (often abbreviated as "AGB") or "Nutzungsbedingungen".

In the context of the admin sign-up of 'strapi' I'd go for the latter.
(Research results attached to the pull request)

The previous version "Begriffe" is wrong in this context as it is the
literal translation of the word "term".

Signed-off-by: Lennart Stolz <lennartstolz@me.com>
 2020-03-27 11:15:35 +01:00
Virginie Ky
a5718f9eb7 Merge branch 'develop' of github.com:strapi/strapi into front/ui-improvements 2020-03-27 09:44:49 +01:00
soupette
86f6ad6d45 Fix delete media 
Signed-off-by: soupette <cyril.lpz@gmail.com>
 2020-03-26 12:34:43 +01:00
soupette
ec72b56f4f Fix PR feedback 
Signed-off-by: soupette <cyril.lpz@gmail.com>
 2020-03-25 15:21:02 +01:00
soupette
7d9dbb84a9 Fix conflicts 
Signed-off-by: soupette <cyril.lpz@gmail.com>
 2020-03-24 15:47:54 +01:00
Virginie Ky
278b708449 Merge branch 'features/media-lib-frontend' of github.com:strapi/strapi into front/media-lib-listview 
Signed-off-by: Virginie Ky <virginie.ky@gmail.com>
 2020-03-24 15:17:09 +01:00
HichamELBSI
998bfa9360 Merge branch 'features/media-lib-frontend' into media-lib/cm-modal 2020-03-24 09:56:55 +01:00
soupette
664db67436 Add delete logic to modal list upload 
Signed-off-by: soupette <cyril.lpz@gmail.com>
 2020-03-24 05:54:13 +01:00
soupette
dfb9530128 Merge branch 'features/media-lib-frontend' of github.com:strapi/strapi into front/media-lib-listview 2020-03-24 05:41:02 +01:00
HichamELBSI
f19fb580ec Update after review 
Signed-off-by: HichamELBSI <elabbassih@gmail.com>
 2020-03-23 23:28:30 +01:00
Virginie Ky
21f4e9fa2d Merge branch 'features/media-lib' of github.com:strapi/strapi into front/media-lib-listview 2020-03-23 22:32:07 +01:00
soupette
818927f7b5 Fix conflicts 
Signed-off-by: soupette <cyril.lpz@gmail.com>
 2020-03-23 14:33:17 +01:00
soupette
18772c98b8 Merge branch 'master' of github.com:strapi/strapi into develop 2020-03-23 14:19:34 +01:00
Virginie Ky
c69a84f91a Merge branch 'develop' of github.com:strapi/strapi into front/ui-improvements 
Signed-off-by: Virginie Ky <virginie.ky@gmail.com>
 2020-03-23 08:34:34 +01:00
Virginie Ky
0587843466 unit tests 
Signed-off-by: Virginie Ky <virginie.ky@gmail.com>
 2020-03-20 23:19:18 +01:00
Virginie Ky
ba57f2c801 pdf icons & color 
Signed-off-by: Virginie Ky <virginie.ky@gmail.com>
 2020-03-20 22:08:56 +01:00
HichamELBSI
2f4b7b4552 Add List view modal 
Signed-off-by: HichamELBSI <elabbassih@gmail.com>
 2020-03-20 17:12:23 +01:00
Mattias van den Belt
f8023cc66c
Update Dutch Translation and Typos [NL] (#5523) 
* Update Dutch Translation

Signed-off-by: MattieBelt <mattiasvandenbelt@gmail.com>

* Add new translation keys

Signed-off-by: MattieBelt <mattiasvandenbelt@gmail.com>

* Update strapi-admin translation [NL]

Signed-off-by: MattieBelt <mattiasvandenbelt@gmail.com>

* Sort translation [NL]

Signed-off-by: MattieBelt <mattiasvandenbelt@gmail.com>

* Update dutch content-types translations

Signed-off-by: MattieBelt <mattiasvandenbelt@gmail.com>

Co-authored-by: Nikolay Tyurin <kolya_tyurin@mail.ru>
 2020-03-20 17:10:55 +01:00
Virginie Ky
8d52924783 apply design review 
Signed-off-by: Virginie Ky <virginie.ky@gmail.com>
 2020-03-20 15:09:06 +01:00
Virginie Ky
541cd72e97 Admin leftmenu bullet icon 
Signed-off-by: Virginie Ky <virginie.ky@gmail.com>
 2020-03-20 14:40:56 +01:00
Virginie Ky
dc12ab9905 Merge branch 'front/ui-fixes' of github.com:strapi/strapi into front/ui-fixes 2020-03-20 10:09:52 +01:00
Virginie Ky
12116c149b update snapshots 
Signed-off-by: Virginie Ky <virginie.ky@gmail.com>
 2020-03-20 10:09:32 +01:00
Virginie Ky
b46058a780 icon type UI 
Signed-off-by: Virginie Ky <virginie.ky@gmail.com>
 2020-03-18 23:31:02 +01:00
Virginie Ky
5614acdf9c filters by mime, tags by type and count 
Signed-off-by: Virginie Ky <virginie.ky@gmail.com>
 2020-03-18 00:47:16 +01:00
Virginie Ky
fe20425215 Merge branch 'develop' of github.com:strapi/strapi into front/ui-improvements 2020-03-16 14:52:58 +01:00
soupette
23cdc180b9 Merge branch 'develop' of github.com:strapi/strapi into features/media-lib 2020-03-12 17:45:42 +01:00
soupette
a46590feda Add infos 
Signed-off-by: soupette <cyril.lpz@gmail.com>
 2020-03-12 09:41:37 +01:00
soupette
e47b451f7c Require version from package.json instead of using the data from the back-end 
Signed-off-by: soupette <cyril.lpz@gmail.com>
 2020-03-12 09:41:37 +01:00
Virginie Ky
6cc7d070e8 remove unused file 
Signed-off-by: Virginie Ky <virginie.ky@gmail.com>
 2020-03-09 15:35:53 +01:00
Virginie Ky
245cd894df update snapshots 
Signed-off-by: Virginie Ky <virginie.ky@gmail.com>
 2020-03-09 14:59:40 +01:00
soupette
faa1873003 Update doc 
Signed-off-by: soupette <cyril.lpz@gmail.com>
 2020-03-06 13:44:54 +01:00
soupette
f3bcddcf89 Identify front-end core files 
Signed-off-by: soupette <cyril.lpz@gmail.com>
 2020-03-06 13:33:32 +01:00
cyril lopez
15a1578a2d
Merge pull request #5431 from strapi/core/admin-field-api 
Introducing the front-end Field API
 2020-03-06 11:43:20 +01:00
Virginie Ky
b69d3f807d Merge branch 'develop' of github.com:strapi/strapi into front/ui-improvements 
Signed-off-by: Virginie Ky <virginie.ky@gmail.com>
 2020-03-05 19:18:35 +01:00
virginieky
2634d0ace8
Merge branch 'features/media-lib' into front/img-preview 2020-03-05 17:59:22 +01:00
soupette
5909b2c222 Merge branch 'features/media-lib' of github.com:strapi/strapi into core/admin-field-api 
Signed-off-by: soupette <cyril.lpz@gmail.com>
 2020-03-05 17:41:54 +01:00
Virginie Ky
8f24f1537c Merge branch 'features/media-lib' of github.com:strapi/strapi into front/img-preview 2020-03-05 15:15:04 +01:00
virginieky
7583b035a9
Merge branch 'features/media-lib' into front/media-library-filter 2020-03-05 14:48:55 +01:00
soupette
3f8a487fab Created field API and added it to the content manager 
Signed-off-by: soupette <cyril.lpz@gmail.com>
 2020-03-05 14:43:00 +01:00
soupette
267cc069e3 Fix conflicts 
Signed-off-by: soupette <cyril.lpz@gmail.com>
 2020-03-05 14:26:00 +01:00
soupette
e9063f1a6d Fix scrollbar and alignment 
Signed-off-by: soupette <cyril.lpz@gmail.com>
 2020-03-05 14:15:46 +01:00
soupette
02dc3640d8 Fix PR feedback 
Signed-off-by: soupette <cyril.lpz@gmail.com>
 2020-03-05 12:15:11 +01:00
soupette
9d25a0167d Fix menu scrollbar feedback from designer 
Signed-off-by: soupette <cyril.lpz@gmail.com>
 2020-03-05 12:11:28 +01:00
Virginie Ky
d425afd90b code review 
Signed-off-by: Virginie Ky <virginie.ky@gmail.com>
 2020-03-05 11:21:23 +01:00
soupette
4855f244bc Add file info 
Signed-off-by: soupette <cyril.lpz@gmail.com>
 2020-03-05 10:56:05 +01:00
soupette
f1de079d77 Fix conflicts 
Signed-off-by: soupette <cyril.lpz@gmail.com>
 2020-03-05 10:22:49 +01:00
Mariusz Wachowski
7c8885d031 added custom scrollbar styles 
Signed-off-by: Mariusz Wachowski <wachowski.mariusz@gmail.com>
 2020-03-04 21:27:09 +01:00
Mariusz Wachowski
da328f7c96 fix: separate menu sections + fit sections to available space 
Signed-off-by: Mariusz Wachowski <wachowski.mariusz@gmail.com>
 2020-03-04 21:27:09 +01:00
soupette
80cedb9014 Add fix for previous app using config.js override 
Signed-off-by: soupette <cyril.lpz@gmail.com>
 2020-03-04 17:46:55 +01:00
Virginie Ky
14e7e07c23 Merge branch 'features/media-lib' of github.com:strapi/strapi into front/media-library-filter 
Signed-off-by: Virginie Ky <virginie.ky@gmail.com>
 2020-03-04 17:17:36 +01:00