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

14807 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Alexandre BODIN
b5bfe60b45
Merge pull request #7222 from strapi/chore/server-startup 
Fix server not accessible at bootstrap
 2020-07-28 12:55:58 +02:00
soupette
61412ebdbd Fixes #7189 
Signed-off-by: soupette <cyril.lpz@gmail.com>
 2020-07-28 12:39:20 +02:00
Alexandre Bodin
da338f92c4 Merge branch 'documentation' 2020-07-28 10:50:10 +02:00
Jim LAURIE
4c4a4c1dd3
Docs review (#6848) 
* docs: improve getting started

Signed-off-by: Jim LAURIE <j.laurie6993@gmail.com>

* docs: review quickstart video and some steps

Signed-off-by: Jim LAURIE <j.laurie6993@gmail.com>

* docs: review concepts

Signed-off-by: Jim LAURIE <j.laurie6993@gmail.com>

* docs: review email - upload plugins

Signed-off-by: Jim LAURIE <j.laurie6993@gmail.com>

* fix: PR feedback

Signed-off-by: Jim LAURIE <j.laurie6993@gmail.com>

* fix: PR feedback type conflict

Signed-off-by: Jim LAURIE <j.laurie6993@gmail.com>
 2020-07-28 10:48:55 +02:00
Jim LAURIE
3e42365c34
Fix #7162 - pluginsSectionLinks in plugin generator (#7169) 
Signed-off-by: Jim LAURIE <j.laurie6993@gmail.com>
 2020-07-28 10:39:48 +02:00
Juan David Landazabal
55f576bd1d
Fix/#7197/Change custom populate state to own service (#7204) 
* Fix/#7197/Change custom populate state to own service

To avoid issue with population we change the service of state user to there own service call "fetchState", also to keep a separate customization

Signed-off-by: Juan David <juand.business@gmail.com>

* specific service for fetch  authenticated user

Signed-off-by: Juan David <juand.business@gmail.com>

* Update comment

Signed-off-by: Juan David <juand.business@gmail.com>

* Add some comments

Signed-off-by: Juan David <juand.business@gmail.com>
 2020-07-28 09:18:18 +02:00
Alexandre Bodin
cbc3e22718 Fix server not accessible at boostrapi 
Signed-off-by: Alexandre Bodin <bodin.alex@gmail.com>
 2020-07-27 23:26:07 +02:00
Darsh Shah
16b91851db
fix: image URL in README.md (#6988) 
* Update README.md

updated logo image URL

* Updated link

* fix: image url
 2020-07-27 22:18:17 +02:00
Alexandre Bodin
8b6bf7fd10 Fix core_store init first 
Signed-off-by: Alexandre Bodin <bodin.alex@gmail.com>
 2020-07-27 20:26:56 +02:00
Alexandre BODIN
c4472f620b
Merge pull request #7212 from strapi/fix/issue-7196 
Fix admin routes and user controllers conflicting
 2020-07-27 19:47:22 +02:00
Alexandre BODIN
9c4728ccc5
Merge pull request #7198 from strapi/fix/date-validations 
Fix date and datetime required validations issue
 2020-07-27 18:47:47 +02:00
Alexandre Bodin
0369d5f2c7 Fix admin routes and user controllers conflicting 
Signed-off-by: Alexandre Bodin <bodin.alex@gmail.com>
 2020-07-27 18:32:17 +02:00
Bartosz
8c40d2192d
Fix invalid local uploads path (#6925) 
* Fix invalid local uploads path

File upload provider does not consider the strapi configuration. This patch should fix the problem.

* getStaticPath -> uploadDir

* Use config.get method

* plugin-upload tests fix
 2020-07-27 17:18:55 +02:00
Diego Gallardo
2542cea3a6
Update README.md (#7190) 
Added extra settings on the mailgun config based on the mailgun usage overview.
You can check the doc, and it specify the domain parameter.
https://www.npmjs.com/package/mailgun-js#usage-overview

You need to specify the domain, otherwise the email won't be sent, but the API return success anyway. 
In my scenario I have a mailgun account with multiple domains and without this param the email was not sent. Don't know if a mailgun with a single domain works.
 2020-07-27 16:39:55 +02:00
soupette
3639fdc047 Fixes #7186 
Signed-off-by: soupette <cyril.lpz@gmail.com>
 2020-07-27 12:04:44 +02:00
soupette
b84e33ca47 Fix date and datetime required validations issue 
Signed-off-by: soupette <cyril.lpz@gmail.com>
 2020-07-27 11:52:27 +02:00
JuanCarlosJr97
e81c6ba567
Updating api.js deleting console.log (#7185) 
Signed-off-by: Juan Carlos Blanco Delgado <juancarlosjr97@gmail.com>
 2020-07-27 11:05:45 +02:00
Eric Liu
6df99143a6 change biginteger back to text 
Signed-off-by: Eric Liu <eric@ericliu.page>
 2020-07-27 10:19:35 +12:00
Eric Liu
bc611017ca Merge branch 'master' into fix-Input-Number-issue 2020-07-27 10:19:07 +12:00
Eric Liu
e099889fe2 fix Input Number issue 
Signed-off-by: Eric Liu <eric@ericliu.page>
 2020-07-26 18:39:16 +12:00
dependabot[bot]
33634151d4
Bump pluralize from 7.0.0 to 8.0.0 (#7126) 
Bumps [pluralize](https://github.com/blakeembrey/pluralize) from 7.0.0 to 8.0.0.
- [Release notes](https://github.com/blakeembrey/pluralize/releases)
- [Commits](https://github.com/blakeembrey/pluralize/compare/v7.0.0...v8.0.0)

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

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: Alexandre BODIN <alexandrebodin@users.noreply.github.com>
 2020-07-25 08:53:05 +02:00
Eli
528dc4140e
Fix typos with the module.exports functions. (#7070) 
The `module.exports` example code is missing a closing parenthesis at the end of each example. Added the closing parenthesis.
 2020-07-25 08:46:16 +02:00
alaoui abdellah
bca8bb662a
style: 📝 Improve error message of file upload by adding an example (#7111) 
Signed-off-by: Abdellah Alaoui <als.abdellah@gmail.com>
 2020-07-25 08:45:06 +02:00
Alexandre BODIN
3d1cb2ca4d
Merge pull request #7130 from ByungJun25/documentation 
Update draft.md
 2020-07-25 08:43:19 +02:00
Alexandre Bodin
004791817e Cleanup shelljs 
Signed-off-by: Alexandre Bodin <bodin.alex@gmail.com>
 2020-07-25 08:41:31 +02:00
Alexandre BODIN
ab77f264ae
Merge pull request #7159 from strapi/fix/sortAndQuery 
fix count with sort param
 2020-07-24 15:11:17 +02:00
Alexandre BODIN
1c6ccfedfb
Merge pull request #7150 from MattieBelt/docs/add-extension-warning 
Add extension warning
 2020-07-24 15:09:31 +02:00
Pierre Noël
6d825fc3ca fix count with sort param 
Signed-off-by: Pierre Noël <petersg83@gmail.com>
 2020-07-24 15:06:38 +02:00
Alexandre BODIN
df7d7d416a
Merge pull request #7155 from strapi/fix/7139 
Fixes #7139
 2020-07-24 14:26:19 +02:00
soupette
a9387d49f4 Fixes #7139 
Signed-off-by: soupette <cyril.lpz@gmail.com>
 2020-07-24 12:11:52 +02:00
Igor Tatarintsev
bb6365213b
Bump VK provider version (#6594) 
Signed-off-by: Igor Tatarintsev <ietatarin@gmail.com>
 2020-07-24 11:10:09 +02:00
MattieBelt
7627dba96a Add extension warning 
Signed-off-by: MattieBelt <mattiasvandenbelt@gmail.com>
 2020-07-24 09:40:35 +02:00
soupette
2a591f11e9 Add project type property 
Signed-off-by: soupette <cyril.lpz@gmail.com>
 2020-07-24 09:33:17 +02:00
Alexandre Bodin
35bae7df57 v3.1.1 v3.1.1 2020-07-23 18:53:55 +02:00
Alexandre BODIN
9e53ee7220
Merge pull request #7146 from strapi/fix/missing-telemtry 
Fix missing event
 2020-07-23 18:51:21 +02:00
Alexandre Bodin
83b7926e3a Fix missing event 
Signed-off-by: Alexandre Bodin <bodin.alex@gmail.com>
 2020-07-23 18:36:29 +02:00
soupette
fa56c61c97 Add tracking to rbac 
Signed-off-by: soupette <cyril.lpz@gmail.com>
 2020-07-23 18:28:56 +02:00
Alexandre BODIN
ce769d7474
Add migration warning (#7143) 
* Add migration warning

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

* minor tweak to grammer

Signed-off-by: Derrick Mehaffy <derrickmehaffy@gmail.com>

Co-authored-by: Derrick Mehaffy <derrickmehaffy@gmail.com>
 2020-07-23 09:25:35 -07:00
Alexandre BODIN
f21524bbbe
Merge pull request #7054 from strapi/fix/usersAndPermsLocalAuth 
update doc + add localhost in confirmation links if url is not set
 2020-07-23 16:16:08 +02:00
Alexandre BODIN
a588c55f20
Merge pull request #7136 from strapi/fix/upload-api 
Fix upload api
 2020-07-23 14:56:35 +02:00
Alexandre Bodin
e18c54b225 Fix upload api 
Signed-off-by: Alexandre Bodin <bodin.alex@gmail.com>
 2020-07-23 14:21:45 +02:00