yujunjun/strapi
1
0
Fork 0
mirror of https://github.com/strapi/strapi.git synced 2025-09-21 22:40:24 +00:00
Code Issues Packages Projects Releases Wiki Activity
14,903 Commits 123 Branches 496 Tags
Commit Graph

1507 Commits

Author SHA1 Message Date
Alexandre Bodin
5fe7fa2f79 v3.3.3 2020-11-16 16:47:16 +01:00
dependabot[bot]
d3c249c876
Bump bootstrap from 4.5.2 to 4.5.3 (#8579) 
Bumps [bootstrap](https://github.com/twbs/bootstrap) from 4.5.2 to 4.5.3.
- [Release notes](https://github.com/twbs/bootstrap/releases)
- [Commits](https://github.com/twbs/bootstrap/compare/v4.5.2...v4.5.3)

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

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
 2020-11-12 15:57:21 +01:00
Alexandre Bodin
17ea510715 v3.3.2 2020-11-10 19:02:11 +01:00
dependabot[bot]
2d05afa17e
Bump @babel/core from 7.11.6 to 7.12.3 (#8398) 
Bumps [@babel/core](https://github.com/babel/babel/tree/HEAD/packages/babel-core) from 7.11.6 to 7.12.3.
- [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.3/packages/babel-core)

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

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
 2020-11-10 09:45:19 +01:00
Alexandre Bodin
98bb6a3d31 v3.3.1 2020-11-09 19:22:52 +01:00
Pierre Noël
ec1c2a22c3 v3.3.0 2020-11-09 17:55:10 +01:00
soupette
30cb4f4226 Merge branch 'master' of github.com:strapi/strapi into features/application-settings 2020-10-27 17:28:39 +01:00
Alexandre Bodin
c78591553f v3.2.5 2020-10-22 17:40:58 +02:00
soupette
3de1a1fe98 Merge branch 'master' of github.com:strapi/strapi into features/application-settings 2020-10-21 14:56:00 +02:00
Alexandre Bodin
e8153d99c0 v3.2.4 2020-10-16 18:22:15 +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
soupette
10a39592f9 Merge branch 'master' of github.com:strapi/strapi into features/application-settings 2020-10-15 15:02:29 +02:00
HichamELBSI
46cb089496 Merge branch 'features/application-settings' into core/new-notif-api 2020-10-14 14:40:00 +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
7485de2fdf v3.2.3 2020-10-09 17:12:50 +02:00
Convly
b3d0b72198 v3.2.2 2020-10-09 11:52:09 +02:00
dependabot[bot]
efa530e933
Bump rimraf from 3.0.0 to 3.0.2 (#8257) 
Bumps [rimraf](https://github.com/isaacs/rimraf) from 3.0.0 to 3.0.2.
- [Release notes](https://github.com/isaacs/rimraf/releases)
- [Changelog](https://github.com/isaacs/rimraf/blob/master/CHANGELOG.md)
- [Commits](https://github.com/isaacs/rimraf/compare/v3.0.0...v3.0.2)

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

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
 2020-10-09 10:31:59 +02:00
HichamELBSI
a804b8c087 New notification API + Update notif 
Signed-off-by: HichamELBSI <elabbassih@gmail.com>
 2020-10-08 17:22:38 +02:00
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
HichamELBSI
9667f0fc3b Bump BuffetJS to 3.3.1 
Signed-off-by: HichamELBSI <elabbassih@gmail.com>
 2020-10-02 09:54:18 +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
HichamELBSI
a2a31ce8df Fix Role edit alignment (Permission's list) 
Signed-off-by: HichamELBSI <elabbassih@gmail.com>
 2020-09-25 12:19:31 +02:00
Alexandre Bodin
3c7c33eab7 v3.1.6 2020-09-24 14:51:49 +02:00
soupette
fa762abee7 Bump buffet.js to stable version 
Signed-off-by: soupette <cyril.lpz@gmail.com>
 2020-09-24 08:36:26 +02:00
Alexandre Bodin
90761175f6 Merge branch 'master' into features/draft-publish 2020-09-23 18:19:26 +02:00
soupette
6020c8e7e5 Upgrade buffet.js rc.5 
Signed-off-by: soupette <cyril.lpz@gmail.com>
 2020-09-23 17:20:24 +02:00
soupette
a0dfa14f04 fix wrong props 
Signed-off-by: soupette <cyril.lpz@gmail.com>
 2020-09-23 16:56:18 +02:00
soupette
ab1587a049 Upgrade buffetjs 
Signed-off-by: soupette <cyril.lpz@gmail.com>
 2020-09-23 12:20:29 +02:00
dependabot[bot]
e1875f0616
Bump react-helmet from 6.0.0 to 6.1.0 (#8001) 
Bumps [react-helmet](https://github.com/nfl/react-helmet) from 6.0.0 to 6.1.0.
- [Release notes](https://github.com/nfl/react-helmet/releases)
- [Changelog](https://github.com/nfl/react-helmet/blob/master/CHANGELOG.md)
- [Commits](https://github.com/nfl/react-helmet/compare/6.0.0...6.1.0)

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

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
 2020-09-23 11:48:30 +02:00
soupette
c04349a027 Fix Pr feedback 
Signed-off-by: soupette <cyril.lpz@gmail.com>
 2020-09-22 17:46:01 +02:00
soupette
b6e6f7cbbd Fix relation display 
Signed-off-by: soupette <cyril.lpz@gmail.com>
 2020-09-22 17:45:59 +02:00
soupette
7af5408b1a Upgrade buffet.js 
Signed-off-by: soupette <cyril.lpz@gmail.com>
 2020-09-22 17:45:57 +02:00
soupette
e6cd132b6d Fix select background 
Signed-off-by: soupette <cyril.lpz@gmail.com>
 2020-09-22 17:39:36 +02:00
soupette
d08a392bb2 Created custom modal warning 
Signed-off-by: soupette <cyril.lpz@gmail.com>
 2020-09-22 17:39:35 +02:00
soupette
1fb475e7a9 Clean popupwarning 
Signed-off-by: soupette <cyril.lpz@gmail.com>
 2020-09-22 17:39:35 +02:00
soupette
ae1fcdecf3 Fix admin roles bugs. Wrong redirection after creating a role, reset and submit logic 
Signed-off-by: soupette <cyril.lpz@gmail.com>
 2020-09-22 17:39:24 +02:00
HichamELBSI
f8236cea39 Unpublish an entry 
Signed-off-by: HichamELBSI <elabbassih@gmail.com>
 2020-09-22 17:39:21 +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
dependabot[bot]
a41f9d82ef
Bump @babel/core from 7.9.0 to 7.11.6 (#7982) 
Bumps [@babel/core](https://github.com/babel/babel/tree/HEAD/packages/babel-core) from 7.9.0 to 7.11.6.
- [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.11.6/packages/babel-core)

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

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
 2020-09-22 13:24:24 +02:00
Convly
736a580001 v3.1.5 2020-09-16 15:26:12 +02:00
dependabot[bot]
49f992359f
Bump bootstrap from 4.4.1 to 4.5.2 (#7841) 
Bumps [bootstrap](https://github.com/twbs/bootstrap) from 4.4.1 to 4.5.2.
- [Release notes](https://github.com/twbs/bootstrap/releases)
- [Commits](https://github.com/twbs/bootstrap/compare/v4.4.1...v4.5.2)

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

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
 2020-09-14 09:27:37 +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
Alexandre BODIN
77be3ea4c5
Merge pull request #7467 from strapi/users-permissions/create-new-role 
Users and Permissions in Settings menu
 2020-08-31 15:33:02 +02:00
Alexandre BODIN
d1e8b8df7c
Merge pull request #7450 from strapi/dependabot/npm_and_yarn/react-16.13.1 
Bump react from 16.13.0 to 16.13.1
 2020-08-31 15:24:08 +02:00
soupette
a9a978466e Fix conflicts 
Signed-off-by: soupette <cyril.lpz@gmail.com>
 2020-08-31 12:17:33 +02:00
soupette
fb6010369a Fix conflicts 
Signed-off-by: soupette <cyril.lpz@gmail.com>
 2020-08-26 10:38:54 +02:00