yujunjun/strapi
1
0
Fork 0
mirror of https://github.com/strapi/strapi.git synced 2025-09-26 00:39:49 +00:00
Code Issues Packages Projects Releases Wiki Activity
13,044 Commits 129 Branches 498 Tags
Commit Graph

2195 Commits

Author SHA1 Message Date
Alexandre Bodin
f192d5e171 Merge branch 'master' into develop 
Signed-off-by: Alexandre Bodin <bodin.alex@gmail.com>
 2020-05-07 13:14:23 +02:00
Alexandre Bodin
55c006a6b1 v3.0.0-beta.20.3 2020-05-07 13:02:11 +02:00
Ky
fc5545e618 Merge branch 'develop' of github.com:strapi/strapi into front/ctm-loader 2020-05-06 17:03:08 +02:00
Alexandre Bodin
72ad156f20 Merge branch 'master' into develop 2020-05-05 15:01:11 +02:00
Alexandre Bodin
a3304c7b88 Merge tag 'v3.0.0-beta.20.2' 
v3.0.0-beta.20.2

Signed-off-by: Alexandre Bodin <bodin.alex@gmail.com>
 2020-05-05 15:00:38 +02:00
Alexandre Bodin
a27d5f210d v3.0.0-beta.20.2 2020-05-05 14:56:13 +02:00
Ky
740bbd02f7 add loading to CTM listview 
Signed-off-by: Ky <virginie.ky@gmail.com>
 2020-05-05 02:05:35 +02:00
Alexandre Bodin
3b40bcee59 Merge branch 'master' into develop 2020-05-04 10:49:30 +02:00
Ky
8a75ba4c34 CTM editview alignment 
Signed-off-by: Ky <virginie.ky@gmail.com>
 2020-04-29 15:28:16 +02:00
soupette
0758260d2b Change file ext 
Signed-off-by: soupette <cyril.lpz@gmail.com>
 2020-04-29 13:52:53 +02:00
soupette
1aff8b361b Change file ext 
Signed-off-by: soupette <cyril.lpz@gmail.com>
 2020-04-29 13:52:45 +02:00
soupette
b9bd8085d6 Fixes #5992 
Signed-off-by: soupette <cyril.lpz@gmail.com>
 2020-04-29 11:34:12 +02:00
soupette
5f43f72119 Fix biginteger type 
Signed-off-by: soupette <cyril.lpz@gmail.com>
 2020-04-28 17:36:59 +02:00
Ky
dfd277ab25 design review 
Signed-off-by: Ky <virginie.ky@gmail.com>
 2020-04-28 16:58:13 +02:00
soupette
024c47177a Remove password field from the retrieved data 
Signed-off-by: soupette <cyril.lpz@gmail.com>
 2020-04-28 16:25:52 +02:00
Ky
83f2022e20 Merge branch 'develop' of github.com:strapi/strapi into front/ui-improvements 2020-04-28 15:22:20 +02:00
Ky
f828314acc apply pr review 
Signed-off-by: Ky <virginie.ky@gmail.com>
 2020-04-28 15:20:41 +02:00
Alexandre Bodin
6a6d53b402 v3.0.0-beta.20.1 2020-04-28 10:00:23 +02:00
Ky
18cd135268 Merge branch 'develop' of github.com:strapi/strapi into front/ui-improvements 2020-04-27 17:51:19 +02:00
cyril lopez
62c01a08e5
Merge branch 'master' into develop 2020-04-27 17:50:25 +02:00
李晟
6780d3598b
fix the bug of rich text can't save Chinese (#5951) 
Signed-off-by: lisheng <499817366@qq.com>
 2020-04-27 12:54:24 +02:00
Ky
771df8dfb7 fix lint 
Signed-off-by: Ky <virginie.ky@gmail.com>
 2020-04-26 19:30:23 +02:00
Ky
ef8afac70e update snapshots 
Signed-off-by: Ky <virginie.ky@gmail.com>
 2020-04-26 19:20:56 +02:00
Ky
4cd1b6c124 Merge branch 'front/ui-improvements' of github.com:strapi/strapi into front/ui-improvements 
Signed-off-by: Ky <virginie.ky@gmail.com>
 2020-04-26 18:55:03 +02:00
Ky
9384a00a96 Merge branch 'develop' of github.com:strapi/strapi into front/ui-improvements 
Signed-off-by: Ky <virginie.ky@gmail.com>
 2020-04-26 18:13:20 +02:00
virginieky
0f7942cacb
Merge branch 'develop' into front/indent 2020-04-24 15:42:22 +02:00
Ky
3ff861e417 indent RemoveWrapper file 
Signed-off-by: Ky <virginie.ky@gmail.com>
 2020-04-24 15:38:42 +02:00
soupette
5a41f68f2b Merge branch 'master' of github.com:strapi/strapi into develop 2020-04-24 15:34:45 +02:00
Martin Muzatko
58588e10e5
docs: DE Abbrechen does not mean reset (#5796) 
Abbrechen means cancel. Which implies the user would get back to the list view, while editing a single item.

Signed-off-by: Martin Muzatko <martin@happy-css.com>
 2020-04-24 10:31:36 +02:00
cyril lopez
991813636b
Merge branch 'develop' into chore/redux 2020-04-24 09:45:18 +02:00
HichamELBSI
4079ecbaf1 Fix PR review 
Signed-off-by: HichamELBSI <elabbassih@gmail.com>
 2020-04-24 09:39:18 +02:00
HichamELBSI
7a4a87fa68 Merge branch 'develop' of github.com:strapi/strapi into fix/single-types-issues 
Signed-off-by: HichamELBSI <elabbassih@gmail.com>
 2020-04-23 17:18:14 +02:00
HichamELBSI
f07dcf3f7f Fix single types navigation 
Signed-off-by: HichamELBSI <elabbassih@gmail.com>
 2020-04-23 15:01:51 +02:00
cyril lopez
c0e065f259
Merge branch 'develop' into chore/redux 2020-04-23 09:14:40 +02:00
cyril lopez
4bfcce0c0c
Merge branch 'develop' into front/global-improvements 2020-04-22 16:08:42 +02:00
soupette
8dcaf1b065 Fix styled compo lint 
Signed-off-by: soupette <cyril.lpz@gmail.com>
 2020-04-22 15:49:51 +02:00
soupette
81454df46f Fix lint 
Signed-off-by: soupette <cyril.lpz@gmail.com>
 2020-04-22 14:01:12 +02:00
soupette
a34c0ca7d9 Remove react-datetime dep and Date compo in helper plugin 
Signed-off-by: soupette <cyril.lpz@gmail.com>
 2020-04-22 14:01:11 +02:00
soupette
dc0da4a125 Upgrade react-redux 
Signed-off-by: soupette <cyril.lpz@gmail.com>
 2020-04-22 14:01:10 +02:00
soupette
6d9bc79726 Upgrade react-intl dependency to latest 
Signed-off-by: soupette <cyril.lpz@gmail.com>
 2020-04-22 14:01:08 +02:00
soupette
b71647a7d7 Remove unneeded packages 
Signed-off-by: soupette <cyril.lpz@gmail.com>
 2020-04-22 14:01:07 +02:00
soupette
58da5fd290 Fix react-select dep in alias and upgrade it 
Signed-off-by: soupette <cyril.lpz@gmail.com>
 2020-04-22 14:01:07 +02:00
soupette
76e63b8dd1 Upload reducer injection in admin and cm 
Signed-off-by: soupette <cyril.lpz@gmail.com>
 2020-04-22 14:01:04 +02:00
Ky
6b85cb28fa Merge branch 'front/global-improvements' of github.com:strapi/strapi into front/global-improvements 2020-04-21 18:15:12 +02:00
Ky
be5746dd41 apply PR review 
Signed-off-by: Ky <virginie.ky@gmail.com>
 2020-04-21 18:14:29 +02:00
virginieky
091281b53c
Merge branch 'develop' into front/global-improvements 2020-04-21 14:42:22 +02:00
Ky
bf21c7614f UI fixes 
Signed-off-by: Ky <virginie.ky@gmail.com>
 2020-04-21 14:33:03 +02:00
soupette
f6a544d2a8 Add collection id in the content manager edit view header 
Signed-off-by: soupette <cyril.lpz@gmail.com>
 2020-04-20 13:59:10 +02:00
soupette
bf1040f9b9 Upgrade reactstrap dependency. Fixes #5837 
Signed-off-by: soupette <cyril.lpz@gmail.com>
 2020-04-17 14:00:53 +02:00
soupette
68fc1e2bed Fix register new fields in content manager 
Signed-off-by: soupette <cyril.lpz@gmail.com>
 2020-04-17 12:01:55 +02:00