yujunjun/strapi
1
0
Fork 0
mirror of https://github.com/strapi/strapi.git synced 2025-10-31 01:47:13 +00:00
Code Issues Packages Projects Releases Wiki Activity
14,631 Commits 118 Branches 507 Tags
Commit Graph

473 Commits

Author SHA1 Message Date
Alexandre Bodin
5a77b560e3 v3.2.1 2020-10-07 14:50:47 +02:00
Alexandre Bodin
95f3502ab4 v3.2.0 2020-10-06 11:01:02 +02:00
Alexandre Bodin
c98089ff65 Merge branch 'master' into releases/3.2 
Signed-off-by: Alexandre Bodin <bodin.alex@gmail.com>
 2020-10-05 12:00:03 +02:00
Convly
564f9228ca v3.1.7 2020-10-02 11:48:42 +02:00
Alexandre Bodin
8589848ce4 Merge branch 'features/draft-publish' into releases/3.2 
Signed-off-by: Alexandre Bodin <bodin.alex@gmail.com>
 2020-10-01 16:23:32 +02:00
dependabot[bot]
4ad37956d7
Bump sqlite3 from 4.2.0 to 5.0.0 (#8122) 
Bumps [sqlite3](https://github.com/mapbox/node-sqlite3) from 4.2.0 to 5.0.0.
- [Release notes](https://github.com/mapbox/node-sqlite3/releases)
- [Changelog](https://github.com/mapbox/node-sqlite3/blob/master/CHANGELOG.md)
- [Commits](https://github.com/mapbox/node-sqlite3/compare/v4.2.0...v5.0.0)

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

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
 2020-10-01 13:22:56 +02:00
Alexandre Bodin
3c7c33eab7 v3.1.6 2020-09-24 14:51:49 +02:00
soupette
5a6d9a89b8 Created utility to get draft relations 
Signed-off-by: soupette <cyril.lpz@gmail.com>
 2020-09-22 17:39:34 +02:00
soupette
d3082807d1 Add dnd relation state 
Signed-off-by: soupette <cyril.lpz@gmail.com>
 2020-09-22 17:39:32 +02:00
soupette
a5ff026568 Remove models 
Signed-off-by: soupette <cyril.lpz@gmail.com>
 2020-09-22 17:39:28 +02:00
soupette
efa547aa31 Fix validations 
Signed-off-by: soupette <cyril.lpz@gmail.com>
 2020-09-22 17:39:28 +02:00
soupette
1bf63ef388 Fix role creation and edition 
Signed-off-by: soupette <cyril.lpz@gmail.com>
 2020-09-22 17:39:25 +02:00
HichamELBSI
941b381ffb Add publish permission 
Signed-off-by: HichamELBSI <elabbassih@gmail.com>
 2020-09-22 17:39:19 +02:00
soupette
4b207e6cc0 Add D&P key to all models. Change UI modal divider 
Signed-off-by: soupette <cyril.lpz@gmail.com>
 2020-09-22 17:39:10 +02:00
Peter Etelej
318f20e826
Bump up minimum required Node to 10.16 (#7962) 
Updated README docs & package.json `engine` versions to bump up the
minimum required Node version from `10.10` to `10.16` (or `10.16.0+`)

Strapi no longer supports `10.10` since it updated `sharp` to `0.26.0`
( https://github.com/strapi/strapi/pull/7729 ) which requires Node 10.16.0+
(See https://github.com/lovell/sharp/blob/master/docs/changelog.md#v0260---25th-august-2020 )

` yarn create strapi-app my-project --quickstart` on 10.10 fails with error
```
error sharp@0.26.0: The engine "node" is incompatible with this module. Expected version ">=10.16.0". Got "10.10.0"
error Found incompatible module.
```

Signed-off-by: Peter Etelej <peter@etelej.com>
 2020-09-22 16:00:13 +02:00
Convly
736a580001 v3.1.5 2020-09-16 15:26:12 +02:00
Abdón Rodríguez Davila
d2ef1d4b8c
Allow more options to the Apollo Server config (#7665) 
* Extract server config to a constant

Signed-off-by: Abdón Rodríguez Davila <a@abdonrd.com>

* Omit options to server config

Signed-off-by: Abdón Rodríguez Davila <a@abdonrd.com>

* Move default config to serverParams

Signed-off-by: Abdón Rodríguez Davila <a@abdonrd.com>

* Simplify Apollo server config

Signed-off-by: Abdón Rodríguez Davila <a@abdonrd.com>

* Simplify with a new apolloServerConfig property

Signed-off-by: Abdón Rodríguez Davila <a@abdonrd.com>

* Update tracing documentation

Signed-off-by: Abdón Rodríguez Davila <a@abdonrd.com>

* Extract deprecated options

Signed-off-by: Abdón Rodríguez Davila <a@abdonrd.com>

* Add default options

Signed-off-by: Abdón Rodríguez Davila <a@abdonrd.com>

* Update documentation

Signed-off-by: Abdón Rodríguez Davila <a@abdonrd.com>

* Rename to deprecatedApolloServerConfig

Signed-off-by: Abdón Rodríguez Davila <a@abdonrd.com>

* Empty default options

Signed-off-by: Abdón Rodríguez Davila <a@abdonrd.com>

* Update default config

Signed-off-by: Abdón Rodríguez Davila <a@abdonrd.com>

* Add warning note

Signed-off-by: Abdón Rodríguez Davila <a@abdonrd.com>

* Add documentation note

Signed-off-by: Abdón Rodríguez Davila <a@abdonrd.com>

* Update documentation note

Signed-off-by: Abdón Rodríguez Davila <a@abdonrd.com>

* Fix the config check

Signed-off-by: Abdón Rodríguez Davila <a@abdonrd.com>

* Fix the config check

Signed-off-by: Abdón Rodríguez Davila <a@abdonrd.com>

* Refactor old code and rename param to appoloServer to avoid redondancy

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

* Fix typo

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

Co-authored-by: Alexandre Bodin <bodin.alex@gmail.com>
 2020-09-04 09:51:11 +02:00
DMehaffy
024b337b09
Update node version requirements for v10 to v12 (#7409) 
Signed-off-by: Derrick Mehaffy <derrickmehaffy@gmail.com>
 2020-09-02 17:11:59 +02:00
Pierre Noël
231263a353 v3.1.4 2020-08-13 18:58:14 +02:00
Alexandre Bodin
97922f99ae v3.1.3 2020-07-31 09:59:56 +02:00
Alexandre Bodin
6aaa018ff5 v3.1.2 2020-07-29 13:34:01 +02:00
Alexandre Bodin
ac62bac98e Upgrade lodash 
Signed-off-by: Alexandre Bodin <bodin.alex@gmail.com>
 2020-07-29 13:05:50 +02:00
dependabot[bot]
aea96bca68
Bump lodash from 4.17.15 to 4.17.19 (#7239) 
Bumps [lodash](https://github.com/lodash/lodash) from 4.17.15 to 4.17.19.
- [Release notes](https://github.com/lodash/lodash/releases)
- [Commits](https://github.com/lodash/lodash/compare/4.17.15...4.17.19)

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

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
 2020-07-29 11:10:32 +02:00
Alexandre Bodin
35bae7df57 v3.1.1 2020-07-23 18:53:55 +02:00
Alexandre Bodin
1bbf1bc0dc v3.1.0 2020-07-21 19:30:45 +02:00
Alexandre Bodin
62b2192c95 Update license info 
Signed-off-by: Alexandre Bodin <bodin.alex@gmail.com>
 2020-07-20 18:40:52 +02:00
Alexandre BODIN
47de0851bc
Merge pull request #7046 from strapi/fix/ce-allow-role-name-edition 
Allow name edition in CE
 2020-07-20 12:46:48 +02:00
Alexandre Bodin
6bafa35a36 Merge branch 'releases/3.1.0' into features/rbac 
Signed-off-by: Alexandre Bodin <bodin.alex@gmail.com>
 2020-07-18 10:12:40 +02:00
soupette
11afd28f35 Allow name edition in CE 
Signed-off-by: soupette <cyril.lpz@gmail.com>
 2020-07-17 12:37:21 +02:00
Alexandre Bodin
4d31935716 v3.0.6 2020-07-16 17:03:04 +02:00
soupette
e46b56e460 Clean models 
Signed-off-by: soupette <cyril.lpz@gmail.com>
 2020-07-10 10:38:52 +02:00
Alexandre Bodin
e8063ceb28 Add relation-list route in the CM 
Signed-off-by: Alexandre Bodin <bodin.alex@gmail.com>
 2020-07-08 11:48:41 +02:00
soupette
970273a9b9 Fix validations 
Signed-off-by: soupette <cyril.lpz@gmail.com>
 2020-07-08 11:46:32 +02:00
soupette
ddb37266ae Add permissions to edit 
Signed-off-by: soupette <cyril.lpz@gmail.com>
 2020-07-08 11:42:28 +02:00
soupette
577471142d Add permissions for update 
Signed-off-by: soupette <cyril.lpz@gmail.com>
 2020-07-08 11:42:28 +02:00
soupette
f2c9716156 Fix dynamiczones 
Signed-off-by: soupette <cyril.lpz@gmail.com>
 2020-07-08 11:37:47 +02:00
soupette
fde9b99a44 Add permissions to Inputs level 
Signed-off-by: soupette <cyril.lpz@gmail.com>
 2020-07-08 11:37:47 +02:00
soupette
ec80117a49 Add permissions for creating to simple ct 
Signed-off-by: soupette <cyril.lpz@gmail.com>
 2020-07-08 11:37:45 +02:00
HichamELBSI
342e0a9a86 Fix PR review 2 
Signed-off-by: HichamELBSI <elabbassih@gmail.com>
 2020-07-08 11:11:22 +02:00
soupette
2de81865d8 Remove ct 
Signed-off-by: soupette <cyril.lpz@gmail.com>
 2020-07-08 11:09:46 +02:00
soupette
cc20facc5e Add permissions to roles 
Signed-off-by: soupette <cyril.lpz@gmail.com>
 2020-07-08 11:09:46 +02:00
HichamELBSI
3d4a43545e Content type attributes permissions integration 
Signed-off-by: HichamELBSI <elabbassih@gmail.com>
 2020-07-08 11:05:02 +02:00
soupette
ac9e3a60d2 Fixe baseline 
Signed-off-by: soupette <cyril.lpz@gmail.com>
 2020-07-08 10:57:17 +02:00
Alexandre Bodin
e597bddc59 Add tests 
Signed-off-by: Alexandre Bodin <bodin.alex@gmail.com>
 2020-07-08 10:24:47 +02:00
Alexandre Bodin
a4f294f1c4 Use passport standard error handling 
Signed-off-by: Alexandre Bodin <bodin.alex@gmail.com>
 2020-07-08 10:24:38 +02:00
Alexandre Bodin
ceb11379fc Add passportjs and refactor login 
Signed-off-by: Alexandre Bodin <bodin.alex@gmail.com>
 2020-07-08 10:23:50 +02:00
Alexandre Bodin
eaf40e1ada v3.0.5 2020-06-23 12:18:00 +02:00
Alexandre Bodin
9ed11a6682 v3.0.4 2020-06-19 09:19:52 +02:00
Alexandre Bodin
c909d7162d v3.0.3 2020-06-18 19:17:15 +02:00
Boom Lee
a26b4f65a8
Fix node version (#6482) (#6691) 2020-06-16 11:32:23 +02:00