yujunjun/strapi
1
0
Fork 0
mirror of https://github.com/strapi/strapi.git synced 2025-09-24 07:50:33 +00:00
Code Issues Packages Projects Releases Wiki Activity
17,027 Commits 126 Branches 496 Tags
Commit Graph

17027 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
spobwoode
7e6896423f
Added instructions for installing the pg node module (#6744) 
* Fixes #6733

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

* v3.0.4

* Added instructions for installing the `pg` node module

I believe this is necessary to deploy to Google app engine - my deployment didn't work until I did this

* Revert "Added instructions for installing the `pg` node module"

This reverts commit 3da33ec1dc1ab37267bad5fe526ff2d0c4b72502.

Co-authored-by: soupette <cyril.lpz@gmail.com>
Co-authored-by: Alexandre BODIN <alexandrebodin@users.noreply.github.com>
Co-authored-by: Alexandre Bodin <bodin.alex@gmail.com>
 2020-08-12 12:11:06 +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
Valerian Pereira
5167a8a691
Points added one below the other (#7428) 
Signed-off-by: Valerian Pereira <valerianpereira25@gmail.com>
 2020-08-11 10:17:17 -07:00
Burak
d4c418bbfb
send-email.md updated. (#7426) 2020-08-11 09:12:54 -07:00
Alexandre BODIN
cc0e78140c
Merge pull request #7425 from strapi/docs/queries/fixMongooseCustom 
Fix custom mongoose query .toObject() is undefined
 2020-08-11 16:05:01 +02:00
Derrick Mehaffy
18a02baf77
Fix custom mongoose query .toObject() is undefined 
Signed-off-by: Derrick Mehaffy <derrickmehaffy@gmail.com>
 2020-08-11 07:02:32 -07:00
Alexandre BODIN
dcf93f7295
Merge pull request #7418 from strapi/docs/migration-username-admin 
Docs update on migration guide for username constraint
 2020-08-11 12:02:50 +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
Jim LAURIE
94d70f3e61 Update migration guide username not null 
Signed-off-by: Jim LAURIE <j.laurie6993@gmail.com>
 2020-08-11 11:05:51 +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
ScottAgirs
386984f085 improve wording 
Signed-off-by: ScottAgirs <scott@ijs.to>
 2020-08-10 15:35:15 -04:00
ScottAgirs
89f940eb84 Merge branch 'master' of https://github.com/strapi/strapi 2020-08-10 15:33:43 -04:00
Derrick Mehaffy
e768a9f02c
Update FAQ with latest RBAC information. 
Signed-off-by: Derrick Mehaffy <derrickmehaffy@gmail.com>
 2020-08-10 10:10:10 -07: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
Bruno Santos
9f2e2c1582
Fix typo in upload plugin documentation (#7378) 2020-08-10 07:31:14 -07: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
Jim LAURIE
980fbc4198
Merge pull request #7394 from dalbitresb12/docs/fix-favicon 
Fix favicon link in docs
 2020-08-10 15:04:47 +02:00
Jim LAURIE
95d3f42610
Merge pull request #7368 from dr5hn/patch-2 
FIX: Broken links to email configurations & middlewares
 2020-08-10 11:51:43 +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
ELABBASSI Hicham
d14538406b
Merge pull request #7365 from strapi/front/list-views 
Move users-permissions plugin views to settings
 2020-08-10 09:51:40 +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
Diego Albitres
617df05d6b
Fix favicon link in docs 
Signed-off-by: Diego Albitres <diego.albitres@gmail.com>
 2020-08-09 21:57:46 -05:00
ScottAgirs
e06f3647ff [update] package description 
Signed-off-by: ScottAgirs <scott@ijs.to>
 2020-08-08 15:24:30 -04:00
ScottAgirs
c3efac898d [update README] 
Signed-off-by: ScottAgirs <scott@ijs.to>
 2020-08-08 15:24:09 -04: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
DMehaffy
f179a1cae9
Fix docs for loading ORM plugins (#7356) 
Signed-off-by: Derrick Mehaffy <derrickmehaffy@gmail.com>
 2020-08-07 15:56:52 +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
4db3d1a9c0
Merge pull request #7342 from strapi/docs/admin/7322 
Fix custom admin guide typo
 2020-08-07 15:18:33 +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
soupette
c318157633 Fix import name 
Signed-off-by: soupette <cyril.lpz@gmail.com>
 2020-08-07 12:55:24 +02:00
Darshan Gada
862f2c386b FIX: Broken links to email configurations & middlewares 
Signed-off-by: Darshan Gada <gadadarshan@gmail.com>
 2020-08-07 15:53:46 +05:30
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
soupette
001cc0f865 Fix trads 
Signed-off-by: soupette <cyril.lpz@gmail.com>
 2020-08-07 10:00:31 +02:00