yujunjun/strapi
1
0
Fork 0
mirror of https://github.com/strapi/strapi.git synced 2025-09-25 16:29:34 +00:00
Code Issues Packages Projects Releases Wiki Activity
12,540 Commits 129 Branches 498 Tags
Commit Graph

12540 Commits

This Branch
This Branch
All Branches
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
cyril lopez
32e6508e9a
Merge pull request #5763 from strapi/media-lib/fix-filters 
Fix filters and allowed types
 2020-04-10 14:13:07 +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
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
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
soupette
d512043b12 Add components API 
Signed-off-by: soupette <cyril.lpz@gmail.com>
 2020-04-09 14:13:23 +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
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
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
Vasyl Rishko
0efdd382bd
Fix default values on create entity. (#5675) 
* fix: default values on create entity.

Signed-off-by: VasylRishko <rishko92@gmail.com>

* tests: test default date and json values.

Signed-off-by: VasylRishko <rishko92@gmail.com>
 2020-04-07 12:56:53 +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
Yassir Barchi
3a42a49162
Add RegExp as text type attribute validation option (#5648) 
* feat: add Regexp for attribute value validation

strapi-plugin-content-type-builder

Signed-off-by: Yassir Barchi <dev.yassir@gmail.com>

* feat: add Regexp for attribute value validation

strapi-plugin-content-manager

Signed-off-by: Yassir Barchi <dev.yassir@gmail.com>

* fix error on submit

Signed-off-by: Yassir Barchi <dev.yassir@gmail.com>

* add regex pattern validation

Signed-off-by: Yassir Barchi <dev.yassir@gmail.com>

* add api validation

Signed-off-by: Yassir Barchi <dev.yassir@gmail.com>

* fix lint issues

Signed-off-by: Yassir Barchi <dev.yassir@gmail.com>

* remove redundant code

Signed-off-by: Yassir Barchi <dev.yassir@gmail.com>

* fix en.json build issue

Signed-off-by: Yassir Barchi <dev.yassir@gmail.com>

* add the reset input logic to the regex field

Signed-off-by: Yassir Barchi <dev.yassir@gmail.com>
 2020-04-07 10:41:46 +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
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