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

1068 Commits

Author SHA1 Message Date
soupette
3553025d59 Merge branch 'features/media-lib' of github.com:strapi/strapi into media-lib/wysiwyg 2020-04-10 14:14:34 +02:00
HichamELBSI
a672b66b7f Fix filters and allowed types 
Signed-off-by: HichamELBSI <elabbassih@gmail.com>
 2020-04-10 14:06:09 +02:00
soupette
e32dbdfa59 Hide nav in modal when needed 
Signed-off-by: soupette <cyril.lpz@gmail.com>
 2020-04-09 18:24:53 +02:00
soupette
d773d692b8 Add ML compo to WYSIWYG 
Signed-off-by: soupette <cyril.lpz@gmail.com>
 2020-04-09 17:09:03 +02:00
soupette
87f8965579 Fix FieldApi getField 
Signed-off-by: soupette <cyril.lpz@gmail.com>
 2020-04-09 15:06:27 +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
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
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
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
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
soupette
c5441f1d61 Fix init request 
Signed-off-by: soupette <cyril.lpz@gmail.com>
 2020-04-07 15:47:35 +02:00
soupette
9532212e86 Update timeout 
Signed-off-by: soupette <cyril.lpz@gmail.com>
 2020-04-07 14:28:54 +02:00
soupette
e7f4f8bfa1 Fix edit file when lib not initialized 
Signed-off-by: soupette <cyril.lpz@gmail.com>
 2020-04-07 14:24:12 +02:00
soupette
19af1482af Fix errors 
Signed-off-by: soupette <cyril.lpz@gmail.com>
 2020-04-07 13:23:08 +02:00
soupette
ead77e08c4 Fix errors 
Signed-off-by: soupette <cyril.lpz@gmail.com>
 2020-04-07 11:18:26 +02:00
soupette
341bb9a209 Disable buttons when in uploading state 
Signed-off-by: soupette <cyril.lpz@gmail.com>
 2020-04-07 10:57:59 +02:00
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
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
bdbec4e3f0 Fix count endpoint with filters 
Signed-off-by: soupette <cyril.lpz@gmail.com>
 2020-04-06 14:22:50 +02:00
Ky
15c7beac0f pagination alignment 
Signed-off-by: Ky <virginie.ky@gmail.com>
 2020-04-06 14:06:27 +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
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
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