yujunjun/strapi
1
0
Fork 0
mirror of https://github.com/strapi/strapi.git synced 2025-09-22 06:50:51 +00:00
Code Issues Packages Projects Releases Wiki Activity
14,903 Commits 123 Branches 496 Tags
Commit Graph

14903 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Moritz Eck
c38e1c4da8
Merge branch 'master' into feature/german-translations-update 2020-11-18 17:35:06 +01:00
cyril lopez
3cb5396277
Merge pull request #7987 from lachoseparis/feature/dynamiczone-categories 
Added Categories selector for dynamic zone
 2020-11-18 17:18:05 +01:00
Boudringhin Julien
553a188bd6
Merge branch 'master' into feature/dynamiczone-categories 2020-11-18 17:07:55 +01:00
cyril lopez
a7156c9471
Merge pull request #8679 from akhilmhdh/fix/nonrepeatable-comp-onclick 
Fixed click event on non-repeatable empty component
 2020-11-18 10:58:26 +01:00
akhilmhdh
c1b7ab3231 fixed click event on non-repeatable empty component 
Signed-off-by: akhilmhdh <akhilmhdh@gmail.com>
 2020-11-18 13:12:34 +05:30
Moritz Eck
c7c14dccf0
Merge branch 'master' into feature/german-translations-update 2020-11-16 16:54:38 +01:00
Alexandre Bodin
5fe7fa2f79 v3.3.3 v3.3.3 2020-11-16 16:47:16 +01:00
Boudringhin Julien
e168f257c5
Merge branch 'master' into feature/dynamiczone-categories 2020-11-16 14:21:40 +01:00
dependabot[bot]
6010c5a8e9
Bump snyk from 1.400.0 to 1.427.0 (#8656) 
Bumps [snyk](https://github.com/snyk/snyk) from 1.400.0 to 1.427.0.
- [Release notes](https://github.com/snyk/snyk/releases)
- [Changelog](https://github.com/snyk/snyk/blob/master/.releaserc)
- [Commits](https://github.com/snyk/snyk/compare/v1.400.0...v1.427.0)

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

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
 2020-11-16 12:58:31 +01:00
Jean-Sébastien Herbaux
4a33829f11
Sanitize /upload/search/:q route (#8658) 
Signed-off-by: Convly <jean-sebastien.herbaux@epitech.eu>
 2020-11-16 12:55:35 +01:00
jbo@lachose.fr
636877c7d0
Remove comment on DynamicZone 
Signed-off-by: Julien Boudringhin <julien.boudringhin@gmail.com>
 2020-11-16 12:15:48 +01:00
jbo@lachose.fr
c4a36471cc
Create ComponentsList 
Signed-off-by: Julien Boudringhin <julien.boudringhin@gmail.com>
 2020-11-16 12:15:32 +01:00
jbo@lachose.fr
6887cc28e9
CategoryItem remove background color 
Signed-off-by: Julien Boudringhin <julien.boudringhin@gmail.com>
 2020-11-16 12:15:06 +01:00
jbo@lachose.fr
e1e4915947
CategoryItem : create handleExited function 
Signed-off-by: Julien Boudringhin <julien.boudringhin@gmail.com>
 2020-11-16 12:14:43 +01:00
jbo@lachose.fr
47bf5712b2
BannerWrapper include updates from @HichamELBSI 
Signed-off-by: Julien Boudringhin <julien.boudringhin@gmail.com>
 2020-11-16 12:14:24 +01:00
jbo@lachose.fr
a69cc8b818
update logic of collapses 
Signed-off-by: Julien Boudringhin <julien.boudringhin@gmail.com>
 2020-11-16 12:13:59 +01:00
jbo@lachose.fr
89613f34a9
ComponentsPicker Add categoriesList padding-bottom 
Signed-off-by: Julien Boudringhin <julien.boudringhin@gmail.com>
 2020-11-16 12:13:29 +01:00
jbo@lachose.fr
d6915d3e57
Update componentPickerTitle margin-bottom to 10px 
Signed-off-by: Julien Boudringhin <julien.boudringhin@gmail.com>
 2020-11-16 12:12:42 +01:00
Moritz Eck
00c43225dc
Merge branch 'master' into feature/german-translations-update 2020-11-13 07:47:34 +01:00
dependabot[bot]
d3c249c876
Bump bootstrap from 4.5.2 to 4.5.3 (#8579) 
Bumps [bootstrap](https://github.com/twbs/bootstrap) from 4.5.2 to 4.5.3.
- [Release notes](https://github.com/twbs/bootstrap/releases)
- [Commits](https://github.com/twbs/bootstrap/compare/v4.5.2...v4.5.3)

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

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
 2020-11-12 15:57:21 +01:00
cyril lopez
8e098e0a37
Merge pull request #8617 from strapi/dependabot/npm_and_yarn/formik-2.2.4 
Bump formik from 2.1.5 to 2.2.4
 2020-11-12 15:25:49 +01:00
Moritz Eck
b368bb41ed add & improve german translations 
Signed-off-by: Moritz Eck <moritz.eck@gmail.com>
 2020-11-11 19:21:55 +01:00
Moritz Eck
32c633d6be remove old node versions from CONTRIBUTING.md 
Signed-off-by: Moritz Eck <moritz.eck@gmail.com>
 2020-11-11 19:21:55 +01:00
dependabot[bot]
3bfa2929f3
Bump formik from 2.1.5 to 2.2.4 
Bumps [formik](https://github.com/formium/formik) from 2.1.5 to 2.2.4.
- [Release notes](https://github.com/formium/formik/releases)
- [Commits](https://github.com/formium/formik/compare/v2.1.5...formik@2.2.4)

Signed-off-by: dependabot[bot] <support@github.com>
 2020-11-11 06:11:51 +00:00
Alexandre Bodin
b75aa3e9ef Merge branch 'master' into documentation 2020-11-10 19:04:21 +01:00
Alexandre Bodin
17ea510715 v3.3.2 v3.3.2 2020-11-10 19:02:11 +01:00
Alexandre BODIN
c4e681e017
Merge pull request #8615 from strapi/fix/update-notif-file-access 
Fix write access error of the update-notifier
 2020-11-10 19:01:09 +01:00
Pierre Noël
1be4237e4c fix write access error of the update-notifier 
Signed-off-by: Pierre Noël <petersg83@gmail.com>
 2020-11-10 18:29:25 +01:00
DMehaffy
092a130da2
Update Heroku guide to set NODE_ENV to production (#8587) 
Signed-off-by: Derrick Mehaffy <derrickmehaffy@gmail.com>
 2020-11-10 09:54:43 -07:00
meganelacheny
b71181d5ab
Documentation: update notifications + "Application" section in admin panel (#8613) 
* Write note about new notifications + Application section

* Improve other note in Update Strapi version

* Fix formatting issue

* Update docs/v3.x/guides/update-version.md

Co-authored-by: Mattias van den Belt <mattiasvandenbelt@gmail.com>

Co-authored-by: Mattias van den Belt <mattiasvandenbelt@gmail.com>
 2020-11-10 09:54:09 -07:00
Arnelle Balane
e44dae0a42
Allow deleting file that is already deleted in Cloudinary (#8410) 
Signed-off-by: Arnelle Balane <arnellebalane@gmail.com>
 2020-11-10 09:55:50 +01:00
dependabot[bot]
5e5e78482c
Bump @testing-library/react-hooks from 3.4.1 to 3.4.2 (#8093) 
Bumps [@testing-library/react-hooks](https://github.com/testing-library/react-hooks-testing-library) from 3.4.1 to 3.4.2.
- [Release notes](https://github.com/testing-library/react-hooks-testing-library/releases)
- [Commits](https://github.com/testing-library/react-hooks-testing-library/compare/v3.4.1...v3.4.2)

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

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: cyril lopez <cyril.lpz@gmail.com>
Co-authored-by: Alexandre BODIN <alexandrebodin@users.noreply.github.com>
 2020-11-10 09:45:58 +01:00
dependabot[bot]
2d05afa17e
Bump @babel/core from 7.11.6 to 7.12.3 (#8398) 
Bumps [@babel/core](https://github.com/babel/babel/tree/HEAD/packages/babel-core) from 7.11.6 to 7.12.3.
- [Release notes](https://github.com/babel/babel/releases)
- [Changelog](https://github.com/babel/babel/blob/main/CHANGELOG.md)
- [Commits](https://github.com/babel/babel/commits/v7.12.3/packages/babel-core)

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

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
 2020-11-10 09:45:19 +01:00
Deepak
9508a31c4c
fix: #8342 ignore dynamic zone component if its not in data (#8366) 
Signed-off-by: Deepak Thukral <iapain@gmail.com>
 2020-11-10 09:43:12 +01:00
mijorus
34473d442c
Update queries.md (#8594) 
* Update queries.md

this is my basic example of how this guide could be implemented. Please consider adding a paragraph in your docs about custom sql queries as they are the quickest and easiest  way sometimes to get data

* Update queries.md

* fixed spelling mistake

* Added draft-and-publish linkback
 2020-11-09 13:02:19 -07:00
Alexandre Bodin
98bb6a3d31 v3.3.1 v3.3.1 2020-11-09 19:22:52 +01:00
Alexandre BODIN
6558161227
Fix ML (#8604) 
Signed-off-by: Alexandre Bodin <bodin.alex@gmail.com>
 2020-11-09 19:21:08 +01:00
Alexandre Bodin
62e905dd0c Merge branch 'master' into documentation 2020-11-09 17:59:12 +01:00
Pierre Noël
ec1c2a22c3 v3.3.0 v3.3.0 2020-11-09 17:55:10 +01:00
Alexandre BODIN
e2135a6199
Merge pull request #8459 from roschaefer/6998-strapi-provider-email-nodemailer 
Maintain strapi-provider-email-nodemailer
 2020-11-09 17:49:08 +01:00
Alexandre BODIN
6ac8228068
Merge pull request #8526 from strapi/application-settings/own-update-notifier-at-startup 
add notification to update
 2020-11-09 17:34:44 +01:00
ELABBASSI Hicham
f40636b773
Update new notification api doc (#8602) 
Signed-off-by: HichamELBSI <elabbassih@gmail.com>
 2020-11-09 17:20:16 +01:00
Pierre Noël
eeb568bc97 improve doc env vars 
Signed-off-by: Pierre Noël <petersg83@gmail.com>
 2020-11-09 17:01:17 +01:00
Pierre Noël
59ac2dd6f4 add use of STRAPI_DISABLE_UPDATE_NOTIFICATION 
Signed-off-by: Pierre Noël <petersg83@gmail.com>
 2020-11-09 17:01:16 +01:00
Pierre Noël
cf2a4c28ed rename to createUpdateNotifier 
Signed-off-by: Pierre Noël <petersg83@gmail.com>
 2020-11-09 17:01:15 +01:00
Pierre Noël
19d7a15376 refacto 
Signed-off-by: Pierre Noël <petersg83@gmail.com>
 2020-11-09 17:01:15 +01:00
Pierre Noël
6ab433cb63 add notification to update 
Signed-off-by: Pierre Noël <petersg83@gmail.com>
 2020-11-09 17:01:14 +01:00
Alexandre Bodin
11dcdadaa8 Add isProvider true in package json 
Signed-off-by: Alexandre Bodin <bodin.alex@gmail.com>
 2020-11-09 16:40:35 +01:00
Alexandre Bodin
781e7adb0b Refactors to avoid mutation of the options 
Signed-off-by: Alexandre Bodin <bodin.alex@gmail.com>
 2020-11-09 16:32:56 +01:00
Alexandre Bodin
29faa4939a Make package ready to release 
Signed-off-by: Alexandre Bodin <bodin.alex@gmail.com>
 2020-11-09 15:51:03 +01:00