yujunjun/strapi
1
0
Fork 0
mirror of https://github.com/strapi/strapi.git synced 2025-08-07 16:29:18 +00:00
Code Issues Packages Projects Releases Wiki Activity
14,807 Commits 112 Branches 488 Tags
Commit Graph

14807 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Alexandre Bodin
3bd10d605d Fix https://github.com/strapi/strapi/issues/7561 
Signed-off-by: Alexandre Bodin <bodin.alex@gmail.com>
 2020-09-01 14:59:08 +02:00
Derrick Mehaffy
5900b488de Heroku PG DB env variable deconstruction automatically 2020-08-31 14:25:33 -07: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
Rémi de Juvigny
3f7407f5d0
Merge branch 'master' into templates-cli 2020-08-31 12:36:18 +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
soupette
a9a978466e Fix conflicts 
Signed-off-by: soupette <cyril.lpz@gmail.com>
 2020-08-31 12:17:33 +02:00
Valerian Pereira
e6511a9f74
GraphQL Typos fixed to improve documentation (#7644) 
Signed-off-by: Valerian Pereira <valerianpereira25@gmail.com>
 2020-08-30 14:39:05 -07: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
Rémi de Juvigny
ea5eaafb66 Document templates usage and creation 
Signed-off-by: Rémi de Juvigny <remi@hey.com>
 2020-08-28 16:20:22 +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
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
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
Jim LAURIE
358c167a04
Merge pull request #7524 from strapi/docs/guides/updateUnitTest 
Add warning to unit testing guide for windows/SQLite
 2020-08-20 14:13:44 +02:00
Derrick Mehaffy
4324f170c9
Add warning to unit testing guide for windows/SQLite 
Signed-off-by: Derrick Mehaffy <derrickmehaffy@gmail.com>
 2020-08-19 06:55:38 -07: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
Maxime Castres
28f1d6df86
Integration documentation (#7282) 
* Cleanup shelljs

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

* Bump koa-session from 5.13.1 to 6.0.0 (#7254)

Bumps [koa-session](https://github.com/koajs/session) from 5.13.1 to 6.0.0.
- [Release notes](https://github.com/koajs/session/releases)
- [Changelog](https://github.com/koajs/session/blob/master/History.md)
- [Commits](https://github.com/koajs/session/compare/5.13.1...6.0.0)

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

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

* Fix #7252: fix relation name
fix regression issue due to pull #7204

Signed-off-by: Akash P <aksdevac@gmail.com>

* v3.1.3

* Add React Integration

* Remove character

* Created a new component for less code

* Review modifications

* Review modifications 2

* Add Vue.js, Next.js, Nuxt.js, Gatsby and GraphQL inte

* Change Select with Checkboxes

* Remove useless fonction in Next.js

* Update Next.js

* Update Next.js 2

* Update Vue.js and Nuxt.js

* Update React and Next.js

* Update Post example

* Update all

* Last reviews

Co-authored-by: Alexandre Bodin <bodin.alex@gmail.com>
Co-authored-by: Alexandre BODIN <alexandrebodin@users.noreply.github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: Akash P <aksdevac@gmail.com>
 2020-08-17 10:29:04 -07:00