yujunjun/strapi
1
0
Fork 0
mirror of https://github.com/strapi/strapi.git synced 2025-09-19 13:31:34 +00:00
Code Issues Packages Projects Releases Wiki Activity
17,027 Commits 123 Branches 496 Tags
Commit Graph

17027 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
dependabot[bot]
487170788e
Bump nodemailer from 6.4.16 to 6.4.17 (#9022) 
Bumps [nodemailer](https://github.com/nodemailer/nodemailer) from 6.4.16 to 6.4.17.
- [Release notes](https://github.com/nodemailer/nodemailer/releases)
- [Changelog](https://github.com/nodemailer/nodemailer/blob/master/CHANGELOG.md)
- [Commits](https://github.com/nodemailer/nodemailer/compare/v6.4.16...v6.4.17)

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

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
 2020-12-31 14:41:00 +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
Convly
e1181a0ca2 Check that userInfo is defined 2020-12-28 15:05:33 +01:00
Convly
176e1c19c6 Remove useless dependency from getstarted packages.json 2020-12-28 15:05:33 +01:00
Convly
ad3006ba26 Use firstname + lastname combination only if both are defined, use username otherwise 2020-12-28 15:05:33 +01:00
HichamELBSI
fec4ac3f04 Fix react-tooltip install 
Signed-off-by: HichamELBSI <elabbassih@gmail.com>
 2020-12-28 15:05:32 +01:00
HichamELBSI
4ec79afa9d import Tooltip and Separator from buffet 
Signed-off-by: HichamELBSI <elabbassih@gmail.com>
 2020-12-28 15:05:32 +01:00
soupette
d8a57fe207 Fix PR feedback 
Signed-off-by: soupette <cyril.lpz@gmail.com>
 2020-12-28 15:05:31 +01:00
soupette
1fc2ee567f Change requestURl helper 
Signed-off-by: soupette <cyril.lpz@gmail.com>
 2020-12-28 15:05:31 +01:00
soupette
24d6883e59 Add error state 
Signed-off-by: soupette <cyril.lpz@gmail.com>
 2020-12-28 15:05:31 +01:00
soupette
1f2e5c23c0 Add notification message when delete the default register role 
Signed-off-by: soupette <cyril.lpz@gmail.com>
 2020-12-28 15:05:30 +01:00
soupette
61ed2ca7f1 Move NotAllowedInput to helper plugin 
Signed-off-by: soupette <cyril.lpz@gmail.com>
 2020-12-28 15:05:30 +01:00
soupette
ab485fce46 Update permissions object 
Signed-off-by: soupette <cyril.lpz@gmail.com>
 2020-12-28 15:05:30 +01:00
HichamELBSI
d6ebd5a48b Add customRoutes to login page 
Signed-off-by: HichamELBSI <elabbassih@gmail.com>
 2020-12-28 15:05:29 +01:00
HichamELBSI
3810f7c71d Update BuffetJS 
Signed-off-by: HichamELBSI <elabbassih@gmail.com>
 2020-12-28 15:05:29 +01:00
HichamELBSI
c4f59a8db0 Handle success and error 
Signed-off-by: HichamELBSI <elabbassih@gmail.com>
 2020-12-28 15:05:28 +01:00
HichamELBSI
2790aed2bd Fix PR review 
Signed-off-by: HichamELBSI <elabbassih@gmail.com>
 2020-12-28 15:05:28 +01:00
HichamELBSI
a09985706d Add auth providers list and page 
Signed-off-by: HichamELBSI <elabbassih@gmail.com>
 2020-12-28 15:05:28 +01:00
HichamELBSI
9432e02843 Add EE to AuthPage for providers 
Signed-off-by: HichamELBSI <elabbassih@gmail.com>
 2020-12-28 15:05:27 +01:00
soupette
4bd04e12a0 split permissions between ee and ce 
Signed-off-by: soupette <cyril.lpz@gmail.com>
 2020-12-28 15:05:27 +01:00
soupette
7484f12026 Rename useUserForm hook 
Signed-off-by: soupette <cyril.lpz@gmail.com>
 2020-12-28 15:05:27 +01:00
soupette
5660624e93 Apply permissions to page 
Signed-off-by: soupette <cyril.lpz@gmail.com>
 2020-12-28 15:05:26 +01:00
soupette
7441bca9ef Remove useSettingsMenu/init test 
Signed-off-by: soupette <cyril.lpz@gmail.com>
 2020-12-28 15:05:26 +01:00
soupette
4000243107 Created sso settings page 
Signed-off-by: soupette <cyril.lpz@gmail.com>
 2020-12-28 15:05:26 +01:00
soupette
41b1c11bb1 Init sso settings 
Signed-off-by: soupette <cyril.lpz@gmail.com>
 2020-12-28 15:05:25 +01:00
Jean-Sébastien Herbaux
0850f81884 Consistency with other API endpoints (#8986) 2020-12-28 15:05:25 +01:00
Jean-Sébastien Herbaux
a0a4131b38 New redirect base route (#8985) 2020-12-28 15:05:25 +01:00
Jean-Sébastien Herbaux
b65686037f SSO Adjustement (server-side) (#8983) 
* Use dynamic admin url for redirections, set sso method as GET instead of POST

* Fix unit tests
 2020-12-28 15:05:24 +01:00
Convly
62b52a604d Provider's connection implementation 
Signed-off-by: Convly <jean-sebastien.herbaux@epitech.eu>
 2020-12-28 15:05:24 +01:00
dependabot[bot]
dd1817680d
Bump eslint-plugin-react-hooks from 4.1.2 to 4.2.0 (#8966) 
Bumps [eslint-plugin-react-hooks](https://github.com/facebook/react/tree/HEAD/packages/eslint-plugin-react-hooks) from 4.1.2 to 4.2.0.
- [Release notes](https://github.com/facebook/react/releases)
- [Changelog](https://github.com/facebook/react/blob/master/packages/eslint-plugin-react-hooks/CHANGELOG.md)
- [Commits](https://github.com/facebook/react/commits/HEAD/packages/eslint-plugin-react-hooks)

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

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
 2020-12-28 10:31:48 +01:00
dependabot[bot]
c6b7c68709
Bump knex from 0.21.13 to 0.21.14 (#8968) 
Bumps [knex](https://github.com/knex/knex) from 0.21.13 to 0.21.14.
- [Release notes](https://github.com/knex/knex/releases)
- [Changelog](https://github.com/knex/knex/blob/master/CHANGELOG.md)
- [Commits](https://github.com/knex/knex/compare/0.21.13...0.21.14)

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

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
 2020-12-28 10:30:59 +01:00
soupette
8b9c3f2052 v3.4.1 v3.4.1 2020-12-22 16:52:46 +01:00
cyril lopez
ca797fc953
Merge pull request #8974 from strapi/fix/filters 
Fix listview bug
 2020-12-22 15:00:07 +01:00
soupette
babecc8705 Fixes #8951 
Also fix filters fetching

Signed-off-by: soupette <cyril.lpz@gmail.com>
 2020-12-22 11:41:28 +01:00
ELABBASSI Hicham
10bdd99022
Merge pull request #8972 from strapi/fix/wysiwyg 
Fix wysiwyg lifecycle
 2020-12-22 10:58:48 +01:00
soupette
19f61f4b79 Fix wysiwyg lifecycle 
Signed-off-by: soupette <cyril.lpz@gmail.com>
 2020-12-22 10:24:36 +01:00
ELABBASSI Hicham
62024242ae
Merge pull request #8935 from strapi/fix/inputs-display 
Fix inputs display
 2020-12-21 15:03:30 +01:00
soupette
c85eb46a43 Fix input display 
Signed-off-by: soupette <cyril.lpz@gmail.com>
 2020-12-21 14:20:03 +01:00
soupette
46ac2782f1 Merge branch 'master' of github.com:strapi/strapi into fix/inputs-display 2020-12-21 10:51:25 +01:00
soupette
43d476660a Upgrade buffet.js 
Signed-off-by: soupette <cyril.lpz@gmail.com>
 2020-12-21 10:50:49 +01:00
Alexandre BODIN
8a9d648177
Merge pull request #8937 from strapi/rf/addTelemetry 
Add telemetry on the relational field feature
 2020-12-21 09:53:55 +01:00
dependabot[bot]
7d44de36b2
Bump codemirror from 5.58.1 to 5.59.0 (#8958) 
Bumps [codemirror](https://github.com/codemirror/CodeMirror) from 5.58.1 to 5.59.0.
- [Release notes](https://github.com/codemirror/CodeMirror/releases)
- [Changelog](https://github.com/codemirror/CodeMirror/blob/master/CHANGELOG.md)
- [Commits](https://github.com/codemirror/CodeMirror/compare/5.58.1...5.59.0)

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

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
 2020-12-21 09:49:41 +01:00
cyril lopez
5f7992f7b3
Merge branch 'master' into fix/inputs-display 2020-12-21 09:38:00 +01:00
Pierre Noël
ae5edd3d4c add test for sendDidConfigureListView 2020-12-18 18:17:02 +01:00
Pierre Noël
355888a5e7 add unit test for getRelationalFields 2020-12-18 17:53:52 +01:00
soupette
97e33908a0 Fix input uid 
Signed-off-by: soupette <cyril.lpz@gmail.com>
 2020-12-18 16:44:24 +01:00
Pierre Noël
674b1c19fa rename variables 2020-12-18 16:28:54 +01:00
Pierre Noël
23dcde6d90 add didConfigureListView 2020-12-18 16:19:39 +01:00
Moritz Eck
171a56b0e6
strapi-provider-email-mailgun: updates documentation (#8891) 
* adds MAILGUN_HOST env to documentation

Signed-off-by: Moritz Eck <moritz.eck@gmail.com>

* make documentation fit on oneline

Signed-off-by: Moritz Eck <moritz.eck@gmail.com>

* use env() instead of hard-coded value

Signed-off-by: Moritz Eck <moritz.eck@gmail.com>

Co-authored-by: DMehaffy <derrickmehaffy@gmail.com>
 2020-12-18 15:55:30 +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