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

15371 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Alexandre Bodin
c78591553f v3.2.5 v3.2.5 2020-10-22 17:40:58 +02:00
Alexandre BODIN
328c1a3a13
Merge pull request #8442 from strapi/security/upload-proxy-disable 
Remove usage of unsecure proxy for now
 2020-10-22 17:37:28 +02:00
Thomas P
ef710166df
DOC: Reference the configuration options for SQL databases from the Databases guide (#8240) 
Signed-off-by: Thomas P <TPXP@users.noreply.github.com>
 2020-10-22 08:20:22 -07:00
DMehaffy
5cd6ccb5e2
Fix bad package in the update version guide (#8422) 
Signed-off-by: Derrick Mehaffy <derrickmehaffy@gmail.com>
 2020-10-22 08:17:31 -07:00
Alexandre BODIN
b515e756ac
Merge pull request #8420 from strapi/fix/8413 
Fix #8413 - Immer dependancy
 2020-10-22 17:15:59 +02:00
Alexandre BODIN
1149f8c627
Merge pull request #8417 from bykof/patch-1 
Adapt README.md because NodeJS 14 is supported now
 2020-10-22 17:15:02 +02:00
Alexandre Bodin
fbf831355d Remove usage of unsecure proxy for now 
Signed-off-by: Alexandre Bodin <bodin.alex@gmail.com>
 2020-10-22 17:07:38 +02:00
Alexandre BODIN
b324020579
Merge pull request #8440 from strapi/fix/preview-security 
Fix XSS security with the wysiwyg preview
 2020-10-22 16:31:02 +02:00
Alexandre BODIN
3cdd739879
Merge pull request #8439 from strapi/fix/ctb-permissions 
Add permission to CTB routes
 2020-10-22 16:30:20 +02:00
soupette
aedac98725 Fix XSS wysiwyg preview 
Signed-off-by: soupette <cyril.lpz@gmail.com>
 2020-10-22 16:14:27 +02:00
Convly
15e8a76f11 Add permission to CTB routes 
Signed-off-by: Convly <jean-sebastien.herbaux@epitech.eu>
 2020-10-22 15:54:13 +02:00
Luca Lionetti
7a2d87b2a3
Merge branch 'master' into it-translation 2020-10-22 15:18:25 +02:00
soupette
c5a99c8981 Duplicate container for single type 
Signed-off-by: soupette <cyril.lpz@gmail.com>
 2020-10-22 14:59:25 +02:00
soupette
d1e17cadd5 Merge branch 'master' of github.com:strapi/strapi into features/concurrent-editing 2020-10-22 14:24:02 +02:00
cyril lopez
4d00bc09b8
Merge pull request #8432 from strapi/dependabot/npm_and_yarn/eslint-plugin-node-11.1.0 
Bump eslint-plugin-node from 11.0.0 to 11.1.0
 2020-10-22 09:23:54 +02:00
dependabot[bot]
62d10d5019
Bump eslint-plugin-node from 11.0.0 to 11.1.0 
Bumps [eslint-plugin-node](https://github.com/mysticatea/eslint-plugin-node) from 11.0.0 to 11.1.0.
- [Release notes](https://github.com/mysticatea/eslint-plugin-node/releases)
- [Commits](https://github.com/mysticatea/eslint-plugin-node/compare/v11.0.0...v11.1.0)

Signed-off-by: dependabot[bot] <support@github.com>
 2020-10-22 06:50:06 +00:00
cyril lopez
52c1ac9c6b
Merge pull request #8433 from strapi/dependabot/npm_and_yarn/babel/polyfill-7.12.1 
Bump @babel/polyfill from 7.11.5 to 7.12.1
 2020-10-22 08:46:22 +02:00
dependabot[bot]
a836590e9b
Bump @babel/polyfill from 7.11.5 to 7.12.1 
Bumps [@babel/polyfill](https://github.com/babel/babel/tree/HEAD/packages/babel-polyfill) from 7.11.5 to 7.12.1.
- [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.1/packages/babel-polyfill)

Signed-off-by: dependabot[bot] <support@github.com>
 2020-10-22 06:02:39 +00:00
Chris Russo
ce848203b2
Update platformsh.md (#8430) 
Step 3 comes after 2, not step 4 ;)
 2020-10-21 20:00:05 -07:00
soupette
cdff5a4824 Fix margin in notification count 
Signed-off-by: soupette <cyril.lpz@gmail.com>
 2020-10-21 16:44:46 +02:00
Derrick Mehaffy
0b4a8109e2 Fix #8413 - Immer dependancy 
Signed-off-by: Derrick Mehaffy <derrickmehaffy@gmail.com>
 2020-10-21 07:03:46 -07:00
soupette
3de1a1fe98 Merge branch 'master' of github.com:strapi/strapi into features/application-settings 2020-10-21 14:56:00 +02:00
Michael Bykovski
838b8ac58e
NodeJS 14 is supported now 
NodeJS 14 is supported now, so remove the hint that it's not supported
 2020-10-21 13:34:17 +02:00
Alexandre Bodin
b00f6aab87 Merge branch 'master' into features/relational-fields 2020-10-21 10:17:22 +02:00
Alexandre BODIN
81c684d7b4
Merge pull request #8314 from strapi/fix/dpMigration 
fix d&p regressions
 2020-10-20 14:08:49 +02:00
Alexandre BODIN
b1aa7b95d8
Merge pull request #8356 from strapi/fix/dp-deep-filtering 
Fix deepFiltering with draft & publish
 2020-10-20 14:03:10 +02:00
Alexandre BODIN
5bc7aeb180
Merge pull request #8333 from strapi/telemetry/didUpdateRolePermissions 
add didUpdateRolePermissions event
 2020-10-20 13:57:53 +02:00
lucalionetti
142e31808c Update IT translations 
Translated missing from EN file

Signed-off-by: lucalionetti <lucalionetti96@gmail.com>
 2020-10-20 11:59:27 +02:00
Alexandre Bodin
54f83eae53 Add missing tests and remove dead code 
Signed-off-by: Alexandre Bodin <bodin.alex@gmail.com>
 2020-10-20 10:43:02 +02:00
Pierre Noël
1502a3976e refacto 
Signed-off-by: Pierre Noël <petersg83@gmail.com>
 2020-10-19 18:12:51 +02:00
Pierre Noël
907d6c9d33 refacto 
Signed-off-by: Pierre Noël <petersg83@gmail.com>
 2020-10-19 17:01:46 +02:00
Convly
07c38420d4 Fix buildQuery for polymorphic relations 
Signed-off-by: Convly <jean-sebastien.herbaux@epitech.eu>
 2020-10-19 15:42:32 +02:00
Convly
e1e2dd3419 Remove unnecessary custom option from query 
Signed-off-by: Convly <jean-sebastien.herbaux@epitech.eu>
 2020-10-19 15:39:56 +02:00
Convly
03f5342123 Fix deepFiltering with draft & publish 
Signed-off-by: Convly <jean-sebastien.herbaux@epitech.eu>
 2020-10-19 15:39:56 +02:00
Pierre Noël
1bc8ae4d0f fix tests 
Signed-off-by: Pierre Noël <petersg83@gmail.com>
 2020-10-19 14:48:03 +02:00
Pierre Noël
afa67add2b add didUpdateRolePermissions event 
Signed-off-by: Pierre Noël <petersg83@gmail.com>
 2020-10-19 12:34:33 +02:00
Pierre Noël
d84284faf2 refacto 
Signed-off-by: Pierre Noël <petersg83@gmail.com>
 2020-10-16 18:54:10 +02:00
Pierre Noël
e2341e9b06 run creation/update of the database even if the model hasnt changed 
Signed-off-by: Pierre Noël <petersg83@gmail.com>
 2020-10-16 18:54:10 +02:00
Pierre Noël
025eed964c dont run d&p migration at CT creation + rebuild tables if there were deleted in DB 
Signed-off-by: Pierre Noël <petersg83@gmail.com>
 2020-10-16 18:54:09 +02:00
Alexandre Bodin
fad9fda318 Merge branch 'master' into documentation 2020-10-16 18:24:22 +02:00
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