yujunjun/strapi
1
0
Fork 0
mirror of https://github.com/strapi/strapi.git synced 2025-12-27 15:13:21 +00:00
Code Issues Packages Projects Releases Wiki Activity
12,804 Commits 138 Branches 514 Tags
Commit Graph

12804 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Convly
079ad89781 Prune obsolete files relations on startup 
Signed-off-by: Convly <jean-sebastien.herbaux@epitech.eu>
 2020-05-04 11:11:22 +02:00
Lucas
ff2dbb3865
Uninstall plugin: function to delete folder with files (#5874) 
Signed-off-by: Łukasz Matuszewski <lucas.matuszewski@gmail.com>
 2020-05-04 10:14:56 +02:00
Alexandre BODIN
839c51011a
Merge pull request #5991 from strapi/fix/4813/searchDoesntAlwaysWork 
Change search logic
 2020-05-04 10:11:13 +02:00
Pierre Noël
8d3303014f remove test password 
Signed-off-by: Pierre Noël <petersg83@gmail.com>
 2020-04-30 19:47:04 +02:00
Pierre Noël
e0e561e6d0 add test for escapeQuery() 
Signed-off-by: Pierre Noël <petersg83@gmail.com>
 2020-04-30 19:47:04 +02:00
Pierre Noël
7c837cde6c refacto 
Signed-off-by: Pierre Noël <petersg83@gmail.com>
 2020-04-30 19:47:03 +02:00
Pierre Noël
115600f1aa search for mongodbId if the query is a mongodbId 
Signed-off-by: Pierre Noël <petersg83@gmail.com>
 2020-04-30 19:47:03 +02:00
Pierre Noël
ee73715d8e update yarn.lock 
Signed-off-by: Pierre Noël <petersg83@gmail.com>
 2020-04-30 19:47:02 +02:00
Pierre Noël
015480b1b5 Change search logic 
Signed-off-by: Pierre Noël <pierre.noel@strapi.io>
 2020-04-30 19:47:02 +02:00
Alexandre BODIN
9414eb717b
Merge pull request #6007 from kabaros/pg-pool-settings 
Preserve pool setttings when there is a schema
 2020-04-30 17:45:07 +02:00
kabaros
149c1f7737 Preserve pool setttings when there is a schema 
In the case where this is a schema defined, `options.pool` is reassigned ignoring the object constructed in a previous step (only preserving min and max, but not the other values such as `createTimeoutMillis` etc...  This change is to keep the other values intact.

Signed-off-by: mozafar <kabaros@gmail.com>
 2020-04-30 14:35:14 +01:00
cyril lopez
e79daadb5a
Merge pull request #5990 from strapi/fix/remove-password-from-data 
Remove password field from the retrieved data
 2020-04-29 16:19:24 +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
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
Alexandre Bodin
6a6d53b402 v3.0.0-beta.20.1 v3.0.0-beta.20.1 2020-04-28 10:00:23 +02:00
cyril lopez
56629bdd04
Merge pull request #5942 from strapi/develop 
Front-end improvements
 2020-04-27 18:52:47 +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
Jim LAURIE
dd34f9465a
Merge pull request #5932 from bjdixon/bugfix/aws-documentation-typo 
Fix Typo in AWS deployment documentation
 2020-04-27 11:30:10 +02:00
Jim LAURIE
44dab28519
Merge branch 'master' into bugfix/aws-documentation-typo 2020-04-27 11:30:01 +02:00
Jim LAURIE
158909dcf1
Merge pull request #5926 from Astraeus-/master 
Update documentation of authentication errors
 2020-04-27 11:29:22 +02:00
Jim LAURIE
f65644ba64
Merge branch 'master' into master 2020-04-27 11:29:14 +02:00
Alexandre Bodin
05f22aaf27 Merge branch 'master' into develop 2020-04-27 11:15:48 +02:00
Jim LAURIE
8a1aefd28f Merge branch 'documentation' 2020-04-27 10:01:04 +02:00
cyril lopez
5e8069cc26
Merge pull request #5939 from strapi/front/indent 
indent RemoveWrapper file
 2020-04-24 16:02:31 +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
afa40a3c45 Update branch 
Signed-off-by: soupette <cyril.lpz@gmail.com>
 2020-04-24 15:36:17 +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
Daniel Schäfer
0e8dc2e917
Fix typo in documentation (#5866) 
Signed-off-by: Daniel <epegzz@gmail.com>
 2020-04-24 14:08:01 +02:00
cyril lopez
3e50e71c51
Merge pull request #5907 from strapi/chore/redux 
Upgrade dependencies
 2020-04-24 13:20:47 +02:00
soupette
03b7b3340f Improve doc 
Signed-off-by: soupette <cyril.lpz@gmail.com>
 2020-04-24 12:46:37 +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
cyril lopez
81c94c9ea0
Merge pull request #5897 from strapi/fix/single-types-issues 
Fix single types navigation
 2020-04-24 09:44:53 +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
Brian Dixon
0f8d150105 Fix Typo in AWS deployment documentation 
Following the instructions to install Node.js with npm will result in node version 10 being installed instead of version 12.

Signed-off-by: bjdixon <bjdixon@gmail.com>
 2020-04-24 13:51:27 +08:00
cyril lopez
024de9ac5e
Merge pull request #5923 from strapi/tracking/front-end-events 
Add front-end media lib usage events
 2020-04-23 18:13:16 +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
Astraeus-
2dafb22b5e Update authentication error documentation 
Error has a "response" property that holds the data

Signed-off-by: Astraeus- <Astraeus-@users.noreply.github.com>
 2020-04-23 16:56:52 +02:00