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

15371 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
soupette
3c7ea06f2a Fix permissions 
Signed-off-by: soupette <cyril.lpz@gmail.com>
 2020-08-28 11:38:27 +02:00
Rémi de Juvigny
720ab27eed Add UUID prefix 
Signed-off-by: Rémi de Juvigny <remi@hey.com>
 2020-08-28 10:45:22 +02:00
Rémi de Juvigny
11c9ea17eb Add --template option to create-strapi-app 
Signed-off-by: Rémi de Juvigny <remi@hey.com>
 2020-08-28 10:23:03 +02:00
soupette
bcd9075229 Remove useless files 
Signed-off-by: soupette <cyril.lpz@gmail.com>
 2020-08-28 09:43:48 +02:00
soupette
658ae9676f Add missing tests 
Signed-off-by: soupette <cyril.lpz@gmail.com>
 2020-08-28 09:39:28 +02:00
soupette
98a4401a09 Fix modal delete behaviour 
Signed-off-by: soupette <cyril.lpz@gmail.com>
 2020-08-27 18:09:26 +02:00
soupette
b328a3a38a Fix tests 
Signed-off-by: soupette <cyril.lpz@gmail.com>
 2020-08-27 17:23:45 +02:00
soupette
2e67e19bd6 Fix bugs 
Signed-off-by: soupette <cyril.lpz@gmail.com>
 2020-08-27 15:57:35 +02:00
soupette
5a7d89c807 Refacto create page 
Signed-off-by: soupette <cyril.lpz@gmail.com>
 2020-08-27 15:00:10 +02:00
soupette
5ed078c3ef Merge branch 'master' of github.com:strapi/strapi into users-permissions/create-new-role 2020-08-27 10:48:01 +02:00
cyril lopez
d9f701727b
Merge pull request #7527 from strapi/fix/decimal-input 
Fix decimal on content manager's inputs
 2020-08-27 10:20:53 +02:00
soupette
a8ea727e63 Fix PR feedback 
Signed-off-by: soupette <cyril.lpz@gmail.com>
 2020-08-26 16:01:27 +02:00
soupette
82ae1fc6c1 Fixes #7584. 
Update the documentation override

Signed-off-by: soupette <cyril.lpz@gmail.com>
 2020-08-26 14:55:09 +02:00
soupette
fb6010369a Fix conflicts 
Signed-off-by: soupette <cyril.lpz@gmail.com>
 2020-08-26 10:38:54 +02:00
cyril lopez
8bf691cb73
Merge branch 'master' into fix/decimal-input 2020-08-26 10:20:15 +02:00
cyril lopez
36caab4176
Merge branch 'master' into deps/bump-buffetjs 2020-08-26 09:40:16 +02:00
cyril lopez
22d281c831
Merge pull request #7589 from strapi/fix/cm-issues 
CM bug fixes
 2020-08-26 09:30:48 +02:00
soupette
c7fcb70d8f Bump Buffet.js version 
Signed-off-by: soupette <cyril.lpz@gmail.com>
 2020-08-26 09:10:57 +02:00
cyril lopez
051ee9b468
Merge branch 'master' into fix/cm-issues 2020-08-26 08:21:00 +02:00
cyril lopez
2957ad5b0d
Merge pull request #7597 from strapi/fix/small-issues 
Fix front-end small issues
 2020-08-26 08:20:50 +02:00
cyril lopez
6edaf61527
Merge branch 'master' into fix/cm-issues 2020-08-26 08:20:09 +02:00