yujunjun/strapi
1
0
Fork 0
mirror of https://github.com/strapi/strapi.git synced 2025-10-26 23:51:10 +00:00
Code Issues Packages Projects Releases Wiki Activity
14,792 Commits 118 Branches 505 Tags
Commit Graph

14792 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Alexandre Bodin
02c7d97ffc Remove multipart 
Signed-off-by: Alexandre Bodin <bodin.alex@gmail.com>
 2020-11-03 10:00:50 +01:00
Alexandre Bodin
f1789cc1b9 Clean open-api spec 
Signed-off-by: Alexandre Bodin <bodin.alex@gmail.com>
 2020-11-03 08:18:14 +01:00
Alexandre Bodin
cbafb3ef92 Add pagination 
Signed-off-by: Alexandre Bodin <bodin.alex@gmail.com>
 2020-11-03 08:12:05 +01:00
Alexandre Bodin
9438230648 move entity to entity-manager 
Signed-off-by: Alexandre Bodin <bodin.alex@gmail.com>
 2020-11-02 21:13:50 +01:00
Alexandre Bodin
7f906d7cf2 Refactoring 
Signed-off-by: Alexandre Bodin <bodin.alex@gmail.com>
 2020-11-02 19:50:55 +01:00
Alexandre Bodin
08a603623b Cleanup tests 
Signed-off-by: Alexandre Bodin <bodin.alex@gmail.com>
 2020-11-02 19:41:46 +01:00
Alexandre Bodin
0db015e6c2 Update tests 
Signed-off-by: Alexandre Bodin <bodin.alex@gmail.com>
 2020-11-02 19:41:45 +01:00
Alexandre Bodin
bfa6766475 init coll-type 
Signed-off-by: Alexandre Bodin <bodin.alex@gmail.com>
 2020-11-02 19:41:45 +01:00
Alexandre Bodin
2bbd47ba2c Single type routes 
Signed-off-by: Alexandre Bodin <bodin.alex@gmail.com>
 2020-11-02 19:41:44 +01:00
Alexandre Bodin
7509a16152 Refactor relation-list route 
Signed-off-by: Alexandre Bodin <bodin.alex@gmail.com>
 2020-11-02 19:41:44 +01:00
Alexandre Bodin
b37a92c60f Refactored uid utils 
Signed-off-by: Alexandre Bodin <bodin.alex@gmail.com>
 2020-11-02 19:41:44 +01:00
Alexandre Bodin
cdefc1d2de Update open api script 
Signed-off-by: Alexandre Bodin <bodin.alex@gmail.com>
 2020-11-02 19:41:43 +01:00
Alexandre Bodin
487b872210 Add open api spec and script to serve it 
Signed-off-by: Alexandre Bodin <bodin.alex@gmail.com>
 2020-11-02 19:41:43 +01:00
Alexandre Bodin
07e7cfc0bd Make lint stricter and fix the errors 
Signed-off-by: Alexandre Bodin <bodin.alex@gmail.com>
 2020-11-02 19:41:42 +01:00
Alexandre Bodin
8ecc36cfa3 Init refactoring of content manager configuration routes 
Signed-off-by: Alexandre Bodin <bodin.alex@gmail.com>
 2020-11-02 19:41:42 +01:00
Alexandre Bodin
b325fd0572 Move content type schemas routes 
Signed-off-by: Alexandre Bodin <bodin.alex@gmail.com>
 2020-11-02 19:41:41 +01:00
soupette
c64a07f6cf Fix PR feedback 
Signed-off-by: soupette <cyril.lpz@gmail.com>
 2020-10-23 17:21:12 +02:00
soupette
5f545a86f4 Allow to select relational fields in the listview 
Signed-off-by: soupette <cyril.lpz@gmail.com>
 2020-10-23 17:21:11 +02:00
soupette
8a0c766e7f Add new description for relation settings field 
Signed-off-by: soupette <cyril.lpz@gmail.com>
 2020-10-23 17:21:11 +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
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
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
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