yujunjun/strapi
1
0
Fork 0
mirror of https://github.com/strapi/strapi.git synced 2025-08-10 17:58:07 +00:00
Code Issues Packages Projects Releases Wiki Activity
12,070 Commits 115 Branches 488 Tags
Commit Graph

12070 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Virginie Ky
ba57f2c801 pdf icons & color 
Signed-off-by: Virginie Ky <virginie.ky@gmail.com>
 2020-03-20 22:08:56 +01:00
Virginie Ky
dea642b907 file type filter 
Signed-off-by: Virginie Ky <virginie.ky@gmail.com>
 2020-03-19 23:49:47 +01:00
Virginie Ky
b46058a780 icon type UI 
Signed-off-by: Virginie Ky <virginie.ky@gmail.com>
 2020-03-18 23:31:02 +01:00
Virginie Ky
9db29d3390 Merge branch 'features/media-lib-frontend' of github.com:strapi/strapi into front/media-lib-listview 2020-03-18 11:57:38 +01:00
Virginie Ky
4d731e741e Merge branch 'features/media-lib-frontend' of github.com:strapi/strapi into features/media-lib-frontend 2020-03-18 10:57:01 +01:00
Virginie Ky
de88f5c34b Merge branch 'features/media-lib' of github.com:strapi/strapi into features/media-lib-frontend 2020-03-18 10:51:40 +01:00
Virginie Ky
a78cbf3c22 clean 
Signed-off-by: Virginie Ky <virginie.ky@gmail.com>
 2020-03-18 10:49:42 +01:00
Virginie Ky
5614acdf9c filters by mime, tags by type and count 
Signed-off-by: Virginie Ky <virginie.ky@gmail.com>
 2020-03-18 00:47:16 +01:00
virginieky
1a1cd7bb74
Merge pull request #5482 from strapi/front/card-preview-integration 
Card preview integration
 2020-03-17 14:58:21 +01:00
Alexandre BODIN
b9579fd3f0
Merge pull request #5515 from strapi/media-lib/improvements 
Media lib improvements
 2020-03-17 09:40:50 +01:00
Virginie Ky
8410e898f3 Merge branch 'features/media-lib-frontend' of github.com:strapi/strapi into front/card-preview-integration 
Signed-off-by: Virginie Ky <virginie.ky@gmail.com>
 2020-03-16 16:27:59 +01:00
virginieky
a2b5b43995
Merge pull request #5481 from strapi/front/media-lib-select-all 
Media library ListView select all
 2020-03-16 15:36:08 +01:00
Virginie Ky
cfe0ddbff8 card preview statement 
Signed-off-by: Virginie Ky <virginie.ky@gmail.com>
 2020-03-16 15:33:58 +01:00
Alexandre Bodin
3889fb87dc Add previewUrl field and impl in cloudinary 
Signed-off-by: Alexandre Bodin <bodin.alex@gmail.com>
 2020-03-16 14:09:35 +01:00
Virginie Ky
1a695b7da9 Apply code review 
Signed-off-by: Virginie Ky <virginie.ky@gmail.com>
 2020-03-16 13:37:10 +01:00
Alexandre Bodin
8bac1b1835 Add extend method in provider prototype 
Signed-off-by: Alexandre Bodin <bodin.alex@gmail.com>
 2020-03-14 18:29:36 +01:00
Alexandre Bodin
0137df7a7e Serve upload file with upload middleware not the public one 
Signed-off-by: Alexandre Bodin <bodin.alex@gmail.com>
 2020-03-14 17:35:35 +01:00
Alexandre BODIN
13f6ef1d80
Merge pull request #5502 from strapi/media-lib/remove-preview 
Remove video preview setting
 2020-03-13 17:52:05 +01:00
Virginie Ky
f4d1359f50 apply PR review 
Signed-off-by: Virginie Ky <virginie.ky@gmail.com>
 2020-03-13 16:16:41 +01:00
Alexandre Bodin
55bdc146b7 Remove video preview setting 
Signed-off-by: Alexandre Bodin <bodin.alex@gmail.com>
 2020-03-13 15:41:15 +01:00
Alexandre Bodin
243085dae1 Merge branch 'develop' into features/media-lib 2020-03-13 15:40:11 +01:00
Shabith Ishan Thennakone
fe19bcb2ea removed text-transform from variable name 2020-03-13 14:51:32 +01:00
Jim LAURIE
875432cc33
Merge pull request #5493 from strapi/docs/do-one-click 
Update DigitalOcean one-click docs for recent changes
 2020-03-13 14:32:46 +01:00
Jim LAURIE
dcb7be51d1
Merge branch 'master' into docs/do-one-click 2020-03-13 14:32:26 +01:00
Pierre Noël
1227bfeba4 add possibility to set a relation "private" 
Signed-off-by: Pierre Noël <pierre.noel@strapi.io>
 2020-03-13 12:23:11 +01:00
Pierre Noël
65a3e83ee3 Change error message when bookshelf db connection fails at start 
Signed-off-by: Pierre Noël <pierre.noel@strapi.io>
 2020-03-13 12:20:06 +01:00
soupette
1686cc051f Fix select all 
Signed-off-by: soupette <cyril.lpz@gmail.com>
 2020-03-13 11:13:26 +01:00
soupette
f99f83af02 Merge branch 'develop' of github.com:strapi/strapi into features/media-lib 2020-03-13 11:04:45 +01:00
Derrick Mehaffy
7f87d86d6d
Update DO Docs per https://github.com/strapi/one-click-deploy/pull/6 
Signed-off-by: Derrick Mehaffy <derrickmehaffy@gmail.com>
 2020-03-13 02:53:29 -07:00
cyril lopez
b24a548c0f
Merge pull request #5500 from strapi/features/media-lib-ctb-option 
Media lib add allowed types to [CTB]
 2020-03-13 10:46:20 +01:00
soupette
4ab399af48 Fix PR feedback 
Signed-off-by: soupette <cyril.lpz@gmail.com>
 2020-03-13 10:28:57 +01:00
Alexandre BODIN
310fc3d0cd
Merge pull request #5452 from strapi/fix/#4901/findOneCantHaveMultipleParametersWhenThereIsAPK 
Fix find one cant have multiple parameters when there is a primary key
 2020-03-13 09:42:22 +01:00
soupette
2fcc71f21c Merge branch 'features/media-lib' of github.com:strapi/strapi into features/media-lib-ctb-option 2020-03-12 17:46:05 +01:00
soupette
23cdc180b9 Merge branch 'develop' of github.com:strapi/strapi into features/media-lib 2020-03-12 17:45:42 +01:00
cyril lopez
eb9a4d6809
Merge pull request #5488 from strapi/fix/dz 
Fix dynamic zone reorder input file and date updates
 2020-03-12 17:44:52 +01:00
soupette
bbc13eb27a Add tests 
Signed-off-by: soupette <cyril.lpz@gmail.com>
 2020-03-12 17:41:27 +01:00
cyril lopez
cba1d69694
Merge branch 'master' into fix/dz 2020-03-12 17:04:46 +01:00
soupette
82cde9a194 Merge branch 'features/media-lib' of github.com:strapi/strapi into features/media-lib-ctb-option 2020-03-12 16:44:49 +01:00
soupette
083e18ec52 Add allowed types to ctb 
Signed-off-by: soupette <cyril.lpz@gmail.com>
 2020-03-12 16:44:36 +01:00
Alexandre BODIN
9ab43d2c42
Merge branch 'master' into fix/#4901/findOneCantHaveMultipleParametersWhenThereIsAPK 2020-03-12 16:10:56 +01:00
Alexandre BODIN
9ffd037a3a
Merge pull request #5497 from strapi/media-lib/feedbacks 
Media lib Spec changes
 2020-03-12 15:14:20 +01:00
Alexandre Bodin
eb76a07daf Update media-lib features according to spec changes 
Signed-off-by: Alexandre Bodin <bodin.alex@gmail.com>
 2020-03-12 14:25:50 +01:00
Alexandre Bodin
c4bf0cdb67 Add allowedTypes in media type meta 
Signed-off-by: Alexandre Bodin <bodin.alex@gmail.com>
 2020-03-12 09:44:04 +01:00
soupette
0b5ba26b4d Add package.json to copied files 
Signed-off-by: soupette <cyril.lpz@gmail.com>
 2020-03-12 09:41:37 +01:00
soupette
a46590feda Add infos 
Signed-off-by: soupette <cyril.lpz@gmail.com>
 2020-03-12 09:41:37 +01:00
soupette
e47b451f7c Require version from package.json instead of using the data from the back-end 
Signed-off-by: soupette <cyril.lpz@gmail.com>
 2020-03-12 09:41:37 +01:00
Jozef Cipa
e8c4629779
Fix/admin path serve (#5287) 
* Add config option to disable serving admin assets

Signed-off-by: Jozef Cipa <cipa.jozef@gmail.com>

* Add serveAdminPanel option to docs

Signed-off-by: Jozef Cipa <cipa.jozef@gmail.com>

* Inherit default value for serving admin from config

Signed-off-by: Jozef Cipa <cipa.jozef@gmail.com>
 2020-03-12 09:39:25 +01:00
Brad Christie
b2d19c8ad8
Add --no-run and --use-npm (#5420) 
Not sure if you want to call-out that it will leverage yarn if/when possible (if npm flag is not set).

Did notice other APIs need an update, but unsure how `---tpl` relates to new cli. I assume it's been refactored into `--extend`, but unsure.

Signed-off-by: Brad Christie <bch@sitecore.net>
 2020-03-12 09:34:01 +01:00
Alexandre BODIN
a13b7b0d5a
Merge pull request #5426 from nazrdogan/patch-1 
fix typo
 2020-03-12 09:33:12 +01:00
Alexandre BODIN
1a86d4395e
Merge pull request #5407 from ScottAgirs/patch-1 
Minor typo fixes
 2020-03-12 09:31:44 +01:00