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

1359 Commits

Author SHA1 Message Date
soupette
8f958553b9 Fix conflicts 
Signed-off-by: soupette <cyril.lpz@gmail.com>
 2021-01-26 10:06:16 +01:00
Alexandre Bodin
542786f263 v3.4.4 2021-01-20 17:31:59 +01:00
p_0g_8mm3_
86242a01b2
Update German translations (#9141) 
* fix typos

* use more common words for relation

* simplify, shorten

* make translations consistent

* improve upload plugin translation

* fix minor errors

* fix permissions plugin translations

* change mail back to kai@doe.com

* change name back to Kai Doe

Co-authored-by: Alexandre BODIN <alexandrebodin@users.noreply.github.com>
 2021-01-18 17:49:30 +01:00
Alexandre Bodin
553d64cafd v3.4.3 2021-01-14 10:46:50 +01:00
Alexandre Bodin
7505de6ad9 v3.4.2 2021-01-13 12:16:44 +01:00
Jorrit Schippers
8d88f5e97f
Consolidate lodash dependency to 4.17.20 (#8861) 
Signed-off-by: Jorrit Schippers <jorrit@ncode.nl>

Co-authored-by: Pierre Noël <petersg83@users.noreply.github.com>
 2021-01-13 12:08:13 +01:00
HichamELBSI
a660b493f6 Add tooltip on strapi-upload-plugin 
Signed-off-by: HichamELBSI <elabbassih@gmail.com>
 2021-01-12 17:25:48 +01:00
Convly
5228236246 Merge branch 'master' into features/sso 2021-01-12 11:36:11 +01:00
Davide Rossi
e268b0bd6b
Improves Italian translation (#8961) 
* Fixes italian translations for filter function

* Fixes some inconsistencies and adds some missing strings to italian translation of content-type-builder plugin

* Adds all the missing strings in IT translation for content-type-builder plugin

* Fixes and updates italian translation of content-manager plugin

* Updates italian translation of content-type-builder plugin

* Updates italian translation for users-permissions and documentation plugin

* Updates italian translations of admin UI and various plugins

* Minor style fixes on italian translation of users-permissions plugin
 2021-01-11 16:54:17 +01:00
Convly
2a483ba958 Cleanup 
Signed-off-by: Convly <jean-sebastien.herbaux@epitech.eu>
 2021-01-08 10:09:08 +01:00
Convly
857a78e252 Add all missing e2e tests (draft) 
Signed-off-by: Convly <jean-sebastien.herbaux@epitech.eu>
 2021-01-08 09:52:22 +01:00
HichamELBSI
47d641d8c0 Fix UI review on SSO 
Signed-off-by: HichamELBSI <elabbassih@gmail.com>
 2021-01-07 17:37:12 +01:00
HichamELBSI
04be3d81ee Remove duplicate components from Upload plugin 
Signed-off-by: HichamELBSI <elabbassih@gmail.com>
 2021-01-06 17:35:44 +01:00
HichamELBSI
0f33931d28 Update buffetjs 
Signed-off-by: HichamELBSI <elabbassih@gmail.com>
 2021-01-04 14:47:54 +01:00
HichamELBSI
937b002a1e Fix upload filter picker 
Signed-off-by: HichamELBSI <elabbassih@gmail.com>
 2021-01-04 14:47:54 +01:00
HichamELBSI
3810f7c71d Update BuffetJS 
Signed-off-by: HichamELBSI <elabbassih@gmail.com>
 2020-12-28 15:05:29 +01:00
soupette
8b9c3f2052 v3.4.1 2020-12-22 16:52:46 +01:00
soupette
43d476660a Upgrade buffet.js 
Signed-off-by: soupette <cyril.lpz@gmail.com>
 2020-12-21 10:50:49 +01:00
soupette
97e33908a0 Fix input uid 
Signed-off-by: soupette <cyril.lpz@gmail.com>
 2020-12-18 16:44:24 +01:00
Christopher Wray
99d39f5d4c
cwray-tech/update plugin descriptions (#8921) 
* Changed plugin description-more helpful text

The marketplace area in the cms shows this text, so I thought this would be a little more helpful than the default text.

Signed-off-by: Christopher Wray <53663762+cwray-tech@users.noreply.github.com>

* updated Graphql description text

* Update email description

* update upload description
 2020-12-18 09:53:46 +01:00
Alexandre Bodin
ea636b4d31 v3.4.0 2020-12-17 13:18:50 +01:00
Alexandre Bodin
aa3d7eb2e0 Merge branch 'master' into feature/relational-fields 2020-12-17 12:58:34 +01:00
p_0g_8mm3_
3304ae3e11
[admin, translations] Translate documentation plugin and add German translations to index of upload plugin (#8803) 
* add German translations of upload plugin to index

* Translate the documentation plugin
 2020-12-17 12:54:14 +01:00
HichamELBSI
53231b5833 Merge branch 'master' into feature/relational-fields 2020-12-16 10:17:47 +01:00
HichamELBSI
f09e4e0b56 Add buffet LoadingIndicator 
Signed-off-by: HichamELBSI <elabbassih@gmail.com>
 2020-12-11 14:27:03 +01:00
soupette
0bb2897884 Use carret compo in ML sort picker and admin users list 
Signed-off-by: soupette <cyril.lpz@gmail.com>
 2020-12-10 18:54:59 +01:00
dependabot[bot]
4dcbd40819
Bump byte-size from 6.2.0 to 7.0.0 (#8858) 
Bumps [byte-size](https://github.com/75lb/byte-size) from 6.2.0 to 7.0.0.
- [Release notes](https://github.com/75lb/byte-size/releases)
- [Commits](https://github.com/75lb/byte-size/compare/v6.2.0...v7.0.0)

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
 2020-12-10 09:43:32 +01:00
soupette
bff450688b Use picker from buffet in ML 
Signed-off-by: soupette <cyril.lpz@gmail.com>
 2020-12-09 16:39:37 +01:00
Robin Simonklein
e01d287e8f
Add some admin french translations (#8665) 
* v3.3.3

Signed-off-by: Robin Simonklein <rsimonklein@gmail.com>

* Add french translations for draft/publish feature

Signed-off-by: Robin Simonklein <rsimonklein@gmail.com>

* Add french translations for media library

Signed-off-by: Robin Simonklein <rsimonklein@gmail.com>

* Fix typo

Signed-off-by: Robin Simonklein <rsimonklein@gmail.com>

* Add some missing french translations

Signed-off-by: Robin Simonklein <rsimonklein@gmail.com>

* Content-manager actions french translations

Signed-off-by: Robin Simonklein <rsimonklein@gmail.com>

* Add missing french translations for users settings & auth

Signed-off-by: Robin Simonklein <rsimonklein@gmail.com>

* Add "select all" french translation

Signed-off-by: Robin Simonklein <rsimonklein@gmail.com>

Co-authored-by: Alexandre Bodin <bodin.alex@gmail.com>
 2020-12-04 11:06:45 +01:00
cyril lopez
3c9686f986
Merge pull request #8727 from strapi/relational-fields/display-in-list 
Display relational fields in the list view
 2020-11-26 09:46:38 +01:00
Alexandre Bodin
c9c936ba41 Merge branch 'master' into feature/relational-fields 
Signed-off-by: Alexandre Bodin <bodin.alex@gmail.com>
 2020-11-25 16:37:32 +01:00
Alexandre Bodin
9b28991d8a v3.3.4 2020-11-25 16:22:45 +01:00
HichamELBSI
91d772186b Display relational field in the list view 
Signed-off-by: HichamELBSI <elabbassih@gmail.com>
 2020-11-23 22:49:40 +01:00
soupette
61a3740c06 Fix conflicts 
Signed-off-by: soupette <cyril.lpz@gmail.com>
 2020-11-23 14:43:07 +01:00
Moritz Eck
c7c14dccf0
Merge branch 'master' into feature/german-translations-update 2020-11-16 16:54:38 +01:00
Alexandre Bodin
5fe7fa2f79 v3.3.3 2020-11-16 16:47:16 +01:00
Jean-Sébastien Herbaux
4a33829f11
Sanitize /upload/search/:q route (#8658) 
Signed-off-by: Convly <jean-sebastien.herbaux@epitech.eu>
 2020-11-16 12:55:35 +01:00
Moritz Eck
b368bb41ed add & improve german translations 
Signed-off-by: Moritz Eck <moritz.eck@gmail.com>
 2020-11-11 19:21:55 +01:00
Alexandre Bodin
17ea510715 v3.3.2 2020-11-10 19:02:11 +01:00
Alexandre Bodin
98bb6a3d31 v3.3.1 2020-11-09 19:22:52 +01:00
Pierre Noël
ec1c2a22c3 v3.3.0 2020-11-09 17:55:10 +01:00
Alexandre Bodin
08a603623b Cleanup tests 
Signed-off-by: Alexandre Bodin <bodin.alex@gmail.com>
 2020-11-02 19:41:46 +01:00
Alexandre Bodin
07e7cfc0bd Make lint stricter and fix the errors 
Signed-off-by: Alexandre Bodin <bodin.alex@gmail.com>
 2020-11-02 19:41:42 +01:00
cyril lopez
fd3e54b821
Merge branch 'master' into features/application-settings 2020-11-02 16:14:44 +01:00
Eneko Rodríguez
3cba913a2f feat: improve spanish translations 
Signed-off-by: Eneko Rodríguez <eneko.rodriguez99@gmail.com>
 2020-10-31 20:19:41 +01:00
soupette
30cb4f4226 Merge branch 'master' of github.com:strapi/strapi into features/application-settings 2020-10-27 17:28:39 +01:00
Alexandre Bodin
c78591553f v3.2.5 2020-10-22 17:40:58 +02:00
Alexandre BODIN
328c1a3a13
Merge pull request #8442 from strapi/security/upload-proxy-disable 
Remove usage of unsecure proxy for now
 2020-10-22 17:37:28 +02:00
Alexandre Bodin
fbf831355d Remove usage of unsecure proxy for now 
Signed-off-by: Alexandre Bodin <bodin.alex@gmail.com>
 2020-10-22 17:07:38 +02:00
Derrick Mehaffy
0b4a8109e2 Fix #8413 - Immer dependancy 
Signed-off-by: Derrick Mehaffy <derrickmehaffy@gmail.com>
 2020-10-21 07:03:46 -07:00