yujunjun/strapi
1
0
Fork 0
mirror of https://github.com/strapi/strapi.git synced 2025-10-18 03:23:49 +00:00
Code Issues Packages Projects Releases Wiki Activity
12,648 Commits 108 Branches 504 Tags
Commit Graph

12648 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
ELABBASSI Hicham
1cbac7aa4d
Merge pull request #5721 from strapi/fix/button-state 
Add disable state when uploading media
 2020-04-06 17:57:24 +02:00
ELABBASSI Hicham
0576bbc2d1
Merge pull request #5720 from strapi/media-lib/last-ui-fixes 
Media lib UI
 2020-04-06 17:35:48 +02:00
Ky
d96ae81348 clean 
Signed-off-by: Ky <virginie.ky@gmail.com>
 2020-04-06 17:14:20 +02:00
soupette
e843c526c5 Add disable state when uploading 
Signed-off-by: soupette <cyril.lpz@gmail.com>
 2020-04-06 16:32:01 +02:00
Ky
de91f8c43c some ui fixes 
Signed-off-by: Ky <virginie.ky@gmail.com>
 2020-04-06 16:26:30 +02:00
cyril lopez
7c9bdebee8
Merge pull request #5718 from strapi/ml/fix-count 
[ML] Fix count endpoint
 2020-04-06 14:36:56 +02:00
soupette
e73e11971d Add emit event in back button in upload plugin 
Signed-off-by: soupette <cyril.lpz@gmail.com>
 2020-04-06 14:24:57 +02:00
soupette
6bd863b563 Merge branch 'features/media-lib' of github.com:strapi/strapi into ml/fix-count 2020-04-06 14:23:04 +02:00
soupette
bdbec4e3f0 Fix count endpoint with filters 
Signed-off-by: soupette <cyril.lpz@gmail.com>
 2020-04-06 14:22:50 +02:00
cyril lopez
24a1da6c9e
Merge pull request #5717 from strapi/event/add-back-button-property 
Add BackButton event
 2020-04-06 14:22:08 +02:00
Ky
15c7beac0f pagination alignment 
Signed-off-by: Ky <virginie.ky@gmail.com>
 2020-04-06 14:06:27 +02:00
soupette
836d016a73 Add back button event 
Signed-off-by: soupette <cyril.lpz@gmail.com>
 2020-04-06 13:36:04 +02:00
virginieky
a940bbc8c0
Merge pull request #5705 from strapi/media-lib/ui-fixes 
Some ui fixes
 2020-04-06 12:08:04 +02:00
Ky
64fbf03eeb apply code review 
Signed-off-by: Ky <virginie.ky@gmail.com>
 2020-04-06 11:24:19 +02:00
cyril lopez
2ab7d0de68
Merge pull request #5704 from strapi/media-lib/fix-ui 
Fix some UI issues in the ML
 2020-04-06 11:23:41 +02:00
HichamELBSI
8096746555 Fix PR review 2020-04-06 11:11:40 +02:00
Ky
5e184c2784 Merge branch 'features/media-lib' of github.com:strapi/strapi into media-lib/ui-fixes 2020-04-03 18:27:55 +02:00
virginieky
c24c2f9adc
Merge pull request #5702 from strapi/media-lib/add-back-button 
Add backbutton in upload
 2020-04-03 18:15:19 +02:00
Ky
6c0c0ae607 some ui fixes 
Signed-off-by: Ky <virginie.ky@gmail.com>
 2020-04-03 17:29:08 +02:00
HichamELBSI
c285c2a88e Fix some UI issues in the ML 
Signed-off-by: HichamELBSI <elabbassih@gmail.com>
 2020-04-03 17:15:09 +02:00
soupette
cb0eb350ee Merge branch 'features/media-lib' of github.com:strapi/strapi into media-lib/add-back-button 2020-04-03 16:45:07 +02:00
cyril lopez
df21ff0d35
Merge pull request #5700 from strapi/media-lib/update-buffet 
Media lib upgrade Buffet.js version
 2020-04-03 16:44:49 +02:00
soupette
8cf7cc01a9 Merge branch 'features/media-lib' of github.com:strapi/strapi into media-lib/add-back-button 2020-04-03 16:32:35 +02:00
soupette
8ed4e7263e Fix conflicts 
Signed-off-by: soupette <cyril.lpz@gmail.com>
 2020-04-03 16:31:38 +02:00
Alexandre BODIN
8942456cd4
Merge pull request #5699 from strapi/media-lib/url-proxy 
Add proxy to get url without cors issues
 2020-04-03 16:21:28 +02:00
soupette
7260b02cbe Add back button in ctm modals 
Signed-off-by: soupette <cyril.lpz@gmail.com>
 2020-04-03 15:58:11 +02:00
Alexandre Bodin
71d7ecab6c Move proxy to controllers to protect it 
Signed-off-by: Alexandre Bodin <bodin.alex@gmail.com>
 2020-04-03 15:34:05 +02:00
soupette
eb682a5912 Add backbutton in upload 
Signed-off-by: soupette <cyril.lpz@gmail.com>
 2020-04-03 15:31:00 +02:00
soupette
d4c7fe5c37 Add auth to request 
Signed-off-by: soupette <cyril.lpz@gmail.com>
 2020-04-03 15:17:10 +02:00
soupette
fdaf881bc5 Fix tests 
Signed-off-by: soupette <cyril.lpz@gmail.com>
 2020-04-03 15:12:15 +02:00
soupette
c69b6e8d4e Remove fileInfo.name when unchanged 
Signed-off-by: soupette <cyril.lpz@gmail.com>
 2020-04-03 14:38:44 +02:00
Alexandre Bodin
904b2b438b Use mime-types to set extension 
Signed-off-by: Alexandre Bodin <bodin.alex@gmail.com>
 2020-04-03 14:02:26 +02:00
Jim LAURIE
c0ec9a54ec
Merge pull request #5088 from gambhiro/deploy-to-app-engine 
Guide to deploy to google app engine
 2020-04-03 13:50:31 +02:00
Jim LAURIE
810d333ef0
Merge branch 'master' into deploy-to-app-engine 2020-04-03 13:50:06 +02:00
soupette
500c12f7c7 Remove last / from file name 
Signed-off-by: soupette <cyril.lpz@gmail.com>
 2020-04-03 11:39:02 +02:00
soupette
0feb9df255 Update snapshots 
Signed-off-by: soupette <cyril.lpz@gmail.com>
 2020-04-03 11:29:34 +02:00
soupette
1953e5957a Fix date formats 
Signed-off-by: soupette <cyril.lpz@gmail.com>
 2020-04-03 11:28:11 +02:00
soupette
b5b140bb32 Use proxy endpoint to fetch external files 
Signed-off-by: soupette <cyril.lpz@gmail.com>
Signed-off-by: Alexandre Bodin <bodin.alex@gmail.com>
 2020-04-03 11:24:59 +02:00
soupette
dd49b92e07 Upgrade buffet.js 
Signed-off-by: soupette <cyril.lpz@gmail.com>
 2020-04-03 11:00:28 +02:00
cyril lopez
8d7580178c
Merge pull request #5694 from strapi/media-lib/edit-error-state 
Edit Error states
 2020-04-03 10:38:03 +02:00
Ky
22d3c4d0ca remove useless headers 
Signed-off-by: Ky <virginie.ky@gmail.com>
 2020-04-03 10:34:01 +02:00
Ky
c567ab55eb Merge branch 'features/media-lib' of github.com:strapi/strapi into media-lib/edit-error-state 2020-04-03 10:30:39 +02:00
cyril lopez
81aa54f003
Merge pull request #5691 from strapi/media-lib/ui-fix-1 
Fix some UI issue in the media library
 2020-04-03 10:20:54 +02:00
HichamELBSI
92ff39d450 Fix PR review 
Signed-off-by: HichamELBSI <elabbassih@gmail.com>
 2020-04-03 10:18:19 +02:00
Ky
4149ec2256 Apply code review 
Signed-off-by: Ky <virginie.ky@gmail.com>
 2020-04-03 10:05:24 +02:00
cyril lopez
1b9f4c12e7
Merge pull request #5689 from strapi/fix/datepicker 
Fix date filter
 2020-04-03 09:58:27 +02:00
Alexandre BODIN
f54cdfdd21
Merge pull request #5698 from diogotcorreia/patch-1 
Update Node LTS version on BUG_REPORT.md to v12
 2020-04-03 08:43:15 +02:00
Diogo Correia
356fe6bf2b
Update Node LTS version on BUG_REPORT.md to v12 2020-04-03 00:16:36 +01:00
Ky
55c4962b77 clean 
Signed-off-by: Ky <virginie.ky@gmail.com>
 2020-04-02 22:12:55 +02:00
Ky
c25694d465 Error states 
Signed-off-by: Ky <virginie.ky@gmail.com>
 2020-04-02 21:53:25 +02:00