yujunjun/strapi
1
0
Fork 0
mirror of https://github.com/strapi/strapi.git synced 2025-10-11 08:02:55 +00:00
Code Issues Packages Projects Releases Wiki Activity
11,897 Commits 107 Branches 503 Tags
Commit Graph

2076 Commits

Author SHA1 Message Date
virginieky
7583b035a9
Merge branch 'features/media-lib' into front/media-library-filter 2020-03-05 14:48:55 +01:00
Alexandre Bodin
e1a7074a4e Merge branch 'develop' into features/media-lib 2020-03-05 14:39:29 +01:00
Alexandre Bodin
b3e18e1de6 v3.0.0-beta.19.2 2020-03-05 14:32:42 +01:00
soupette
267cc069e3 Fix conflicts 
Signed-off-by: soupette <cyril.lpz@gmail.com>
 2020-03-05 14:26:00 +01:00
soupette
d1acb7df39 Fixes #5424 
Signed-off-by: soupette <cyril.lpz@gmail.com>
 2020-03-05 13:38:04 +01:00
soupette
f1de079d77 Fix conflicts 
Signed-off-by: soupette <cyril.lpz@gmail.com>
 2020-03-05 10:22:49 +01:00
Mariusz Wachowski
bfa0795d2c list of many relations with scrollbar 
Signed-off-by: Mariusz Wachowski <wachowski.mariusz@gmail.com>
 2020-03-04 21:27:09 +01:00
Alexandre Bodin
8e91e5abaf v3.0.0-beta.19.1 2020-03-04 18:42:31 +01:00
Alexandre BODIN
634faa8333
Merge pull request #5395 from strapi/media-lib/upload-with-infos 
Media lib/upload with infos
 2020-03-04 18:40:55 +01:00
Virginie Ky
14e7e07c23 Merge branch 'features/media-lib' of github.com:strapi/strapi into front/media-library-filter 
Signed-off-by: Virginie Ky <virginie.ky@gmail.com>
 2020-03-04 17:17:36 +01:00
Alexandre BODIN
fa28037c48
Merge pull request #5400 from kubuntux/fix-selectwrapper-zindex3 
Fix SelectWrapper stack order
 2020-03-04 17:10:35 +01:00
Alexandre BODIN
76f550cb4a
Merge pull request #5396 from z1digitalstudio/fix/number-input 
fix(EditViewDataManagerProvider): allow to reset number input
 2020-03-04 17:10:02 +01:00
soupette
6efcd1c48f Merge branch 'features/media-lib' of github.com:strapi/strapi into features/media-lib-add-field-to-ctm 2020-03-04 14:54:40 +01:00
soupette
d6bc4e1941 Fix conflicts 
Signed-off-by: soupette <cyril.lpz@gmail.com>
 2020-03-04 14:52:29 +01:00
cyril lopez
9761cbe19a
Merge branch 'master' into fix-selectwrapper-zindex3 2020-03-04 14:39:04 +01:00
Alexandre Bodin
e222792181 v3.0.0-beta.19 2020-03-04 14:24:23 +01:00
soupette
86d70aee39 Fix ctm table on safari and repeatable compo on firefox 
Signed-off-by: soupette <cyril.lpz@gmail.com>
 2020-03-04 13:11:06 +01:00
James Alvarez
3c75bcdf35 Merge branch 'master' into fix-selectwrapper-zindex3 
Updated master from strapi/strapi
 2020-03-04 19:55:36 +08:00
soupette
7c12398df6 Fixes #5404 
Signed-off-by: soupette <cyril.lpz@gmail.com>
 2020-03-04 12:16:26 +01:00
soupette
88d9bfc2b2 Fix uid display 
Signed-off-by: soupette <cyril.lpz@gmail.com>
 2020-03-04 10:40:58 +01:00
HichamELBSI
b5947621fc Merge branch 'master' into develop 2020-03-04 09:32:13 +01:00
James Alvarez
975c01bcff Fix SelectWrapper stack order 
Signed-off-by: James Alvarez <jp@domainwink.com>
 2020-03-04 12:38:55 +08:00
Virginie Ky
5312035673 Merge branch 'develop' of github.com:strapi/strapi into front/media-library-filter 2020-03-03 17:49:41 +01:00
Pablo Rodríguez Caballero
e1549e7612
fix(EditViewDataManagerProvider): allow to reset number input 
Previously, deleting the numeric value from a number input would send an
empty string to the backend. The backend would convert that empty string
to 0, meaning that after setting a number, it would be impossible to
reset it to an empty field.

Signed-off-by: Pablo Rodríguez Caballero <pablo@rodriguezcaballero.me>
 2020-03-03 17:35:11 +01:00
soupette
eaf210e081 Add dummy field API 
Signed-off-by: soupette <cyril.lpz@gmail.com>
 2020-03-03 16:40:02 +01:00
Alexandre Bodin
e5b319d81e Update file creation process with fileInfo 
Signed-off-by: Alexandre Bodin <bodin.alex@gmail.com>
 2020-03-03 16:33:48 +01:00
Alexandre Bodin
5d2805bf14 Merge branch 'develop' into features/media-lib 2020-03-03 16:12:34 +01:00
Alexandre Bodin
01cda58cee Fix validation on update not allowing nulls 
Signed-off-by: Alexandre Bodin <bodin.alex@gmail.com>
 2020-03-03 16:12:19 +01:00
Virginie Ky
f50a5b1b66 Merge branch 'features/media-lib' of github.com:strapi/strapi into front/media-library-filter 2020-03-03 14:44:07 +01:00
Virginie Ky
abfc1d3287 Apply some PR review 
Signed-off-by: Virginie Ky <virginie.ky@gmail.com>
 2020-03-02 17:35:44 +01:00
Alexandre Bodin
7a8c865051 Merge branch 'develop' into features/media-lib 
Signed-off-by: Alexandre Bodin <bodin.alex@gmail.com>
 2020-03-02 15:18:08 +01:00
Alexey Murz Korepov
cb71cc5940 Replaced false to ! 
Signed-off-by: Alexey Murz Korepov <murznn@gmail.com>
 2020-03-02 15:42:50 +03:00
soupette
3a695aeaac Merge branch 'develop' of github.com:strapi/strapi into chore/remove-saga-admin 2020-03-02 11:34:01 +01:00
soupette
431b935203 Merge branch 'develop' of github.com:strapi/strapi into features/media-lib 2020-03-02 09:31:40 +01:00
Alexey Murz Korepov
540a72af8e replace JSON.stringify to lodash isEqual 
Signed-off-by: Alexey Murz Korepov <murznn@gmail.com>
 2020-03-02 11:09:52 +03:00
Virginie Ky
98b305c481 url update fix and avoid several identical filters 
Signed-off-by: Virginie Ky <virginie.ky@gmail.com>
 2020-03-01 21:28:26 +01:00
Alexey Murz Korepov
5f9cbe527e Suppress rewrite config in db without changes 
Now Strapi rewrite all 'plugin_content_manager_configuration_content_types' keys in "core_store" database table on each restart.
I add comparison of stored config with generated, and skip unnecessary write config to database, when there are no changes.

Signed-off-by: Alexey Murz Korepov <murznn@gmail.com>
 2020-02-29 19:08:57 +03:00
HichamELBSI
d243aced6c Merge branch 'develop' into features/single-types 2020-02-28 16:46:17 +01:00
HichamELBSI
92632be70d Fix all single types feedback 
Signed-off-by: HichamELBSI <elabbassih@gmail.com>
 2020-02-28 16:03:38 +01:00
Virginie Ky
4c6e50439d override dateFormats and getFilterType tests 
Signed-off-by: Virginie Ky <virginie.ky@gmail.com>
 2020-02-28 12:44:15 +01:00
soupette
ccc92b90a5 Add required info into the plugin object and update plugin generator 
Signed-off-by: soupette <cyril.lpz@gmail.com>
 2020-02-28 11:40:55 +01:00
cyril lopez
1bc1ea2563
Merge pull request #5333 from strapi/front/media-library-filter 
Front/media library filter
 2020-02-28 10:41:42 +01:00
Virginie Ky
5b4185ec42 Merge branch 'front/media-lib-filters' of github.com:strapi/strapi into front/media-library-filter 
Signed-off-by: Virginie Ky <virginie.ky@gmail.com>
 2020-02-28 10:16:23 +01:00
cyril lopez
65c1dd5582
Merge branch 'develop' into fix/autocomplete 2020-02-28 09:35:58 +01:00
soupette
aef0086337 Merge branch 'develop' of github.com:strapi/strapi into features/media-lib 2020-02-28 07:29:58 +01:00
James Alvarez
e069cb56b4 Fixed bug #5266 
When adding new content, select field was incorrectly wrapped

Signed-off-by: James Alvarez <jp@domainwink.com>
 2020-02-28 02:21:21 +08:00
soupette
725a0940ab Fixes #5343 
Signed-off-by: soupette <cyril.lpz@gmail.com>
 2020-02-27 17:10:20 +01:00
Virginie Ky
24c07727da Replace carret with buffet icon 
Signed-off-by: Virginie Ky <virginie.ky@gmail.com>
 2020-02-27 14:39:10 +01:00
cyril lopez
e2d54bf907
Merge branch 'develop' into fix/ctm-related-redirect 2020-02-27 12:04:43 +01:00
soupette
4c8fc44832 Fix redirect url when navigating between views 
Signed-off-by: soupette <cyril.lpz@gmail.com>
 2020-02-27 11:56:27 +01:00