yujunjun/strapi
1
0
Fork 0
mirror of https://github.com/strapi/strapi.git synced 2025-09-25 08:19:07 +00:00
Code Issues Packages Projects Releases Wiki Activity
14,145 Commits 127 Branches 497 Tags
Commit Graph

14145 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Rémi de Juvigny
dbaf04286a Fix local upload provider docs 2020-08-07 15:56:29 +02:00
Alexandre BODIN
de10a34592
Merge pull request #7327 from strapi/dependabot/npm_and_yarn/whatwg-fetch-3.3.1 
Bump whatwg-fetch from 2.0.4 to 3.3.1
 2020-08-07 10:29:13 +02:00
Alexandre BODIN
08bef6d957
Merge pull request #7350 from strapi/fix/7335 
Fix sanitizeEntity's includeFields usage
 2020-08-07 09:49:50 +02:00
Convly
10cc543cc7 Fix sanitizeEntity's includeFields usage for dynamic zones 
Signed-off-by: Convly <jean-sebastien.herbaux@epitech.eu>
 2020-08-06 15:13:45 +02:00
dependabot[bot]
be55fdb69d
Bump whatwg-fetch from 2.0.4 to 3.3.1 
Bumps [whatwg-fetch](https://github.com/github/fetch) from 2.0.4 to 3.3.1.
- [Release notes](https://github.com/github/fetch/releases)
- [Commits](https://github.com/github/fetch/compare/v2.0.4...v3.3.1)

Signed-off-by: dependabot[bot] <support@github.com>
 2020-08-04 22:21:05 +00:00
Alexandre BODIN
7113f7f11f
Merge pull request #7132 from strapi/fix/loginProviders 
Fix/login providers
 2020-08-05 00:02:17 +02:00
Pierre Noël
77293268c6 Specify that only grant providers are supported 
Signed-off-by: Pierre Noël <petersg83@gmail.com>
 2020-08-04 09:49:30 +02:00
Pierre Noël
b4afb8afcc move a tip 
Signed-off-by: Pierre Noël <petersg83@gmail.com>
 2020-08-04 09:49:30 +02:00
Pierre Noël
6f369201a4 replace .fr by .com 
Signed-off-by: Pierre Noël <petersg83@gmail.com>
 2020-08-04 09:49:29 +02:00
Pierre Noël
b5959705b2 refacto 
Signed-off-by: Pierre Noël <petersg83@gmail.com>
 2020-08-04 09:49:29 +02:00
Pierre Noël
05cc400905 update grant + doc twitter 
Signed-off-by: Pierre Noël <petersg83@gmail.com>
 2020-08-04 09:49:28 +02:00
Pierre Noël
75cb374f89 Update the provider loggin doc + display absolute redirect uri in front 
Signed-off-by: Pierre Noël <petersg83@gmail.com>
 2020-08-04 09:49:28 +02:00
Alexandre BODIN
a8bb45da52
Merge pull request #7299 from strapi/rbac/user-creation-event 
Add events for user creation
 2020-08-03 18:41:53 +02:00
Alexandre BODIN
e9757182cc
Merge pull request #7144 from strapi/chore/rbac-tracking 
Add events for the rbac feature.
 2020-08-03 18:40:26 +02:00
Alexandre BODIN
3fbd684981
Merge pull request #7303 from strapi/minor/addKoaProxyConf 
Add conf proxy koa variable
 2020-08-03 18:12:46 +02:00
Alexandre BODIN
ce3a00f2ed
Merge branch 'master' into chore/rbac-tracking 2020-08-03 17:40:16 +02:00
Pierre Noël
112716fc9b add conf proxy koa variable 
Signed-off-by: Pierre Noël <petersg83@gmail.com>
 2020-08-03 17:34:05 +02:00
Alexandre BODIN
81a4509750
Merge pull request #7263 from votemike/gender-equality 
Gender equality wordings
 2020-08-03 17:06:23 +02:00
Pierre Noël
9c957759b7 enrich test 
Signed-off-by: Pierre Noël <petersg83@gmail.com>
 2020-08-03 14:08:19 +02:00
Pierre Noël
c9545f2b7d refacto 
Signed-off-by: Pierre Noël <petersg83@gmail.com>
 2020-08-03 14:08:18 +02:00
Convly
ba8954794b Add telemetry events for user creation 
Signed-off-by: Convly <jean-sebastien.herbaux@epitech.eu>
 2020-08-03 14:08:18 +02:00
Alexandre BODIN
7b19532728
Merge pull request #7280 from strapi/fix/uploadPathAbsolute 
Upload path can be absolute
 2020-08-03 14:01:59 +02:00
Pierre Noël
bc96123485 use resolve 
Signed-off-by: Pierre Noël <petersg83@gmail.com>
 2020-08-03 11:05:43 +02:00
Pierre Noël
c8207b7809 upload path can be absolute 
Signed-off-by: Pierre Noël <petersg83@gmail.com>
 2020-07-31 17:39:29 +02:00
Alexandre Bodin
97922f99ae v3.1.3 v3.1.3 2020-07-31 09:59:56 +02:00
Alexandre BODIN
95bb4c74ff
Merge pull request #7275 from aksdevac/master 
Fix #7252: fix relation name
 2020-07-31 09:45:20 +02:00
Akash P
27ee50d1e5
Fix #7252: fix relation name 
fix regression issue due to pull #7204

Signed-off-by: Akash P <aksdevac@gmail.com>
 2020-07-31 12:59:46 +05:30
Michael Gwynne
e6d3cc730c Gender Equality 
Signed-off-by: Michael Gwynne <michael.gwynne@checkatrade.com>
 2020-07-30 12:06:32 +01:00
Alexandre BODIN
836b49f218
Merge pull request #7167 from strapi/chore/clean-deps 
Cleanup shelljs
 2020-07-30 12:36:28 +02:00
dependabot[bot]
97dfde210a
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>
 2020-07-30 09:45:53 +02:00
Alexandre BODIN
c3e9b6c8ce
Merge branch 'master' into chore/clean-deps 2020-07-29 17:49:54 +02:00
Alexandre BODIN
cba02febf2
Upgrade api token tuto to not break rbac feature (#7250) 
Signed-off-by: Alexandre Bodin <bodin.alex@gmail.com>
 2020-07-29 17:41:02 +02:00
Sebastian Campos
c3f4afca87
Docs/parameters typos (#7238) 
* fix 'complexE' typos

* fix 'complexE' typos

Co-authored-by: scampos <sebastian@synergiar.com>
 2020-07-29 17:39:28 +02:00
Alexandre Bodin
8a702bc6e8 Merge branch 'master' into documentation 2020-07-29 13:36:37 +02:00
Alexandre Bodin
6aaa018ff5 v3.1.2 v3.1.2 2020-07-29 13:34:01 +02:00
Alexandre Bodin
c603514b85 Add dependabot reviewers 
Signed-off-by: Alexandre Bodin <bodin.alex@gmail.com>
 2020-07-29 13:28:34 +02:00
Maxime Castres
b4c430792c
Add the CheatSheet link (#7213) 
Signed-off-by: Maxime Castres <mcastres@student.42.fr>
 2020-07-29 13:27:59 +02:00
Alexandre BODIN
7394a35c51
Fix CE tests for travis (#7218) 
* Fix CE tests for travis

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

* Start app in CE too

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

* Cleanup

Signed-off-by: Alexandre Bodin <bodin.alex@gmail.com>
 2020-07-29 13:24:27 +02:00
egg
efdf03cf6d
add Japanese translation of media library (#7226) 
Signed-off-by: eggpogg <eggpogg.t@gmail.com>

Co-authored-by: cyril lopez <cyril.lpz@gmail.com>
 2020-07-29 13:21:50 +02:00
Alexandre BODIN
0ea63e05e4
Merge pull request #7178 from ericliu-el/fix-Input-Number-issue 
Fix Input Number issue
 2020-07-29 13:20:38 +02:00
Alexandre BODIN
8cf4f94db6
Merge pull request #7217 from strapi/fix/pg-core-store 
Fix core_store init first
 2020-07-29 13:16:46 +02:00
Alexandre Bodin
ac62bac98e Upgrade lodash 
Signed-off-by: Alexandre Bodin <bodin.alex@gmail.com>
 2020-07-29 13:05:50 +02:00
Kim, Harim
b670db3c57
add engine config to apollo server params (#7244) 
Signed-off-by: harimkims <harimkims@gmail.com>
 2020-07-29 13:01:32 +02:00
Jim LAURIE
4994ca26fd
Merge pull request #7235 from jakesyl/patch-1 
fix grammar issue
 2020-07-29 11:28:32 +02:00
Jim LAURIE
9ca1bc9962
Merge pull request #6923 from jorisw/patch-1 
Update models.md
 2020-07-29 11:22:03 +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
Azri Kahar
56e442637f
Update docker-compose examples (#6566) 
* Change volume for strapi in SQLite for consistency

Changed volume bind mount from `./:/srv/app` to `./app:/srv/app` to match path used in PostgreSQL and MongoDB example

Signed-off-by: azrikahar <42867097+azrikahar@users.noreply.github.com>

* Remove "links" option for PostgreSQL & MongoDB

Signed-off-by: azrikahar <42867097+azrikahar@users.noreply.github.com>

* Add "depends_on" option for PostgreSQL & MongoDB

Signed-off-by: azrikahar <42867097+azrikahar@users.noreply.github.com>

* Changed volume for strapi in MongoDB example

Signed-off-by: azrikahar <42867097+azrikahar@users.noreply.github.com>

* Add database init name environment variables

Signed-off-by: azrikahar <42867097+azrikahar@users.noreply.github.com>

* Remove exposed ports for databases

Signed-off-by: azrikahar <42867097+azrikahar@users.noreply.github.com>

* Update docker.md

Co-authored-by: Alexandre BODIN <alexandrebodin@users.noreply.github.com>
 2020-07-29 09:40:26 +02:00
Jake Sylvestre
79fc341d11 fix grammar issue 
Signed-off-by: Jake Sylvestre <jakesyl@gmail.com>
 2020-07-28 14:08:45 -04:00
DMehaffy
6641f4e43f
Signed-off-by: Derrick Mehaffy <derrickmehaffy@gmail.com> (#6947) 2020-07-28 09:50:10 -07:00
Alexandre BODIN
cf278ae56d
Merge pull request #7228 from strapi/fix/timestamps 
Fixes #7189
 2020-07-28 13:58:49 +02:00