yujunjun/strapi
1
0
Fork 0
mirror of https://github.com/strapi/strapi.git synced 2025-12-30 00:37:24 +00:00
Code Issues Packages Projects Releases Wiki Activity
14,290 Commits 138 Branches 515 Tags
Commit Graph

14290 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Vinit Sarvade
dcd5254e60
Use brcrypt.compare for password validation instead of compareSync (#7612) 
Signed-off-by: Vinit Sarvade <vinit.sarvade.08@gmail.com>
 2020-09-01 17:03:37 +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
16261bb156 Fix PR feedback 
Signed-off-by: soupette <cyril.lpz@gmail.com>
 2020-08-31 14:17:30 +02:00
soupette
a9a978466e Fix conflicts 
Signed-off-by: soupette <cyril.lpz@gmail.com>
 2020-08-31 12:17:33 +02:00
cyril lopez
64de3a2ea2
Merge pull request #7606 from strapi/deps/bump-buffetjs 
Bump Buffet.js version
 2020-08-28 16:56:50 +02:00
soupette
1c4fafeeee Change users plugin settings menu section label 
Signed-off-by: soupette <cyril.lpz@gmail.com>
 2020-08-28 16:17:27 +02:00
soupette
0f847b159f Fix trad 
Signed-off-by: soupette <cyril.lpz@gmail.com>
 2020-08-28 16:14:00 +02:00
cyril lopez
eb62242bcc
Merge branch 'master' into deps/bump-buffetjs 2020-08-28 16:09:16 +02:00
soupette
b02c8b2c72 Fix small bugs. 
co-authored elabbassih@gmail.com

Signed-off-by: soupette <cyril.lpz@gmail.com>
 2020-08-28 14:52:55 +02:00
soupette
3c7ea06f2a Fix permissions 
Signed-off-by: soupette <cyril.lpz@gmail.com>
 2020-08-28 11:38:27 +02:00
soupette
bcd9075229 Remove useless files 
Signed-off-by: soupette <cyril.lpz@gmail.com>
 2020-08-28 09:43:48 +02:00
soupette
658ae9676f Add missing tests 
Signed-off-by: soupette <cyril.lpz@gmail.com>
 2020-08-28 09:39:28 +02:00
soupette
98a4401a09 Fix modal delete behaviour 
Signed-off-by: soupette <cyril.lpz@gmail.com>
 2020-08-27 18:09:26 +02:00
soupette
b328a3a38a Fix tests 
Signed-off-by: soupette <cyril.lpz@gmail.com>
 2020-08-27 17:23:45 +02:00
soupette
2e67e19bd6 Fix bugs 
Signed-off-by: soupette <cyril.lpz@gmail.com>
 2020-08-27 15:57:35 +02:00
soupette
5a7d89c807 Refacto create page 
Signed-off-by: soupette <cyril.lpz@gmail.com>
 2020-08-27 15:00:10 +02:00
soupette
5ed078c3ef Merge branch 'master' of github.com:strapi/strapi into users-permissions/create-new-role 2020-08-27 10:48:01 +02:00
cyril lopez
d9f701727b
Merge pull request #7527 from strapi/fix/decimal-input 
Fix decimal on content manager's inputs
 2020-08-27 10:20:53 +02:00
soupette
a8ea727e63 Fix PR feedback 
Signed-off-by: soupette <cyril.lpz@gmail.com>
 2020-08-26 16:01:27 +02:00
soupette
82ae1fc6c1 Fixes #7584. 
Update the documentation override

Signed-off-by: soupette <cyril.lpz@gmail.com>
 2020-08-26 14:55:09 +02:00
soupette
fb6010369a Fix conflicts 
Signed-off-by: soupette <cyril.lpz@gmail.com>
 2020-08-26 10:38:54 +02:00
cyril lopez
8bf691cb73
Merge branch 'master' into fix/decimal-input 2020-08-26 10:20:15 +02:00
cyril lopez
36caab4176
Merge branch 'master' into deps/bump-buffetjs 2020-08-26 09:40:16 +02:00
cyril lopez
22d281c831
Merge pull request #7589 from strapi/fix/cm-issues 
CM bug fixes
 2020-08-26 09:30:48 +02:00
soupette
c7fcb70d8f Bump Buffet.js version 
Signed-off-by: soupette <cyril.lpz@gmail.com>
 2020-08-26 09:10:57 +02:00
cyril lopez
051ee9b468
Merge branch 'master' into fix/cm-issues 2020-08-26 08:21:00 +02:00
cyril lopez
2957ad5b0d
Merge pull request #7597 from strapi/fix/small-issues 
Fix front-end small issues
 2020-08-26 08:20:50 +02:00
cyril lopez
6edaf61527
Merge branch 'master' into fix/cm-issues 2020-08-26 08:20:09 +02:00
soupette
a58442dcd5 Fixes #7503. 
This fix is temporary until we develop the menu API

Signed-off-by: soupette <cyril.lpz@gmail.com>
 2020-08-25 18:11:43 +02:00
soupette
4e4cb8e5c1 Fixes #7523 
Signed-off-by: soupette <cyril.lpz@gmail.com>
 2020-08-25 18:00:12 +02:00
cyril lopez
e6589f64eb
Merge pull request #7590 from strapi/fix/7572 
Prevent from uninstalling the upload plugin in the admin panel
 2020-08-25 17:52:42 +02:00
soupette
3b0555b290 Fixes #7455 
Signed-off-by: soupette <cyril.lpz@gmail.com>
 2020-08-25 10:36:30 +02:00
soupette
b04d69835b Downgrade rollup plugin svg 
Signed-off-by: soupette <cyril.lpz@gmail.com>
 2020-08-25 10:00:42 +02:00
soupette
1b157c3d2f Fixes #7572 
Signed-off-by: soupette <cyril.lpz@gmail.com>
 2020-08-25 09:32:37 +02:00
HichamELBSI
a3e11f1362 Fix decimal on content manager's inputs 
Signed-off-by: HichamELBSI <elabbassih@gmail.com>
 2020-08-25 09:25:17 +02:00
ELABBASSI Hicham
4ee79e2d9c
Merge pull request #7553 from strapi/fix/rename-add-comp-to-dz-event 
Rename addCompToDz event
 2020-08-23 14:40:47 +02:00
Convly
62d44368e2 Rename addComponentToDynamicZone to didAddComponentToDynamicZone 
Signed-off-by: Convly <jean-sebastien.herbaux@epitech.eu>
 2020-08-21 19:25:04 +02:00
Schaeferjo
ba218a2fe1
fix German word for E-Mail (#7534) 
Signed-off-by: Schaeferjo <mail@joschaefer.com>
 2020-08-20 18:03:23 +02:00
Jean-Sébastien Herbaux
1e67421668
Add utils::sanitize-entity tests (#7497) 
* Add utils::sanitize-entity tests

Signed-off-by: Convly <jean-sebastien.herbaux@epitech.eu>
 2020-08-18 16:26:24 +02:00
HichamELBSI
4e4a77ff0f Add new role 
Signed-off-by: HichamELBSI <elabbassih@gmail.com>
 2020-08-17 17:40:44 +02:00
Jim LAURIE
b39709a6ed
Merge pull request #7476 from XuluWarrior/docs/boom-before-sentry 
Boom middleware needs to be loaded before sentry middleware
 2020-08-17 15:19:35 +02:00
Jim LAURIE
979c5d3945
Merge pull request #7385 from ScottAgirs/master 
Update basic GraphQL Plugin information
 2020-08-17 14:56:54 +02:00
DMehaffy
bdf3b03c7e
Merge branch 'master' into master 2020-08-15 10:32:53 -07:00
XuluWarrior
122e4b7664 Boom middleware needs to be loaded before sentry middleware 
Signed-off-by: XuluWarrior <github@metaliving.plus.com>
 2020-08-14 15:05:27 +01:00
ScottAgirs
a930d6e814 Grammar fix 
Signed-off-by: ScottAgirs <scott@ijs.to>
 2020-08-13 21:30:28 -04:00
dependabot[bot]
888036ddbe
Bump react from 16.13.0 to 16.13.1 
Bumps [react](https://github.com/facebook/react/tree/HEAD/packages/react) from 16.13.0 to 16.13.1.
- [Release notes](https://github.com/facebook/react/releases)
- [Changelog](https://github.com/facebook/react/blob/master/CHANGELOG.md)
- [Commits](https://github.com/facebook/react/commits/v16.13.1/packages/react)

Signed-off-by: dependabot[bot] <support@github.com>
 2020-08-13 17:22:49 +00:00
Alexandre Bodin
331b73801f Merge branch 'documentation' 2020-08-13 19:12:56 +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 v3.1.4 2020-08-13 18:58:14 +02:00