yujunjun/strapi
1
0
Fork 0
mirror of https://github.com/strapi/strapi.git synced 2025-08-05 23:40:04 +00:00
Code Issues Packages Projects Releases Wiki Activity
14,807 Commits 112 Branches 487 Tags
Commit Graph

14807 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Alexandre Bodin
e8153d99c0 v3.2.4 v3.2.4 2020-10-16 18:22:15 +02:00
hhh
f08d00e002
Fix incorrect openapi type for datetime, date and password (#8334) 
* Fix incorrect openapi type for datetime, date and password

Signed-off-by: henrych4 <singyinhenry@gmail.com>

* Update the code according to the comment

Signed-off-by: henrych4 <singyinhenry@gmail.com>

* Revert the removal of switch cases

Signed-off-by: henrych4 <singyinhenry@gmail.com>

* Add missing switch case for datetime

Signed-off-by: henrych4 <singyinhenry@gmail.com>

* Add switch case for time

Signed-off-by: henrych4 <singyinhenry@gmail.com>

Co-authored-by: Pierre Noël <petersg83@users.noreply.github.com>
 2020-10-16 18:19:26 +02:00
Alexandre BODIN
049412162b
Merge pull request #8365 from strapi/fix/email-confirmation-jwt 
Add confirmationToken to user for email confirmation
 2020-10-16 18:16:33 +02:00
Alexandre Bodin
bf18c2bfbf Apply feedbacks 
Signed-off-by: Alexandre Bodin <bodin.alex@gmail.com>
 2020-10-16 17:48:03 +02:00
Alexandre Bodin
529d147726 Add confirmationToken to user for email confirmation 
Signed-off-by: Alexandre Bodin <bodin.alex@gmail.com>
 2020-10-16 17:36:45 +02:00
jecapi
9b62d98b45
Update sv.json (#8355) 
Added swedish translation
 2020-10-16 14:28:51 +02:00
ELABBASSI Hicham
928d854fc3
Merge pull request #8359 from strapi/front/relational-fields 
Front/relational fields
 2020-10-16 13:27:58 +02:00
soupette
c652dfadfc Fix PR feedback 
Signed-off-by: soupette <cyril.lpz@gmail.com>
 2020-10-16 13:26:30 +02:00
soupette
8bc07d48e4 Allow to select relational fields in the listview 
Signed-off-by: soupette <cyril.lpz@gmail.com>
 2020-10-16 13:15:03 +02:00
soupette
9f8d04960f Add new description for relation settings field 
Signed-off-by: soupette <cyril.lpz@gmail.com>
 2020-10-16 12:47:37 +02:00
dependabot[bot]
4b9476f3bc
Bump sharp from 0.26.0 to 0.26.2 (#8348) 
Bumps [sharp](https://github.com/lovell/sharp) from 0.26.0 to 0.26.2.
- [Release notes](https://github.com/lovell/sharp/releases)
- [Changelog](https://github.com/lovell/sharp/blob/master/docs/changelog.md)
- [Commits](https://github.com/lovell/sharp/compare/v0.26.0...v0.26.2)

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

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
 2020-10-16 09:44:30 +02:00
Bochkarev Ivan
f8bb96d3d9
Update issues/PR templates (#8343) 
* Update issues/PR templates

Signed-off-by: Bochkarev Ivan <ivanx86@gmail.com>

* Return the previous state of these blocks

Signed-off-by: Bochkarev Ivan <ivanx86@gmail.com>

Co-authored-by: DMehaffy <derrickmehaffy@gmail.com>
 2020-10-15 17:09:34 -07:00
dependabot[bot]
47e0f7a98a
Bump lint-staged from 9.5.0 to 10.4.0 (#8305) 
* Bump lint-staged from 9.5.0 to 10.4.0

Bumps [lint-staged](https://github.com/okonet/lint-staged) from 9.5.0 to 10.4.0.
- [Release notes](https://github.com/okonet/lint-staged/releases)
- [Commits](https://github.com/okonet/lint-staged/compare/v9.5.0...v10.4.0)

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

* Remove git add from lint-staged

Signed-off-by: Alexandre Bodin <bodin.alex@gmail.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: Alexandre Bodin <bodin.alex@gmail.com>
 2020-10-15 18:18:43 +02:00
Thomas
2f97ff1f93
better error handling for missing model error (#8328) 
* Ammending commit

Signed-off-by: Thomas Chezieres <tchezieres@MacBook-Pro.lan>

* ammending last commit

Signed-off-by: Thomas Chezieres <tchezieres@MacBook-Pro.lan>

Co-authored-by: Thomas Chezieres <tchezieres@MacBook-Pro.lan>
Co-authored-by: Alexandre BODIN <alexandrebodin@users.noreply.github.com>
 2020-10-15 16:39:46 +02:00
dependabot[bot]
1186d6a2ec
Bump rollup-plugin-postcss from 2.9.0 to 3.1.8 (#8286) 
Bumps [rollup-plugin-postcss](https://github.com/egoist/rollup-plugin-postcss) from 2.9.0 to 3.1.8.
- [Release notes](https://github.com/egoist/rollup-plugin-postcss/releases)
- [Changelog](https://github.com/egoist/rollup-plugin-postcss/blob/master/CHANGELOG-OLD.md)
- [Commits](https://github.com/egoist/rollup-plugin-postcss/commits/v3.1.8)

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

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
 2020-10-15 15:42:06 +02:00
dependabot[bot]
c84edea320
Bump @fortawesome/fontawesome-svg-core from 1.2.30 to 1.2.32 (#8289) 
Bumps [@fortawesome/fontawesome-svg-core](https://github.com/FortAwesome/Font-Awesome) from 1.2.30 to 1.2.32.
- [Release notes](https://github.com/FortAwesome/Font-Awesome/releases)
- [Changelog](https://github.com/FortAwesome/Font-Awesome/blob/master/CHANGELOG.md)
- [Commits](https://github.com/FortAwesome/Font-Awesome/commits)

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

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
 2020-10-15 15:41:50 +02:00
Jim LAURIE
72ad25e041
Merge pull request #8248 from strapi/docs-draft-update 
Update the draft and schedule guides
 2020-10-15 15:06:59 +02:00
cyril lopez
a54e89ef9c
Merge pull request #8272 from MattieBelt/fix/8262 
Fix links action on role list page
 2020-10-15 14:34:10 +02:00
cyril lopez
69876b9086
Merge branch 'master' into fix/8262 2020-10-15 14:17:25 +02:00
Alexandre BODIN
e53b54c218
Support query operators _or & _where in graphql with deep nesting (#8332) 
* SUpport query operators _or _where in graphql with deep nesting

Signed-off-by: Alexandre Bodin <bodin.alex@gmail.com>

* Add testing for complexe graphql queries

Signed-off-by: Alexandre Bodin <bodin.alex@gmail.com>
 2020-10-15 13:22:40 +02:00
Mattias van den Belt
5a1026322e
Merge branch 'master' into fix/8262 2020-10-15 12:46:53 +02:00
Alexandre BODIN
435b294439
Merge pull request #8226 from strapi/chore/node-14 
Support node v14 + CI refactor
 2020-10-15 12:40:32 +02:00
Alexandre Bodin
d450937f58 Fix code factor 
Signed-off-by: Alexandre Bodin <bodin.alex@gmail.com>
 2020-10-15 10:19:12 +02:00
Mattias van den Belt
213d4922df
Merge branch 'master' into fix/8262 2020-10-15 08:21:35 +02:00
Alexandre Bodin
4bcce63afb Use local actions 
Signed-off-by: Alexandre Bodin <bodin.alex@gmail.com>
 2020-10-14 19:26:25 +02:00
DMehaffy
1b1c7ca746
Add autoPopulate to model docs (#8323) 
Signed-off-by: Derrick Mehaffy <derrickmehaffy@gmail.com>
 2020-10-14 08:51:52 -07:00
soupette
c93cdefdab Merge branch 'master' of github.com:strapi/strapi into features/concurrent-editing 2020-10-14 17:26:06 +02:00
Alexandre BODIN
8b212d1e87
Merge pull request #8311 from strapi/cli/reset-admin-pwd 
Reset admin password CLI
 2020-10-14 14:53:10 +02:00
Alexandre Bodin
f132bc1886 scope env vars 
Signed-off-by: Alexandre Bodin <bodin.alex@gmail.com>
 2020-10-14 13:14:16 +02:00
Alexandre Bodin
ab3489fba6 Add global codecov to ci 
Signed-off-by: Alexandre Bodin <bodin.alex@gmail.com>
 2020-10-14 13:14:15 +02:00
Alexandre Bodin
36b80f26d9 add codecov 
Signed-off-by: Alexandre Bodin <bodin.alex@gmail.com>
 2020-10-14 13:14:15 +02:00
Alexandre Bodin
71a2657ed8 test node v14 
Signed-off-by: Alexandre Bodin <bodin.alex@gmail.com>
 2020-10-14 13:14:14 +02:00
Alexandre Bodin
8af60259cd Add CLI documentation 
Signed-off-by: Alexandre Bodin <bodin.alex@gmail.com>
 2020-10-14 13:14:03 +02:00
Alexandre Bodin
fa43dd8add Add tests 
Signed-off-by: Alexandre Bodin <bodin.alex@gmail.com>
 2020-10-14 13:14:02 +02:00
Alexandre Bodin
b8d206ede7 Cleanup some useless option config 
Signed-off-by: Alexandre Bodin <bodin.alex@gmail.com>
 2020-10-14 13:14:02 +02:00
Alexandre Bodin
c81af9a1d0 Init admin reset 
Signed-off-by: Alexandre Bodin <bodin.alex@gmail.com>
 2020-10-14 13:14:02 +02:00
Alexandre Bodin
5cc40a350f Merge branch 'master' of github.com:strapi/strapi 2020-10-14 13:13:49 +02:00
Alexandre Bodin
ea7a26d365 Add doc team as code owner instead of individuals 
Signed-off-by: Alexandre Bodin <bodin.alex@gmail.com>
 2020-10-14 13:12:50 +02:00
Ross Brown
1983d50aca
Adds warnings and workarounds for Brotli performance in koa-compress (#8261) 2020-10-14 13:07:32 +02:00
hhh
ed71cc2d8a
Fix file info of new uploaded file not being persisted after edit (#8244) 
* Fix file info of new uploaded file not being persisted after edit

Signed-off-by: henrych4 <singyinhenry@gmail.com>

* Fix typo and add test

Signed-off-by: henrych4 <singyinhenry@gmail.com>

Co-authored-by: cyril lopez <cyril.lpz@gmail.com>
 2020-10-14 13:04:08 +02:00
Thomas Pockrandt
10443df9e2
Update admin panel screenshot (#8265) 
* Update admin panel screenshot

Signed-off-by: Thomas Pockrandt <me@thomaspockrandt.com>

* Update image

Signed-off-by: Thomas Pockrandt <me@thomaspockrandt.com>
 2020-10-14 11:20:25 +02:00
Jean-Sébastien Herbaux
9871562359
Fix wrong permissions assigns (upload, users-permissions) (#8320) 
Signed-off-by: Convly <jean-sebastien.herbaux@epitech.eu>
 2020-10-13 18:51:09 +02:00
Jonas De Kegel
ecb377727a
Don't use mongoose 5.10.7 (#8278) 
resolved strapi/strapi#8066

Signed-off-by: Jonas De Kegel <jonas@fluid.desi>
 2020-10-13 18:14:48 +02:00
Mattias van den Belt
e0913c3214
Merge branch 'master' into fix/8262 2020-10-13 17:17:30 +02:00
meganelacheny
0f7b5ccc1e
Draft and Publish documentation - Fix (#8292) 
* Add note in Draft and Publish doc about activating feature at CT creation

* Fix wrong format for new note + Homogenise other special notices
 2020-10-13 07:32:36 -07:00
Maxime Castres
96e836a663
Add Academy link to the 'Join the community' card in the homepage (#8316) 
* Add Academy link to the 'Join the community' card in the homepage

Signed-off-by: Maxime Castres <mcastres@student.42.fr>

* Remove academy image

Signed-off-by: Maxime Castres <mcastres@student.42.fr>
 2020-10-13 16:20:33 +02:00
Yanuar Aditia
24ae46727c
Add indonesian lang for strapi-admin & strapi-plugin-users-permission (#8309) 2020-10-13 15:45:19 +02:00
Bochkarev Ivan
6d586e48b4 Update russian translate strapi-plugin-content-type-builder 
Signed-off-by: Bochkarev Ivan <ivanx86@gmail.com>
 2020-10-13 15:15:27 +02:00
Bochkarev Ivan
0abd23eaab
Added new translations into Russian (#8312) 
Signed-off-by: Bochkarev Ivan <ivanx86@gmail.com>
 2020-10-13 15:14:58 +02:00
yvesdo
94154d31df
Update Platform.sh button image URL (#8300) 
Co-authored-by: Alexandre BODIN <alexandrebodin@users.noreply.github.com>
 2020-10-12 19:29:38 +02:00