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

2173 Commits

Author SHA1 Message Date
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
Alexandre Bodin
9d8944ebfe v3.0.0-beta.20 2020-04-16 15:10:53 +02:00
soupette
5d57fcc1b5 Fix date display in ctm 
Signed-off-by: soupette <cyril.lpz@gmail.com>
 2020-04-16 13:56:07 +02:00
soupette
eab4312b82 Fixes #5805 
Signed-off-by: soupette <cyril.lpz@gmail.com>
 2020-04-16 11:13:38 +02:00
soupette
e6dd1a73b4 Fix thumbnail preview 
Signed-off-by: soupette <cyril.lpz@gmail.com>
 2020-04-15 19:21:24 +02:00
soupette
73c4160d21 Remove validations statement for input password 
Signed-off-by: soupette <cyril.lpz@gmail.com>
 2020-04-15 17:19:23 +02:00
cyril lopez
ebd20c9d5a
Merge pull request #5784 from strapi/media-lib/front-fix 
Media lib front fixes
 2020-04-15 14:40:04 +02:00
Ky
e4e54c49d5 extension 
Signed-off-by: Ky <virginie.ky@gmail.com>
 2020-04-15 11:32:11 +02:00
soupette
d041bde294 Fix input type and add clear logic for this field type 
Signed-off-by: soupette <cyril.lpz@gmail.com>
 2020-04-14 11:09:20 +02:00
Ky
c4e07b2606 CM listview extension 
Signed-off-by: Ky <virginie.ky@gmail.com>
 2020-04-14 00:22:40 +02:00
soupette
e97b8cca71 Fix PR feedback 
Signed-off-by: soupette <cyril.lpz@gmail.com>
 2020-04-10 15:25:00 +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
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
soupette
5c7992544a Add timestamps to sort picker 
Signed-off-by: soupette <cyril.lpz@gmail.com>
 2020-04-02 09:10:10 +02:00
HichamELBSI
829bf7c390 Custom timestamps 
Signed-off-by: HichamELBSI <elabbassih@gmail.com>
 2020-04-01 16:15:57 +02:00
Alexandre Bodin
ff15757685 Merge tag 'v3.0.0-beta.19.5' 
v3.0.0-beta.19.5
 2020-04-01 11:31:04 +02:00
Alexandre Bodin
8d56e0c12f v3.0.0-beta.19.5 2020-04-01 11:27:56 +02:00
Alexandre Bodin
5a259ddf41 Merge branch 'develop' into features/media-lib 
Signed-off-by: Alexandre Bodin <bodin.alex@gmail.com>
 2020-03-30 16:00:24 +02:00
Alexandre Bodin
6f2103a402 Init sender and middleware, ping 
Signed-off-by: Alexandre Bodin <bodin.alex@gmail.com>
 2020-03-30 14:50:19 +02:00
Alexandre Bodin
50df7365d6 Merge branch 'develop' into features/media-lib 
Signed-off-by: Alexandre Bodin <bodin.alex@gmail.com>
 2020-03-30 12:04:04 +02:00