yujunjun/strapi
1
0
Fork 0
mirror of https://github.com/strapi/strapi.git synced 2025-11-02 19:04:38 +00:00
Code Issues Packages Projects Releases Wiki Activity
14,176 Commits 121 Branches 507 Tags
Commit Graph

14176 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
cyril lopez
99dfd24eaf
Fixes #7301 (#7312) 
Signed-off-by: soupette <cyril.lpz@gmail.com>
 2020-08-12 12:15:39 +02:00
Brendan Abbott
b3be6dea99
Improve empty state grammar for Assets (#6922) 
Signed-off-by: Brendan Abbott <brendan.abbott@shopify.com>
 2020-08-12 12:15:13 +02:00
Rob Bailey
6f37e75352
Fixing typo in translations/en.json. (#7274) 
"Enterprise" was incorrectly spelt as "Entreprise"
 2020-08-12 12:09:40 +02:00
Anthony Valera
f93bff8bfb
Fixes link to AWS Free landing page (#7291) 
Signed-off-by: Anthony Valera <anthony@anthonyvalera.com>
 2020-08-12 12:08:32 +02:00
Daniel Soares
6b34b5e8af
Added pt-BR localization to strapi-plugin-upload (#7375) 
Signed-off-by: Daniel Soares <daniel.soares@me.com>
 2020-08-12 12:08:09 +02:00
Laurent Comte
086677bee3
Fix/6641 (#7337) 
* Fix "Search for an asset" on Media Library loses focus
while typing

Signed-off-by: Laurent Comte <laurent.comte@gmail.com>

* Update the provider loggin doc + display absolute redirect uri in front

Signed-off-by: Pierre Noël <petersg83@gmail.com>

* update grant + doc twitter

Signed-off-by: Pierre Noël <petersg83@gmail.com>

* refacto

Signed-off-by: Pierre Noël <petersg83@gmail.com>

* replace .fr by .com

Signed-off-by: Pierre Noël <petersg83@gmail.com>

* move a tip

Signed-off-by: Pierre Noël <petersg83@gmail.com>

* Specify that only grant providers are supported

Signed-off-by: Pierre Noël <petersg83@gmail.com>

Co-authored-by: Pierre Noël <petersg83@gmail.com>
 2020-08-12 12:07:39 +02:00
cyril lopez
f6f5095cc5
Fix WYSIWYG bugs (#7370) 
* Fixes #7314

Signed-off-by: soupette <cyril.lpz@gmail.com>

* Fixes #4300

Signed-off-by: soupette <cyril.lpz@gmail.com>
 2020-08-12 12:07:15 +02:00
Jason Prado
4749d61aff
Show error.message || error on failed command (#7388) 
Some exceptions, like module inclusion errors, don't generate nice
Error objects with message defined. This causes hard-to-debug failures.
When encountering an error with no message, show the whole Error object.

Signed-off-by: Jason Prado <jason.prado@gmail.com>

Co-authored-by: Alexandre BODIN <alexandrebodin@users.noreply.github.com>
 2020-08-12 12:06:39 +02:00
Alexandre BODIN
6acb73952f
Merge pull request #7416 from strapi/fix/7414 
Fixes #7414
 2020-08-12 12:06:00 +02:00
Alexandre BODIN
8040a85c1a
Merge pull request #7367 from strapi/dependabot/npm_and_yarn/testing-library/react-10.4.8 
Bump @testing-library/react from 10.0.4 to 10.4.8
 2020-08-11 11:07:07 +02:00
soupette
9d06b5783b Merge branch 'master' of github.com:strapi/strapi into fix/7414 2020-08-11 10:52:12 +02:00
soupette
a8b95220f0 Fixes #7414 
Signed-off-by: soupette <cyril.lpz@gmail.com>
 2020-08-11 10:50:28 +02:00
dependabot[bot]
c2a975fc94
Bump @testing-library/react from 10.0.4 to 10.4.8 
Bumps [@testing-library/react](https://github.com/testing-library/react-testing-library) from 10.0.4 to 10.4.8.
- [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.0.4...v10.4.8)

Signed-off-by: dependabot[bot] <support@github.com>
 2020-08-11 08:32:24 +00:00
Alexandre BODIN
b56cc7f3c1
Merge pull request #7397 from strapi/dependabot/npm_and_yarn/rollup-plugin-svg-2.0.0 
Bump rollup-plugin-svg from 1.0.1 to 2.0.0
 2020-08-11 10:20:04 +02:00
Alexandre BODIN
e25a508b2b
Merge pull request #7400 from strapi/fix/database-fixes 
Fix virtual mongoose remove _v char
 2020-08-10 16:55:20 +02:00
Alexandre Bodin
1cc74ca6a0 Fix virtual mongoose remove _v char 
Signed-off-by: Alexandre Bodin <bodin.alex@gmail.com>
 2020-08-10 15:19:28 +02:00
Alexandre BODIN
0b8bd2c98f
Merge pull request #7373 from remi2j/local-upload-readme 
Fix strapi-provider-upload-local readme
 2020-08-10 11:12:56 +02:00
dependabot[bot]
7113ebd170
Bump rollup-plugin-svg from 1.0.1 to 2.0.0 
Bumps [rollup-plugin-svg](https://github.com/antony/rollup-plugin-svg) from 1.0.1 to 2.0.0.
- [Release notes](https://github.com/antony/rollup-plugin-svg/releases)
- [Commits](https://github.com/antony/rollup-plugin-svg/compare/v1.0.1...v2.0.0)

Signed-off-by: dependabot[bot] <support@github.com>
 2020-08-10 05:54:48 +00:00
Alexandre BODIN
0ece30b6e3
Merge pull request #7372 from daanvanham/master 
fixed strapi/strapi#7334 add the data-loader for admin users to the graphql plugin
 2020-08-07 16:58:45 +02:00
Daan van Ham
0f34541231
Merge branch 'master' into master 2020-08-07 16:16:09 +02:00
Jim LAURIE
9f4839028c
Merge pull request #7344 from joshjung/master 
Change CORS documentation on origin
 2020-08-07 16:07:31 +02:00
Jim LAURIE
16f1554e15
Merge branch 'master' into master 2020-08-07 16:07:23 +02:00
Rémi de Juvigny
5fcbcaa2f5
Merge branch 'master' into local-upload-readme 2020-08-07 16:03:38 +02:00
Rémi de Juvigny
dbaf04286a Fix local upload provider docs 2020-08-07 15:56:29 +02:00
Adam
c8dc074d3b
fix(graphql): filter out orphaned relationships (#7363) 
Signed-off-by: Adam Lee <admosity@users.noreply.github.com>
 2020-08-07 15:55:53 +02:00
Daan van Ham
e933c28012 fixed strapi/strapi#7334 add the data-loader for admin users to the graphql-plugin 
Signed-off-by: Daan van Ham <daan.van.ham@frontmen.nl>
 2020-08-07 15:50:16 +02:00
Jim LAURIE
ad68fbb7b5
Merge pull request #7341 from AntoninBeaufort/master 
Email plugin docs fix typo
 2020-08-07 15:17:08 +02:00
Jim LAURIE
ccb781f158
Merge branch 'master' into master 2020-08-07 15:16:52 +02:00
Alexandre BODIN
de10a34592
Merge pull request #7327 from strapi/dependabot/npm_and_yarn/whatwg-fetch-3.3.1 
Bump whatwg-fetch from 2.0.4 to 3.3.1
 2020-08-07 10:29:13 +02:00
Alexandre BODIN
08bef6d957
Merge pull request #7350 from strapi/fix/7335 
Fix sanitizeEntity's includeFields usage
 2020-08-07 09:49:50 +02:00
Convly
10cc543cc7 Fix sanitizeEntity's includeFields usage for dynamic zones 
Signed-off-by: Convly <jean-sebastien.herbaux@epitech.eu>
 2020-08-06 15:13:45 +02:00
Joshua Jung
6483d6186c Change CORS documentation on origin 
CORS documentation on the origin property is now more explicit for multiple domains.

Signed-off-by: Joshua Jung <josh@jungdigital.com>
 2020-08-05 22:48:39 +02:00
antoninbeaufort
92d470ed89
Merge branch 'master' of https://github.com/AntoninBeaufort/strapi 2020-08-05 20:21:16 +02:00
Antonin Beaufort
f48892a0d7
[Docs] Email plugin : fix typo 
Signed-off-by: antoninbeaufort <33757018+AntoninBeaufort@users.noreply.github.com>
 2020-08-05 20:19:34 +02:00
Antonin Beaufort
d536560960
[Docs] Email plugin : fix typo 
Signed-off-by: antoninbeaufort <antonin.beaufort@gmail.com>
 2020-08-05 20:12:27 +02:00
dependabot[bot]
be55fdb69d
Bump whatwg-fetch from 2.0.4 to 3.3.1 
Bumps [whatwg-fetch](https://github.com/github/fetch) from 2.0.4 to 3.3.1.
- [Release notes](https://github.com/github/fetch/releases)
- [Commits](https://github.com/github/fetch/compare/v2.0.4...v3.3.1)

Signed-off-by: dependabot[bot] <support@github.com>
 2020-08-04 22:21:05 +00:00
Alexandre BODIN
7113f7f11f
Merge pull request #7132 from strapi/fix/loginProviders 
Fix/login providers
 2020-08-05 00:02:17 +02:00
Pierre Noël
77293268c6 Specify that only grant providers are supported 
Signed-off-by: Pierre Noël <petersg83@gmail.com>
 2020-08-04 09:49:30 +02:00
Pierre Noël
b4afb8afcc move a tip 
Signed-off-by: Pierre Noël <petersg83@gmail.com>
 2020-08-04 09:49:30 +02:00
Pierre Noël
6f369201a4 replace .fr by .com 
Signed-off-by: Pierre Noël <petersg83@gmail.com>
 2020-08-04 09:49:29 +02:00
Pierre Noël
b5959705b2 refacto 
Signed-off-by: Pierre Noël <petersg83@gmail.com>
 2020-08-04 09:49:29 +02:00
Pierre Noël
05cc400905 update grant + doc twitter 
Signed-off-by: Pierre Noël <petersg83@gmail.com>
 2020-08-04 09:49:28 +02:00
Pierre Noël
75cb374f89 Update the provider loggin doc + display absolute redirect uri in front 
Signed-off-by: Pierre Noël <petersg83@gmail.com>
 2020-08-04 09:49:28 +02:00
Alexandre BODIN
a8bb45da52
Merge pull request #7299 from strapi/rbac/user-creation-event 
Add events for user creation
 2020-08-03 18:41:53 +02:00
Alexandre BODIN
e9757182cc
Merge pull request #7144 from strapi/chore/rbac-tracking 
Add events for the rbac feature.
 2020-08-03 18:40:26 +02:00
Alexandre BODIN
3fbd684981
Merge pull request #7303 from strapi/minor/addKoaProxyConf 
Add conf proxy koa variable
 2020-08-03 18:12:46 +02:00
Alexandre BODIN
ce3a00f2ed
Merge branch 'master' into chore/rbac-tracking 2020-08-03 17:40:16 +02:00
Pierre Noël
112716fc9b add conf proxy koa variable 
Signed-off-by: Pierre Noël <petersg83@gmail.com>
 2020-08-03 17:34:05 +02:00
Alexandre BODIN
81a4509750
Merge pull request #7263 from votemike/gender-equality 
Gender equality wordings
 2020-08-03 17:06:23 +02:00
Pierre Noël
9c957759b7 enrich test 
Signed-off-by: Pierre Noël <petersg83@gmail.com>
 2020-08-03 14:08:19 +02:00