yujunjun/strapi
1
0
Fork 0
mirror of https://github.com/strapi/strapi.git synced 2025-11-02 10:55:37 +00:00
Code Issues Packages Projects Releases Wiki Activity
14,619 Commits 121 Branches 507 Tags
Commit Graph

723 Commits

Author SHA1 Message Date
Alexandre Bodin
95f3502ab4 v3.2.0 2020-10-06 11:01:02 +02:00
Rémi de Juvigny
6bc8662ff6
Handle template download error (#8179) 
Signed-off-by: Rémi de Juvigny <remi@hey.com>
 2020-10-05 09:41:59 +02:00
Alexandre Bodin
66e8579fc7 Merge branch 'master' into features/templates-cli 2020-10-02 15:21:16 +02:00
Alexandre Bodin
035ae1045f Use os tmp dir and simplify some code 
Signed-off-by: Alexandre Bodin <bodin.alex@gmail.com>
 2020-10-02 15:20:50 +02:00
Rémi de Juvigny
e64ac06af8 Better error handling 
Signed-off-by: Rémi de Juvigny <remi@hey.com>
 2020-10-02 12:40:31 +02:00
Convly
564f9228ca v3.1.7 2020-10-02 11:48:42 +02:00
Alexandre Bodin
0e064d10e8 Merge branch 'master' into features/templates-cli 
Signed-off-by: Alexandre Bodin <bodin.alex@gmail.com>
 2020-10-02 10:20:10 +02:00
dependabot[bot]
048e6fd3af
Bump mongoose from 5.8.0 to 5.10.7 (#8046) 
* Bump mongoose from 5.8.0 to 5.10.7

Bumps [mongoose](https://github.com/Automattic/mongoose) from 5.8.0 to 5.10.7.
- [Release notes](https://github.com/Automattic/mongoose/releases)
- [Changelog](https://github.com/Automattic/mongoose/blob/master/History.md)
- [Commits](https://github.com/Automattic/mongoose/compare/5.8.0...5.10.7)

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

* Do not use empty username or password in mongo connection

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-02 09:27:46 +02:00
Rémi de Juvigny
5726c36edf Fix yarn lock conflict 
Signed-off-by: Rémi de Juvigny <remi@hey.com>
 2020-09-30 11:19:20 +02:00
Alexandre Bodin
3c7c33eab7 v3.1.6 2020-09-24 14:51:49 +02:00
Rémi de Juvigny
3b0e02fe00 Autofix yarn.lock conflict 
Signed-off-by: Rémi de Juvigny <remi@hey.com>
 2020-09-23 14:25:55 +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
Rémi de Juvigny
9a8cf2eecf
Merge branch 'master' into templates-cli 2020-09-08 10:20:58 +02:00
Rémi de Juvigny
d13c868fce Add template property to our analytics 
Signed-off-by: Rémi de Juvigny <remi@hey.com>
 2020-09-08 09:56:14 +02:00
Rémi de Juvigny
24d42f385f Apply review feedback 
Signed-off-by: Rémi de Juvigny <remi@hey.com>
 2020-09-04 16:07:55 +02:00
Alexandre Bodin
6905be68bc Merge branch 'documentation' 2020-09-02 17:23:41 +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
dependabot[bot]
46e8375cd7
Bump fs-extra from 8.1.0 to 9.0.1 (#7496) 
Bumps [fs-extra](https://github.com/jprichardson/node-fs-extra) from 8.1.0 to 9.0.1.
- [Release notes](https://github.com/jprichardson/node-fs-extra/releases)
- [Changelog](https://github.com/jprichardson/node-fs-extra/blob/master/CHANGELOG.md)
- [Commits](https://github.com/jprichardson/node-fs-extra/compare/8.1.0...9.0.1)

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

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
 2020-09-01 17:16:09 +02:00
Rémi de Juvigny
81d587e11e Prevent template from overwriting uuid 
Signed-off-by: Rémi de Juvigny <remi@hey.com>
 2020-08-31 12:32:21 +02:00
Rémi de Juvigny
720ab27eed Add UUID prefix 
Signed-off-by: Rémi de Juvigny <remi@hey.com>
 2020-08-28 10:45:22 +02:00
Rémi de Juvigny
11c9ea17eb Add --template option to create-strapi-app 
Signed-off-by: Rémi de Juvigny <remi@hey.com>
 2020-08-28 10:23:03 +02:00
Pierre Noël
fb2db4b050 v3.1.4 
Signed-off-by: Pierre Noël <petersg83@gmail.com>
 2020-08-13 19:05:20 +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
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
Alexandre Bodin
4d31935716 v3.0.6 2020-07-16 17:03:04 +02:00
Alexandre Bodin
b71ffa6c6c Merge branch 'master' into features/rbac 2020-07-16 14:52:55 +02:00
Aurélien GEORGET
baa034e1c0
Add noRun property in global scope (#7030) 
Signed-off-by: Aurélien Georget <aurelsicoko@gmail.com>
 2020-07-16 11:07:39 +02:00
Alexandre Bodin
e0dde4cd0f Add license.txt to default gitignore 
Signed-off-by: Alexandre Bodin <bodin.alex@gmail.com>
 2020-07-08 19:57:37 +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
ceb11379fc Add passportjs and refactor login 
Signed-off-by: Alexandre Bodin <bodin.alex@gmail.com>
 2020-07-08 10:23:50 +02:00
soupette
62a79a5fc0 Created basic routing for the settings 
Signed-off-by: soupette <cyril.lpz@gmail.com>
 2020-07-08 09:45:28 +02:00
Aurélien GEORGET
aad7f486d2
Support STRAPI_UUID_PREFIX env var (#6797) 
Signed-off-by: Aurélien Georget <aurelsicoko@gmail.com>
 2020-06-24 18:27:49 +02:00
Aurélien GEORGET
245d54c08c
Stringify boolean to detect Yarn or npm (#6795) 
Signed-off-by: Aurélien Georget <aurelsicoko@gmail.com>
 2020-06-24 16:12:34 +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
Alexandre Bodin
497fb742eb v3.0.2 2020-06-15 17:09:15 +02:00
Alexandre Bodin
5b64e05d7f v3.0.1 2020-05-29 09:38:21 +02:00
Abdón Rodríguez Davila
d38b9d35b9
Fix multiple doc links (#6375) 2020-05-27 12:29:53 +02:00
Alexandre Bodin
6bb7a7f198 v3.0.0 2020-05-26 15:09:32 +02:00
Alexandre Bodin
f192d5e171 Merge branch 'master' into develop 
Signed-off-by: Alexandre Bodin <bodin.alex@gmail.com>
 2020-05-07 13:14:23 +02:00