yujunjun/strapi
1
0
Fork 0
mirror of https://github.com/strapi/strapi.git synced 2025-10-30 01:17:28 +00:00
Code Issues Packages Projects Releases Wiki Activity
14,792 Commits 118 Branches 506 Tags
Commit Graph

14792 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
dependabot[bot]
a4e904ec6a
Bump @testing-library/react from 10.4.8 to 11.0.2 (#7726) 
Bumps [@testing-library/react](https://github.com/testing-library/react-testing-library) from 10.4.8 to 11.0.2.
- [Release notes](https://github.com/testing-library/react-testing-library/releases)
- [Changelog](https://github.com/testing-library/react-testing-library/blob/master/CHANGELOG.md)
- [Commits](https://github.com/testing-library/react-testing-library/compare/v10.4.8...v11.0.2)

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

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
 2020-09-04 15:24:37 +02:00
Manoj Paramesh
2080057918
FluidContainer: Fix overlapping on pagination tabs (#7289) 
Signed-off-by: Manoj P <thedarkstrix@gmail.com>
 2020-09-04 14:44:37 +02:00
Khalid Elshafie
3e23646f1b
Add LinkedIn auth provider (#7490) 
* Add LinkedIn auth provider

Signed-off-by: Khalid Elshafie <abolkog@gmail.com>
 2020-09-04 14:37:30 +02:00
Sebastian Campos
6dce6e362f
fixed typo (#7643) 2020-09-04 14:03:12 +02:00
Amir
f8437184ca
Fix typo in controllers.md (#7721) 
The default SingleType service doesn't have an findOne() function only find().
See https://github.com/strapi/strapi/issues/7718 for details

Signed-off-by: Amir Lellouche <lalosher@gmail.com>
 2020-09-04 13:58:46 +02:00
Darron Park
b3bb9f6e3f
Update sharp module to 0.26.0 (#7729) 2020-09-04 13:50:08 +02:00
Jason Prado
69706d7587
Add sqlite details to unit testing guide (#7603) 2020-09-04 12:27:43 +02:00
Abdón Rodríguez Davila
d2ef1d4b8c
Allow more options to the Apollo Server config (#7665) 
* Extract server config to a constant

Signed-off-by: Abdón Rodríguez Davila <a@abdonrd.com>

* Omit options to server config

Signed-off-by: Abdón Rodríguez Davila <a@abdonrd.com>

* Move default config to serverParams

Signed-off-by: Abdón Rodríguez Davila <a@abdonrd.com>

* Simplify Apollo server config

Signed-off-by: Abdón Rodríguez Davila <a@abdonrd.com>

* Simplify with a new apolloServerConfig property

Signed-off-by: Abdón Rodríguez Davila <a@abdonrd.com>

* Update tracing documentation

Signed-off-by: Abdón Rodríguez Davila <a@abdonrd.com>

* Extract deprecated options

Signed-off-by: Abdón Rodríguez Davila <a@abdonrd.com>

* Add default options

Signed-off-by: Abdón Rodríguez Davila <a@abdonrd.com>

* Update documentation

Signed-off-by: Abdón Rodríguez Davila <a@abdonrd.com>

* Rename to deprecatedApolloServerConfig

Signed-off-by: Abdón Rodríguez Davila <a@abdonrd.com>

* Empty default options

Signed-off-by: Abdón Rodríguez Davila <a@abdonrd.com>

* Update default config

Signed-off-by: Abdón Rodríguez Davila <a@abdonrd.com>

* Add warning note

Signed-off-by: Abdón Rodríguez Davila <a@abdonrd.com>

* Add documentation note

Signed-off-by: Abdón Rodríguez Davila <a@abdonrd.com>

* Update documentation note

Signed-off-by: Abdón Rodríguez Davila <a@abdonrd.com>

* Fix the config check

Signed-off-by: Abdón Rodríguez Davila <a@abdonrd.com>

* Fix the config check

Signed-off-by: Abdón Rodríguez Davila <a@abdonrd.com>

* Refactor old code and rename param to appoloServer to avoid redondancy

Signed-off-by: Alexandre Bodin <bodin.alex@gmail.com>

* Fix typo

Signed-off-by: Alexandre Bodin <bodin.alex@gmail.com>

Co-authored-by: Alexandre Bodin <bodin.alex@gmail.com>
 2020-09-04 09:51:11 +02:00
Jim LAURIE
b3b335c090
Merge pull request #7661 from strapi/docs/heroku/pg 
Heroku PG DB env variable deconstruction automatically
 2020-09-03 19:01:23 +02:00
cyril lopez
5364191ea1
Fixes #7232 (#7715) 
Signed-off-by: soupette <cyril.lpz@gmail.com>
 2020-09-03 16:21:10 +02:00
Sebastian Trebunak
dad69f5cc4
Improve & add missing Slovak (SK) translations (#7515) 
* Improve & add missing SK translations

Signed-off-by: Sebastian Trebunak <trebunak.sebastian@gmail.com>

* fix one tr string

Signed-off-by: Sebastian Trebunak <trebunak.sebastian@gmail.com>

* Add translation for strapi-plugin-upload

Signed-off-by: Sebastian Trebunak <trebunak.sebastian@gmail.com>

* Add 'sk' to export from languages of strapi upload plugin

Signed-off-by: Sebastian Trebunak <trebunak.sebastian@gmail.com>

* Refine and add missing translations for content-type-builder plugin,, Fix some of previous translations

Signed-off-by: Sebastian Trebunak <trebunak.sebastian@gmail.com>

* Refine content-type-builder SK translations

Signed-off-by: Sebastian Trebunak <trebunak.sebastian@gmail.com>

* Add missing translation strings for strapi-plugin-content-manger plugin

Signed-off-by: Sebastian Trebunak <trebunak.sebastian@gmail.com>

* Add missing translation strings for strapi-plugin-users-permission plugin

Signed-off-by: Sebastian Trebunak <trebunak.sebastian@gmail.com>

* Refine content type builder translation string to distinguish more precisely between collection title and name

Signed-off-by: Sebastian Trebunak <trebunak.sebastian@gmail.com>

* Refine one label string

Signed-off-by: Sebastian Trebunak <trebunak.sebastian@gmail.com>

* Fix some strings in content-manager

Signed-off-by: Sebastian Trebunak <trebunak.sebastian@gmail.com>

* Fix single component translation string

Signed-off-by: Sebastian Trebunak <trebunak.sebastian@gmail.com>

Co-authored-by: cyril lopez <cyril.lpz@gmail.com>
Co-authored-by: Alexandre BODIN <alexandrebodin@users.noreply.github.com>
 2020-09-03 16:20:07 +02:00
Wessel van der Linden
9610f4c011
Find file to edit in all available files (#7459) 
This resolves https://github.com/strapi/strapi/issues/7458

Signed-off-by: Wessel van der Linden <wessel.linden@gmail.com>

Co-authored-by: cyril lopez <cyril.lpz@gmail.com>
 2020-09-03 16:18:31 +02:00
Kirill Artihovich
b6a0c1b203
fix strapi-plugin-content-type-builder (#7521) 
* Update retrieveComponentsFromSchema.js

~ fixed ReferenceError: Cannot access 'allComponents' before initialization

* strapi-plugin-content-type-builder fix

~ fixed cannot access 'originalIcon' before initialization
 2020-09-03 16:17:49 +02:00
dependabot[bot]
925f09ee7b
Bump immer from 6.0.5 to 7.0.8 (#7711) 
Bumps [immer](https://github.com/immerjs/immer) from 6.0.5 to 7.0.8.
- [Release notes](https://github.com/immerjs/immer/releases)
- [Commits](https://github.com/immerjs/immer/compare/v6.0.5...v7.0.8)

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

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
 2020-09-03 16:17:02 +02:00
Pierre Noël
af773f4d5c Merge branch 'master' into documentation 2020-09-03 16:13:50 +02:00
soupette
84ac0f7c07 Fix wrong prop 
Signed-off-by: soupette <cyril.lpz@gmail.com>
 2020-09-03 14:23:09 +02:00
Rémi de Juvigny
5b338782c4
Add Strapi edition to the admin footer (#7704) 
* Update admin footer wording

Signed-off-by: Rémi de Juvigny <remi@hey.com>

* Add dash symbol

Signed-off-by: Rémi de Juvigny <remi@hey.com>

Co-authored-by: cyril lopez <cyril.lpz@gmail.com>
 2020-09-03 12:29:08 +02:00
Cr0s4k
7baad9bbfd
Update file info mutation (#7691) 
* added new updateFileInfo mutation

Signed-off-by: Omar Garcia <omarcruz11@hotmail.com>

* added test

Signed-off-by: Omar Garcia <omarcruz11@hotmail.com>

* fixed test

Signed-off-by: Omar Garcia <omarcruz11@hotmail.com>

* Added fileInfoInput

Signed-off-by: Omar Garcia <omarcruz11@hotmail.com>
 2020-09-03 12:17:40 +02:00
soupette
c62d5810e3 Fixes #7699 
Signed-off-by: soupette <cyril.lpz@gmail.com>
 2020-09-03 12:09:11 +02:00
Rémi de Juvigny
e327d8ccfd Expanded templates docs 
Signed-off-by: Rémi de Juvigny <remi@hey.com>
 2020-09-03 11:25:38 +02:00
Cr0s4k
4987c1dbd9
fixed comment (#7714) 
Signed-off-by: Omar Garcia <omarcruz11@hotmail.com>
 2020-09-03 09:51:38 +02:00
dependabot[bot]
240b1cba9f
Bump cli-table3 from 0.5.1 to 0.6.0 (#7712) 
Bumps [cli-table3](https://github.com/cli-table/cli-table3) from 0.5.1 to 0.6.0.
- [Release notes](https://github.com/cli-table/cli-table3/releases)
- [Changelog](https://github.com/cli-table/cli-table3/blob/master/CHANGELOG.md)
- [Commits](https://github.com/cli-table/cli-table3/compare/v0.5.1...v0.6.0)

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

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
 2020-09-03 09:27:09 +02:00
Alexandre BODIN
38eb2d50bc
Merge pull request #7713 from strapi/dependabot/npm_and_yarn/koa-views-6.3.0 
Bump koa-views from 6.2.1 to 6.3.0
 2020-09-03 09:26:33 +02:00
dependabot[bot]
dff9111673
Bump koa-views from 6.2.1 to 6.3.0 
Bumps [koa-views](https://github.com/queckezz/koa-views) from 6.2.1 to 6.3.0.
- [Release notes](https://github.com/queckezz/koa-views/releases)
- [Changelog](https://github.com/queckezz/koa-views/blob/master/history.md)
- [Commits](https://github.com/queckezz/koa-views/compare/v6.2.1...v6.3.0)

Signed-off-by: dependabot[bot] <support@github.com>
 2020-09-03 05:55:47 +00:00
DMehaffy
b02bb62cc1
Add example for PG SSL CA verification (#7700) 2020-09-02 08:23:55 -07:00
Alexandre Bodin
6905be68bc Merge branch 'documentation' 2020-09-02 17:23:41 +02:00
DMehaffy
024b337b09
Update node version requirements for v10 to v12 (#7409) 
Signed-off-by: Derrick Mehaffy <derrickmehaffy@gmail.com>
 2020-09-02 17:11:59 +02:00
Igor Samokhovets
91ace0d1ec
Fix kind attribute update query in beta.17 to beta.18 migration guide (#7583) 
* Update migration-guide-beta.17-to-beta.18.md

Replace positional operator ($) with all positional operator($[])

* $ -> $[]
 2020-09-02 17:07:25 +02:00
dependabot[bot]
a6ccb1c0a8
Bump webpack-cli from 3.3.11 to 3.3.12 (#7432) 
Bumps [webpack-cli](https://github.com/webpack/webpack-cli) from 3.3.11 to 3.3.12.
- [Release notes](https://github.com/webpack/webpack-cli/releases)
- [Changelog](https://github.com/webpack/webpack-cli/blob/v3.3.12/CHANGELOG.md)
- [Commits](https://github.com/webpack/webpack-cli/compare/v3.3.11...v3.3.12)

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

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
 2020-09-02 17:00:27 +02:00
An owlet
74d7295911
Remove flag in language selection (#7102) 
* Flag is not language!

Signed-off-by: 潘志坚 <jim.pan@dji.com>

* Flag is not language

Signed-off-by: 潘志坚 <jim.pan@dji.com>

* Change locale to native name

Signed-off-by: 潘志坚 <jim.pan@dji.com>

* Add test languageNativeNames

Signed-off-by: 潘志坚 <jim.pan@dji.com>

* Uppercase the first letter of the native language name

Signed-off-by: 潘志坚 <jim.pan@dji.com>
 2020-09-02 13:52:14 +02:00
Alexandre BODIN
005db790c2
Merge pull request #7689 from strapi/dependabot/npm_and_yarn/graphql-playground-middleware-koa-1.6.19 
Bump graphql-playground-middleware-koa from 1.6.12 to 1.6.19
 2020-09-02 09:57:32 +02:00
Alexandre BODIN
86a5f16731
Merge pull request #7672 from strapi/fix/server-init 
Setup http server in Strapi constructor
 2020-09-02 09:55:38 +02:00
dependabot[bot]
71a3ba3378
Bump graphql-playground-middleware-koa from 1.6.12 to 1.6.19 
Bumps [graphql-playground-middleware-koa](https://github.com/graphcool/graphql-playground) from 1.6.12 to 1.6.19.
- [Release notes](https://github.com/graphcool/graphql-playground/releases)
- [Commits](https://github.com/graphcool/graphql-playground/commits/graphql-playground-middleware-koa@1.6.19)

Signed-off-by: dependabot[bot] <support@github.com>
 2020-09-02 06:00:38 +00:00
dependabot[bot]
46e8375cd7
Bump fs-extra from 8.1.0 to 9.0.1 (#7496) 
Bumps [fs-extra](https://github.com/jprichardson/node-fs-extra) from 8.1.0 to 9.0.1.
- [Release notes](https://github.com/jprichardson/node-fs-extra/releases)
- [Changelog](https://github.com/jprichardson/node-fs-extra/blob/master/CHANGELOG.md)
- [Commits](https://github.com/jprichardson/node-fs-extra/compare/8.1.0...9.0.1)

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

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
 2020-09-01 17:16:09 +02:00
Vinit Sarvade
dcd5254e60
Use brcrypt.compare for password validation instead of compareSync (#7612) 
Signed-off-by: Vinit Sarvade <vinit.sarvade.08@gmail.com>
 2020-09-01 17:03:37 +02:00
Alexandre Bodin
3bd10d605d Fix https://github.com/strapi/strapi/issues/7561 
Signed-off-by: Alexandre Bodin <bodin.alex@gmail.com>
 2020-09-01 14:59:08 +02:00
Derrick Mehaffy
5900b488de Heroku PG DB env variable deconstruction automatically 2020-08-31 14:25:33 -07:00
Alexandre BODIN
77be3ea4c5
Merge pull request #7467 from strapi/users-permissions/create-new-role 
Users and Permissions in Settings menu
 2020-08-31 15:33:02 +02:00
Alexandre BODIN
d1e8b8df7c
Merge pull request #7450 from strapi/dependabot/npm_and_yarn/react-16.13.1 
Bump react from 16.13.0 to 16.13.1
 2020-08-31 15:24:08 +02:00
soupette
16261bb156 Fix PR feedback 
Signed-off-by: soupette <cyril.lpz@gmail.com>
 2020-08-31 14:17:30 +02:00
Rémi de Juvigny
3f7407f5d0
Merge branch 'master' into templates-cli 2020-08-31 12:36:18 +02:00
Rémi de Juvigny
81d587e11e Prevent template from overwriting uuid 
Signed-off-by: Rémi de Juvigny <remi@hey.com>
 2020-08-31 12:32:21 +02:00
soupette
a9a978466e Fix conflicts 
Signed-off-by: soupette <cyril.lpz@gmail.com>
 2020-08-31 12:17:33 +02:00
Valerian Pereira
e6511a9f74
GraphQL Typos fixed to improve documentation (#7644) 
Signed-off-by: Valerian Pereira <valerianpereira25@gmail.com>
 2020-08-30 14:39:05 -07:00
cyril lopez
64de3a2ea2
Merge pull request #7606 from strapi/deps/bump-buffetjs 
Bump Buffet.js version
 2020-08-28 16:56:50 +02:00
Rémi de Juvigny
ea5eaafb66 Document templates usage and creation 
Signed-off-by: Rémi de Juvigny <remi@hey.com>
 2020-08-28 16:20:22 +02:00
soupette
1c4fafeeee Change users plugin settings menu section label 
Signed-off-by: soupette <cyril.lpz@gmail.com>
 2020-08-28 16:17:27 +02:00
soupette
0f847b159f Fix trad 
Signed-off-by: soupette <cyril.lpz@gmail.com>
 2020-08-28 16:14:00 +02:00
cyril lopez
eb62242bcc
Merge branch 'master' into deps/bump-buffetjs 2020-08-28 16:09:16 +02:00
soupette
b02c8b2c72 Fix small bugs. 
co-authored elabbassih@gmail.com

Signed-off-by: soupette <cyril.lpz@gmail.com>
 2020-08-28 14:52:55 +02:00