yujunjun/strapi
1
0
Fork 0
mirror of https://github.com/strapi/strapi.git synced 2025-07-18 14:32:56 +00:00
Code Issues Packages Projects Releases Wiki Activity
36,133 Commits 115 Branches 484 Tags
Commit Graph

2029 Commits

Author SHA1 Message Date
Matt
faa425eb5a
Merge branch 'master' into jwtconfig 2020-04-14 20:53:23 +02:00
Alexandre Bodin
c05b6d3f76 Merge branch 'documentation' 2020-04-14 19:11:45 +02:00
Alexandre Bodin
67ab338a93 Fix small typo 
Signed-off-by: Alexandre Bodin <bodin.alex@gmail.com>
 2020-04-14 19:11:06 +02:00
Alexandre BODIN
f994b217e0
Update migration-guide-beta.19-to-beta.19.4.md 2020-04-14 18:59:19 +02:00
Pierre Noël
ae3a0a8168 add migration guide 19+ to 19.4 
Signed-off-by: Pierre Noël <pierre.noel@strapi.io>
 2020-04-14 18:51:37 +02:00
Alexandre BODIN
a1edd446c6
Merge pull request #5794 from strapi/chore/clean-build-cache 
Add clean command to remove the .cache and build folders
 2020-04-14 15:42:18 +02:00
soupette
f1c9d4df21 Add clean command 
Signed-off-by: soupette <cyril.lpz@gmail.com>
 2020-04-14 15:41:01 +02:00
cyril lopez
e5d92f753a
Merge pull request #5787 from strapi/fix/password-type 
Fix input type and add clear logic for this field type
 2020-04-14 15:12:58 +02:00
Jim LAURIE
22c93d1040
Merge branch 'master' into docs/azure 2020-04-14 14:38:04 +02:00
Jim LAURIE
91bbfe3978 docs: rename file 
Signed-off-by: Jim LAURIE <j.laurie6993@gmail.com>
 2020-04-14 14:35:54 +02:00
Derrick Mehaffy
4535355da0
PR Feedback 
Signed-off-by: Derrick Mehaffy <derrickmehaffy@gmail.com>
 2020-04-14 03:23:15 -07:00
Alexandre Bodin
28cb36c536 Init migration guide 
Signed-off-by: Alexandre Bodin <bodin.alex@gmail.com>
 2020-04-14 12:18:40 +02:00
soupette
b130d26f16 Fix doc link 
Signed-off-by: soupette <cyril.lpz@gmail.com>
 2020-04-14 11:31:16 +02:00
Jim LAURIE
eb048eef93 docs: fix typo 
Signed-off-by: Jim LAURIE <j.laurie6993@gmail.com>
 2020-04-13 15:01:21 +02:00
Jim LAURIE
8daf68f976 docs: fix upload models name 
Signed-off-by: Jim LAURIE <j.laurie6993@gmail.com>
 2020-04-13 14:58:37 +02:00
Matt
b515adc6b8 Added some documentation about the JWT token configuration 
Signed-off-by: Matt <kapakapa197@gmail.com>
 2020-04-12 14:23:43 +02:00
ScottAgirs
823acf4777 [deprecate] change-password in favour of reset-password 
Signed-off-by: ScottAgirs <scott@ijs.to>
 2020-04-11 13:41:09 -04:00
Nikolaj Ivancic
ce03fb0ad9 Several missed updates from Content to Collection types (per https://github.com/lauriejim) 
Signed-off-by: Nikolaj Ivancic <nik@congral.com>
 2020-04-10 16:32:26 -04:00
soupette
a51c97829b Fix docs typos 
Signed-off-by: soupette <cyril.lpz@gmail.com>
 2020-04-10 15:51:35 +02:00
soupette
e97b8cca71 Fix PR feedback 
Signed-off-by: soupette <cyril.lpz@gmail.com>
 2020-04-10 15:25:00 +02:00
soupette
373f77ac8a Add media lib in the example 
Signed-off-by: soupette <cyril.lpz@gmail.com>
 2020-04-10 12:04:32 +02:00
soupette
90f437bc48 Add component API doc 
Signed-off-by: soupette <cyril.lpz@gmail.com>
 2020-04-10 09:10:19 +02:00
Tim Gates
3e1409b42e
Merge branch 'master' into bugfix_typo_useful 2020-04-10 07:50:06 +10:00
Derrick Mehaffy
9bbdb8f378
Add Azure logo 
Signed-off-by: Derrick Mehaffy <derrickmehaffy@gmail.com>
 2020-04-09 05:32:49 -07:00
Derrick Mehaffy
0fed063dce
Finish Azure 
Signed-off-by: Derrick Mehaffy <derrickmehaffy@gmail.com>
 2020-04-09 04:56:13 -07:00
Derrick Mehaffy
89f251cf3e
More menu organization 
Signed-off-by: Derrick Mehaffy <derrickmehaffy@gmail.com>
 2020-04-09 04:39:50 -07:00
Derrick Mehaffy
2d46bd3f02
Organizing some of the menu items 
Signed-off-by: Derrick Mehaffy <derrickmehaffy@gmail.com>
 2020-04-09 04:32:12 -07:00
Derrick Mehaffy
4477a457a4
cleanup 
Signed-off-by: Derrick Mehaffy <derrickmehaffy@gmail.com>
 2020-04-09 04:30:14 -07:00
Derrick Mehaffy
e7fc8d8dde
more azure guide 
Signed-off-by: Derrick Mehaffy <derrickmehaffy@gmail.com>
 2020-04-09 04:30:14 -07:00
Derrick Mehaffy
503fa9ebab
Almost finished with Azure guide 
Signed-off-by: Derrick Mehaffy <derrickmehaffy@gmail.com>
 2020-04-09 04:30:14 -07:00
Derrick Mehaffy
6e70f0d3b5
Start work on Azure VM guide 
Signed-off-by: Derrick Mehaffy <derrickmehaffy@gmail.com>
 2020-04-09 04:30:14 -07:00
Derrick Mehaffy
6a0dc1bcfd
Finish Nginx guide 
Signed-off-by: Derrick Mehaffy <derrickmehaffy@gmail.com>
 2020-04-09 04:30:14 -07:00
Derrick Mehaffy
e4306087c3
Clean up DigitalOcean guide 
Signed-off-by: Derrick Mehaffy <derrickmehaffy@gmail.com>
 2020-04-09 04:30:14 -07:00
Derrick Mehaffy
5227831bf1
clean up AWS guide 
Signed-off-by: Derrick Mehaffy <derrickmehaffy@gmail.com>
 2020-04-09 04:30:14 -07:00
Derrick Mehaffy
ad3f85f85d
fix a few bugs in AWS, init proxy guide 
Signed-off-by: Derrick Mehaffy <derrickmehaffy@gmail.com>
 2020-04-09 04:30:14 -07:00
Derrick Mehaffy
c7e15d37ed
Fix heroku icon 
Signed-off-by: Derrick Mehaffy <derrickmehaffy@gmail.com>
 2020-04-09 04:30:14 -07:00
Derrick Mehaffy
e0f34ed4ff
Add little logos 
Signed-off-by: Derrick Mehaffy <derrickmehaffy@gmail.com>
 2020-04-09 04:30:14 -07:00
Derrick Mehaffy
1e5893c899
Adding a link between installation and deployment 
Signed-off-by: Derrick Mehaffy <derrickmehaffy@gmail.com>
 2020-04-09 04:30:14 -07:00
Derrick Mehaffy
c35addecaa
Main migration into split docs, not reviewed sub docs yet 
Signed-off-by: Derrick Mehaffy <derrickmehaffy@gmail.com>
 2020-04-09 04:30:14 -07:00
Derrick Mehaffy
274e7e13be
init deployment changes 
Signed-off-by: Derrick Mehaffy <derrickmehaffy@gmail.com>
 2020-04-09 04:30:14 -07:00
Alexandre BODIN
9690fddab4
Merge pull request #5752 from strapi/documentation 
Documentation update
 2020-04-09 11:53:31 +02:00
Jim LAURIE
342cef19f4
Merge branch 'documentation' into docs-concepts-review 2020-04-09 11:43:01 +02:00
Jim LAURIE
7216f21760 docs: apply pr feedback 2020-04-09 11:41:55 +02:00
Tim Gates
0a4272811f
docs: Fix simple typo, usefull -> useful 
There is a small typo in docs/3.0.0-beta.x/concepts/models.md.

Should read `useful` rather than `usefull`.

Signed-off-by: Tim Gates <tim.gates@iress.com>
 2020-04-09 08:02:07 +10:00
Alexandre Bodin
cc9d23c3ac Merge branch 'develop' into features/media-lib 
Signed-off-by: Alexandre Bodin <bodin.alex@gmail.com>
 2020-04-07 20:24:39 +02:00
Jean-Sébastien Herbaux
a583d1b859
Fix/#3184/fix server crashs on database change (#5703) 
* Don't set connection field on create/edit operation on content-types & components

Signed-off-by: Convly <jean-sebastien.herbaux@epitech.eu>

* Make sure that every component has a valid connection attribute

Signed-off-by: Convly <jean-sebastien.herbaux@epitech.eu>

* Remove connection check on components load

Signed-off-by: Convly <jean-sebastien.herbaux@epitech.eu>

* Remove default connections from core & webhook stores but make sure it's defined in the application lifecycle

Signed-off-by: Convly <jean-sebastien.herbaux@epitech.eu>

* Fix component's associations that can be undefined instead of empty in populateBareAssociations

Signed-off-by: Convly <jean-sebastien.herbaux@epitech.eu>

* Remove "default" connection from plugins' models

Signed-off-by: Convly <jean-sebastien.herbaux@epitech.eu>

* Remove connection attribute from generated models (cli)

Signed-off-by: Convly <jean-sebastien.herbaux@epitech.eu>

* Mutate each component instead of reassign

Signed-off-by: Convly <jean-sebastien.herbaux@epitech.eu>

* Build core_store and webhook model based on the current config

Signed-off-by: Convly <jean-sebastien.herbaux@epitech.eu>

* Add connection to templates conditionally (based on args)

Signed-off-by: Convly <jean-sebastien.herbaux@epitech.eu>

* Set default value for description to undefined instead of empty string

Signed-off-by: Convly <jean-sebastien.herbaux@epitech.eu>

* Remove unnecessary complexity

Signed-off-by: Convly <jean-sebastien.herbaux@epitech.eu>

* Update getStarted models

Signed-off-by: Convly <jean-sebastien.herbaux@epitech.eu>

* Fix attributes parsing for generate:model

Signed-off-by: Convly <jean-sebastien.herbaux@epitech.eu>

* Removed tpl option from generate:model/api

Signed-off-by: Convly <jean-sebastien.herbaux@epitech.eu>

* Remove tpl option from cli

Signed-off-by: Convly <jean-sebastien.herbaux@epitech.eu>
 2020-04-07 16:31:44 +02:00
adriatic
3c8ce102d4 Content_to_Collection 
Update tutorial files to use the Collection type instead of Content type

Signed-off-by: adriatic <nik@congral.com>
 2020-04-06 12:00:03 -04:00
Jim LAURIE
810d333ef0
Merge branch 'master' into deploy-to-app-engine 2020-04-03 13:50:06 +02:00
Alexandre Bodin
e3b34580b5 extract params from ctx before caling services 
Signed-off-by: Alexandre Bodin <bodin.alex@gmail.com>
 2020-04-02 19:51:24 +02:00
Jim LAURIE
343a1bab38
Merge branch 'master' into fix/5555-quickStartGuide 2020-04-01 16:33:29 +02:00