yujunjun/strapi
1
0
Fork 0
mirror of https://github.com/strapi/strapi.git synced 2025-09-25 08:19:07 +00:00
Code Issues Packages Projects Releases Wiki Activity
11,883 Commits 127 Branches 497 Tags
Commit Graph

2066 Commits

Author SHA1 Message Date
Virginie Ky
c69a84f91a Merge branch 'develop' of github.com:strapi/strapi into front/ui-improvements 
Signed-off-by: Virginie Ky <virginie.ky@gmail.com>
 2020-03-23 08:34:34 +01:00
virginieky
3e64019fda
Merge pull request #5451 from strapi/front/editview-alignment 
Some alignment fixes
 2020-03-16 16:47:40 +01:00
virginieky
3fdc9c7d95
Merge branch 'develop' into front/ui-improvements 2020-03-16 16:47:01 +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
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
Alexandre BODIN
9ab43d2c42
Merge branch 'master' into fix/#4901/findOneCantHaveMultipleParametersWhenThereIsAPK 2020-03-12 16:10:56 +01:00
Pierre Noël
15f4ae67d7 add test for replaceIdByPrimaryKey 
Signed-off-by: Pierre Noël <pierre.noel@strapi.io>
 2020-03-10 16:44:28 +01:00
soupette
28c57d8af4 Temporarily fix input file until media lib is ok 
Signed-off-by: soupette <cyril.lpz@gmail.com>
 2020-03-10 11:50:48 +01:00
soupette
819a403340 Created temp input file 
Signed-off-by: soupette <cyril.lpz@gmail.com>
 2020-03-10 10:25:24 +01:00
virginieky
1698dfe98c Merge branch 'develop' into front/ui-improvements 
Signed-off-by: Virginie Ky <virginie.ky@gmail.com>
 2020-03-09 10:57:49 +01:00
Pierre Noël
b5ec9cb1c8 handle unexpected params from koa-router 
Signed-off-by: Pierre Noël <pierre.noel@strapi.io>

Signed-off-by: Pierre Noël <pierre.noel@strapi.io>
 2020-03-06 19:16:51 +01:00
Virginie Ky
a3644a42c7 Some alignment fixes 
Signed-off-by: Virginie Ky <virginie.ky@gmail.com>
 2020-03-06 18:52:18 +01:00
virginieky
4b76be27c3
Merge branch 'develop' into front/ui-improvements 2020-03-06 17:28:22 +01:00
soupette
8a8929e97c v3.0.0-beta.19.3 2020-03-06 10:02:36 +01:00
Virginie Ky
b69d3f807d Merge branch 'develop' of github.com:strapi/strapi into front/ui-improvements 
Signed-off-by: Virginie Ky <virginie.ky@gmail.com>
 2020-03-05 19:18:35 +01:00
Alexandre Bodin
b3e18e1de6 v3.0.0-beta.19.2 2020-03-05 14:32:42 +01:00
soupette
d1acb7df39 Fixes #5424 
Signed-off-by: soupette <cyril.lpz@gmail.com>
 2020-03-05 13:38:04 +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
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
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
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
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
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
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
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
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
65c1dd5582
Merge branch 'develop' into fix/autocomplete 2020-02-28 09:35: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
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
soupette
caeeb97f7d Fixes #3247 
Signed-off-by: soupette <cyril.lpz@gmail.com>
 2020-02-27 11:35:35 +01:00
soupette
9c638f5351 Fixes #5053 
Signed-off-by: soupette <cyril.lpz@gmail.com>
 2020-02-27 11:20:04 +01:00
HichamELBSI
6821fe8d63 Fix PR feedbacks 
Signed-off-by: HichamELBSI <elabbassih@gmail.com>
 2020-02-26 17:33:18 +01:00
HichamELBSI
48f5c5f418 Fix PR feedbacks 2020-02-26 14:53:32 +01:00
Alexandre Bodin
3bcbde8f0b v3.0.0-beta.18.8 2020-02-26 12:01:37 +01:00
HichamELBSI
e450d3613b Add UID in CTM 
Signed-off-by: HichamELBSI <elabbassih@gmail.com>
 2020-02-25 21:44:02 +01:00
Alexandre Bodin
f0d86ed2f7 Uses defaultValue as slug when possible 
Signed-off-by: Alexandre Bodin <bodin.alex@gmail.com>
 2020-02-21 10:13:49 +01:00