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
12,790 Commits 127 Branches 497 Tags
Commit Graph

8925 Commits

Author SHA1 Message Date
Alexandre Bodin
a27d5f210d v3.0.0-beta.20.2 2020-05-05 14:56:13 +02:00
Alexandre Bodin
a927f7e19b Only allow registeration with specific fields 
Signed-off-by: Alexandre Bodin <bodin.alex@gmail.com>
Co-authored-by: diogotcorreia
 2020-05-05 14:46:44 +02:00
Alexandre Bodin
6a6d53b402 v3.0.0-beta.20.1 2020-04-28 10:00:23 +02:00
cyril lopez
62c01a08e5
Merge branch 'master' into develop 2020-04-27 17:50:25 +02:00
domenicoven
898f757e5b
Made unit tests on files platform agnostic by using path.combine (tests were failing on windows) (#5943) 
Signed-off-by: domenico ventura <domenico@digitware.it>

Co-authored-by: domenico ventura <domenico@digitware.it>
 2020-04-27 16:56:19 +02:00
Alexandre BODIN
5dac3e4866
Add metris to the media lib with ratelimit (#5946) 
* Add daily sender

Signed-off-by: Alexandre Bodin <bodin.alex@gmail.com>

* Add media lib events and ratelimiter wrapper

Signed-off-by: Alexandre Bodin <bodin.alex@gmail.com>
 2020-04-27 16:08:55 +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
Bendegúz Cseresnyés
b6853eb907
Fixed: Core store returned null instead of string (#5957) 
* Fix: Add option to core-store that returns string

Signed-off-by: Bendegúz Cseresnyés <cser.bende@gmail.com>

* fix: Core-store string values parsed as json

Signed-off-by: Bendegúz Cseresnyés <cser.bende@gmail.com>
 2020-04-27 12:50:58 +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
domenicoven
d0eea7e8cf
remove koa-qs dependency as it is not anymore maintained (#5922) 
* remove koa-qs dependency as it is not anymore maintained

Signed-off-by: domenico ventura <domenico@digitware.it>

Removing dependency from koa-qs

Signed-off-by: domenico ventura <domenico@digitware.it>

* cleaning the code

Signed-off-by: domenico ventura <domenico@digitware.it>

* removed merge dependency and use object.defineProperty

Signed-off-by: domenico ventura <domenico@digitware.it>

* remove koa-qs dependency as it is not anymore maintained

Signed-off-by: domenico ventura <domenico@digitware.it>

Removing dependency from koa-qs

Signed-off-by: domenico ventura <domenico@digitware.it>

* cleaning the code

Signed-off-by: domenico ventura <domenico@digitware.it>

* removed merge dependency and use object.defineProperty

Signed-off-by: domenico ventura <domenico@digitware.it>

* removing arrow functions

Signed-off-by: domenico ventura <domenico@digitware.it>

* removing arrow functions

Signed-off-by: domenico ventura <domenico@digitware.it>

Co-authored-by: domenico ventura <domenico@digitware.it>
 2020-04-24 14:09:27 +02:00
soupette
8f22ee2c5a Fix PR feedback 
Signed-off-by: soupette <cyril.lpz@gmail.com>
 2020-04-24 12:07:07 +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
soupette
2cf58b20d4 Update snapshots 
Signed-off-by: soupette <cyril.lpz@gmail.com>
 2020-04-24 09:18:19 +02:00
soupette
5021aabfdc Fix trads typo 
Signed-off-by: soupette <cyril.lpz@gmail.com>
 2020-04-24 09:17:42 +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
soupette
221ad7975b Fix conflicts 
Signed-off-by: soupette <cyril.lpz@gmail.com>
 2020-04-23 14:51:42 +02:00
soupette
c44dd2dbd8 Add front-end media lib usage events 
Signed-off-by: soupette <cyril.lpz@gmail.com>
 2020-04-23 14:18:58 +02:00
Ky
36695568e2 update snapshots 
Signed-off-by: Ky <virginie.ky@gmail.com>
 2020-04-23 14:02:32 +02:00
Ky
5bdb87d429 Merge branch 'master' of github.com:strapi/strapi into front/update-buffetjs 2020-04-23 12:36:15 +02:00
Ky
ccc452e5b2 update buffetjs dependency 
Signed-off-by: Ky <virginie.ky@gmail.com>
 2020-04-23 10:07:53 +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
Pierre Noël
4b7fbadef5
fix shadow crud breaking build when resolvers are not defined in a plugin (#5899) 
* fix shadow crud breaking build when resolvers are not defined in a plugin

Signed-off-by: Pierre Noël <pierre.noel@strapi.io>

* refacto

Signed-off-by: Pierre Noël <pierre.noel@strapi.io>

Co-authored-by: Pierre Noël <pierre.noel@strapi.io>
 2020-04-22 15:41:40 +02:00
soupette
81454df46f Fix lint 
Signed-off-by: soupette <cyril.lpz@gmail.com>
 2020-04-22 14:01:12 +02:00
soupette
d71235a0c1 Fix tests 
Signed-off-by: soupette <cyril.lpz@gmail.com>
 2020-04-22 14:01:11 +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
71eec181fe Upagrade react helmet 
Signed-off-by: soupette <cyril.lpz@gmail.com>
 2020-04-22 14:01:10 +02:00
soupette
ec5f4e2e96 Update documentation about language customisation 
Signed-off-by: soupette <cyril.lpz@gmail.com>
 2020-04-22 14:01:09 +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
0faf75124f Add deprecation warnings 
Signed-off-by: soupette <cyril.lpz@gmail.com>
 2020-04-22 14:01:05 +02:00
soupette
13d4c58bbe Update reducer injector in all plugins 
Signed-off-by: soupette <cyril.lpz@gmail.com>
 2020-04-22 14:01:05 +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
cyril lopez
a5221661d8
Merge branch 'develop' into enhancement/add-appid-ctm 2020-04-22 14:00:33 +02:00
Steven Raines
bec93f672f
updated arguments sent to role controller to (#5857) 
match the expected format

Signed-off-by: Steven Raines <stevenraines@gmail.com>
 2020-04-22 11:13:48 +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
37edd0f445
Merge branch 'develop' into front/global-improvements 2020-04-21 16:02:06 +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
Pierre Noël
17e8cba03e remove useless async 
Signed-off-by: Pierre Noël <pierre.noel@strapi.io>
 2020-04-20 16:49:36 +02:00
Pierre Noël
555dbda454 fix count() result not a number 
Signed-off-by: Pierre Noël <pierre.noel@strapi.io>
 2020-04-20 16:43:00 +02:00