yujunjun/strapi
1
0
Fork 0
mirror of https://github.com/strapi/strapi.git synced 2025-08-10 01:38:10 +00:00
Code Issues Packages Projects Releases Wiki Activity
15,766 Commits 115 Branches 488 Tags
Commit Graph

369 Commits

Author SHA1 Message Date
soupette
cf2bd304cf Upgrade buffet.js. Add icon to inputs label 
Signed-off-by: soupette <cyril.lpz@gmail.com>
 2021-03-04 11:59:26 +01:00
Alexandre Bodin
469991f9f2 Merge branch 'master' into features/i18n 2021-02-18 14:36:32 +01:00
Alexandre Bodin
d02a7ba2fa v3.5.0 2021-02-18 11:28:28 +01:00
HichamELBSI
1a42da3007 Merge branch 'master' into features/sso 2021-02-17 11:43:34 +01:00
dependabot[bot]
11005176ca
Bump swagger-ui-dist from 3.41.1 to 3.43.0 (#9413) 
Bumps [swagger-ui-dist](https://github.com/swagger-api/swagger-ui) from 3.41.1 to 3.43.0.
- [Release notes](https://github.com/swagger-api/swagger-ui/releases)
- [Commits](https://github.com/swagger-api/swagger-ui/compare/v3.41.1...v3.43.0)

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

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
 2021-02-16 09:42:51 +01:00
alexey
e29483bb09
plugin-documentation: added missed manyWay relation (#9379) 2021-02-15 09:34:12 +01:00
alexey
b2d73ccefc
plugin-documentation: added enum for associations (#9381) 2021-02-15 09:32:24 +01:00
ngjoni
92ba4efb2b
Translation Update (german) (#9387) 
* update german translation

* Additional german translation
 2021-02-15 09:21:10 +01:00
Convly
4369af5361 Merge branch 'master' of github.com:strapi/strapi into features/sso 2021-02-09 15:26:28 +01:00
Alexandre Bodin
544f98b8ee v3.4.6 2021-02-03 19:32:36 +01:00
Alexandre Bodin
8287e2ea21 Merge branch 'master' into features/sso 2021-02-03 12:11:03 +01:00
Bobby Glidwell
76b2dfedbb
fix typo "to access to" (#9303) 2021-02-03 09:51:11 +01:00
Alexandre Bodin
4c3bd90ec0 Merge branch 'develop' into features/sso 2021-02-02 10:51:28 +01:00
soupette
88919eb84c Upgrade buffet.js 
Signed-off-by: soupette <cyril.lpz@gmail.com>
 2021-02-01 14:32:58 +01:00
dependabot[bot]
58716287cf
Bump swagger-ui-dist from 3.39.0 to 3.41.1 (#9253) 
Bumps [swagger-ui-dist](https://github.com/swagger-api/swagger-ui) from 3.39.0 to 3.41.1.
- [Release notes](https://github.com/swagger-api/swagger-ui/releases)
- [Commits](https://github.com/swagger-api/swagger-ui/compare/v3.39.0...v3.41.1)

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

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
 2021-01-29 10:32:05 +01:00
Alexandre Bodin
5524d72396 Merge branch 'master' into features/i18n 2021-01-28 11:35:17 +01:00
Convly
bd91f748d8 Merge master into features/sso 2021-01-27 16:34:43 +01:00
Jorrit Schippers
3f63902d4b
Use https:// in package.json and README.md files (#9227) 
Signed-off-by: Jorrit Schippers <jorrit@ncode.nl>
 2021-01-26 17:06:25 +01:00
Alexandre Bodin
4f9cc8a22c v3.4.5 2021-01-26 11:59:47 +01:00
Pierre Noël
3729f69e08 init i18n plugin 2021-01-22 17:57:15 +01:00
Alexandre Bodin
542786f263 v3.4.4 2021-01-20 17:31:59 +01:00
Alexandre Bodin
553d64cafd v3.4.3 2021-01-14 10:46:50 +01:00
dependabot[bot]
5423f36781
Bump swagger-ui-dist from 3.35.0 to 3.39.0 (#9122) 
Bumps [swagger-ui-dist](https://github.com/swagger-api/swagger-ui) from 3.35.0 to 3.39.0.
- [Release notes](https://github.com/swagger-api/swagger-ui/releases)
- [Commits](https://github.com/swagger-api/swagger-ui/compare/v3.35.0...v3.39.0)

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

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
 2021-01-14 10:12: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
Kim, Harim
ac3d10006c
Add session option to Strapi query for Mongo Multi-Document transaction (#6447) 
* add session option to mongo queries for transaction

Signed-off-by: harimkims <harimkims@gmail.com>

* seperate session parameter in buildQuery functions

Signed-off-by: harimkims <harimkims@gmail.com>

* clarify comment about mongoose create requirement

Signed-off-by: harimkims <harimkims@gmail.com>

Co-authored-by: Convly <jean-sebastien.herbaux@epitech.eu>
 2021-01-13 10:37:23 +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
RJ Perias
dd27a567e0
merge arrays in createDocObject and changed object equality function (#7420) 
* merge arrays in createDocObject and changed object equality function

Signed-off-by: gh0stsh0t <rjperias0213@gmail.com>

* added custom comparator for array of objects

Signed-off-by: gh0stsh0t <rjperias0213@gmail.com>

* recursive compare to remove sort
 2021-01-08 15:38:25 +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
0f33931d28 Update buffetjs 
Signed-off-by: HichamELBSI <elabbassih@gmail.com>
 2021-01-04 14:47:54 +01:00
dependabot[bot]
24ddb69bc0
Bump cheerio from 1.0.0-rc.3 to 1.0.0-rc.5 (#9014) 
Bumps [cheerio](https://github.com/cheeriojs/cheerio) from 1.0.0-rc.3 to 1.0.0-rc.5.
- [Release notes](https://github.com/cheeriojs/cheerio/releases)
- [Changelog](https://github.com/cheeriojs/cheerio/blob/main/History.md)
- [Commits](https://github.com/cheeriojs/cheerio/compare/1.0.0-rc.3...v1.0.0-rc.5)

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

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
 2020-12-29 09:01:02 +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
cyril lopez
5f7992f7b3
Merge branch 'master' into fix/inputs-display 2020-12-21 09:38:00 +01:00
soupette
97e33908a0 Fix input uid 
Signed-off-by: soupette <cyril.lpz@gmail.com>
 2020-12-18 16:44:24 +01:00
DMehaffy
aad1c2fa03
Cleaning up codebase for doc repo move (#8892) 
* [WIP] Cleaning up codebase for doc repo move

WIP

* Fix deleted files, add links to doc repo issues

* Add repo note to readme
 2020-12-18 15:50:37 +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
dependabot[bot]
449944c435
Bump moment from 2.29.0 to 2.29.1 (#8748) 
Bumps [moment](https://github.com/moment/moment) from 2.29.0 to 2.29.1.
- [Release notes](https://github.com/moment/moment/releases)
- [Changelog](https://github.com/moment/moment/blob/develop/CHANGELOG.md)
- [Commits](https://github.com/moment/moment/compare/2.29.0...2.29.1)

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

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
 2020-11-26 13:11:04 +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
Yanuar Aditia
62231043ed
Add indonesian translations (#8384) 
* Add indonesian lang for strapi-admin & strapi-plugin-users-permission

* Add indonesian language for strapi-generate-plugin, strapi-plugin-content-manager, strapi-plugin-content-type, strapi-plugin-documentation, strapi-plugin-email

* Update Platform.sh button image URL (#8300)

Co-authored-by: Alexandre BODIN <alexandrebodin@users.noreply.github.com>
Signed-off-by: Yanuar Aditia <yanuaraditia@outlook.com>

* Add indonesian lang for strapi-admin & strapi-plugin-users-permission

Signed-off-by: Yanuar Aditia <yanuaraditia@outlook.com>

* Add indonesian language for strapi-generate-plugin, strapi-plugin-content-manager, strapi-plugin-content-type, strapi-plugin-documentation, strapi-plugin-email

Signed-off-by: Yanuar Aditia <yanuaraditia@outlook.com>

* Add indonesian translations

Signed-off-by: Yanuar Aditia <yanuaraditia@outlook.com>

Co-authored-by: yvesdo <yves@strapi.io>
Co-authored-by: Alexandre BODIN <alexandrebodin@users.noreply.github.com>
 2020-11-25 13:56:51 +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