yujunjun/strapi
1
0
Fork 0
mirror of https://github.com/strapi/strapi.git synced 2025-08-09 01:07:27 +00:00
Code Issues Packages Projects Releases Wiki Activity
13,206 Commits 115 Branches 488 Tags
Commit Graph

13206 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
soupette
87f8965579 Fix FieldApi getField 
Signed-off-by: soupette <cyril.lpz@gmail.com>
 2020-04-09 15:06:27 +02:00
Derrick Mehaffy
9bbdb8f378
Add Azure logo 
Signed-off-by: Derrick Mehaffy <derrickmehaffy@gmail.com>
 2020-04-09 05:32:49 -07:00
soupette
d512043b12 Add components API 
Signed-off-by: soupette <cyril.lpz@gmail.com>
 2020-04-09 14:13:23 +02: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
9b3e7b2d9c
Merge pull request #5674 from strapi/docs-concepts-review 
Review concepts documentation
 2020-04-09 11:47:34 +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
soupette
a38c6738e1 Merge branch 'develop' of github.com:strapi/strapi into features/media-lib 2020-04-09 09:13:10 +02:00
soupette
5c84a726e2 Merge branch 'master' of github.com:strapi/strapi into develop 2020-04-09 09:12:28 +02:00
Tim Gates
bf17848251
Merge branch 'master' into bugfix_typo_useful 2020-04-09 08:02:35 +10: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
574a61de2f
Update sqlite table migration query to escape column names (#5746) 
Fix #4983

Signed-off-by: Alexandre Bodin <bodin.alex@gmail.com>
 2020-04-08 17:25:31 +02:00
cyril lopez
1c88e38df1
Fix request helper (#5740) 
Signed-off-by: soupette <cyril.lpz@gmail.com>
 2020-04-07 21:01:29 +02: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
Alexandre Bodin
76b6549ee4 Merge branch 'master' into develop 2020-04-07 20:21:37 +02:00
cyril lopez
6fa4d9060f
Merge pull request #5738 from strapi/media-lib/pagination-ui 
Media lib pagination alignment
 2020-04-07 19:38:37 +02:00
cyril lopez
4581a4cf35
Merge pull request #5737 from strapi/fix/media-lib-ui 
Fix the modal list view in the Media Library
 2020-04-07 19:35:59 +02:00
Ky
1de70d9292 theme borderRadius 
Signed-off-by: Ky <virginie.ky@gmail.com>
 2020-04-07 19:35:19 +02:00
HichamELBSI
ba8116dcdd Fix overflow 
Signed-off-by: HichamELBSI <elabbassih@gmail.com>
 2020-04-07 19:29:37 +02:00
Ky
3a5f44bb02 selected card border-radius 
Signed-off-by: Ky <virginie.ky@gmail.com>
 2020-04-07 19:29:21 +02:00
Ky
a0e0ee1cbd pagination alignment 
Signed-off-by: Ky <virginie.ky@gmail.com>
 2020-04-07 19:13:58 +02:00
HichamELBSI
af369e9a54 Fix the modal list view in the Media Library 
Signed-off-by: HichamELBSI <elabbassih@gmail.com>
 2020-04-07 18:41:48 +02:00
soupette
ade27c830f Fix ref edit 
Signed-off-by: soupette <cyril.lpz@gmail.com>
 2020-04-07 18:40:53 +02:00
cyril lopez
e70a40931b
Merge pull request #5736 from strapi/media-lib/size-fix 
Media lib size format fix
 2020-04-07 18:36:16 +02:00
Ky
75a41061c1 apply PR review 
Signed-off-by: Ky <virginie.ky@gmail.com>
 2020-04-07 18:16:42 +02:00
Ky
2619bfd5f5 Merge branch 'features/media-lib' of github.com:strapi/strapi into media-lib/size-fix 2020-04-07 18:09:08 +02:00
Ky
8df209ac8b add size-fix dep 
Signed-off-by: Ky <virginie.ky@gmail.com>
 2020-04-07 17:56:55 +02:00
Ky
a50244afdd update unit tests 
Signed-off-by: Ky <virginie.ky@gmail.com>
 2020-04-07 17:49:47 +02:00
Ky
d65633d881 convert size format 
Signed-off-by: Ky <virginie.ky@gmail.com>
 2020-04-07 17:39:08 +02:00
cyril lopez
a97d4a52e1
Merge pull request #5735 from strapi/media-lib/fix-url-preview 
Fix preview URL on selected asset
 2020-04-07 17:27:18 +02:00
HichamELBSI
fe8d4c88d7 Fix preview URL on selected asset 
Signed-off-by: HichamELBSI <elabbassih@gmail.com>
 2020-04-07 17:25:16 +02:00
cyril lopez
64d74c8707
Merge pull request #5734 from strapi/media-lib/ui-fix 
Fix UI in the Media Library
 2020-04-07 16:59:43 +02:00
HichamELBSI
ca0084ace6 Fix UI in the Media Library 
Signed-off-by: HichamELBSI <elabbassih@gmail.com>
 2020-04-07 16:48:59 +02:00
ELABBASSI Hicham
c561d7a7a7
Merge pull request #5731 from strapi/ml/functional-fix 
Ml/functional fix
 2020-04-07 16:37:50 +02:00