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
12,959 Commits 129 Branches 498 Tags
Commit Graph

12959 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Alexandre Bodin
3636532bce Add .env example and unlink script 
Signed-off-by: Alexandre Bodin <bodin.alex@gmail.com>
 2020-04-29 11:06:42 +02:00
Alexandre Bodin
a877a00934 Update docuemntation 
Signed-off-by: Alexandre Bodin <bodin.alex@gmail.com>
 2020-04-29 11:06:41 +02:00
Alexandre Bodin
cbdc83d6d7 Move core middleware configs to the middleware concept doc 
Signed-off-by: Alexandre Bodin <bodin.alex@gmail.com>
 2020-04-29 11:06:41 +02:00
Alexandre Bodin
eb706f2168 Init doc updates 
Signed-off-by: Alexandre Bodin <bodin.alex@gmail.com>
 2020-04-29 11:06:40 +02:00
Alexandre Bodin
7fdfd4803d Cleanup language middleware usage 
Signed-off-by: Alexandre Bodin <bodin.alex@gmail.com>
 2020-04-29 11:06:40 +02:00
Alexandre Bodin
0925758742 Use static envs for email and upload settings until we remove it completely in future PRs 
Signed-off-by: Alexandre Bodin <bodin.alex@gmail.com>
 2020-04-29 11:06:40 +02:00
Alexandre Bodin
d7327d4395 remove overwritting env var witohut passing by the config 
Signed-off-by: Alexandre Bodin <bodin.alex@gmail.com>
 2020-04-29 11:06:39 +02:00
Alexandre Bodin
1cb92daa77 Normalize usage of strapi.config.get 
Signed-off-by: Alexandre Bodin <bodin.alex@gmail.com>
 2020-04-29 11:06:39 +02:00
Alexandre Bodin
3cf3570afb Clear out useless code 
Signed-off-by: Alexandre Bodin <bodin.alex@gmail.com>
 2020-04-29 11:06:39 +02:00
Alexandre Bodin
8fabd55568 Make generated config as minimalist as possible 
Signed-off-by: Alexandre Bodin <bodin.alex@gmail.com>
 2020-04-29 11:06:38 +02:00
Alexandre Bodin
546ca97748 Change CLI config loading 
Signed-off-by: Alexandre Bodin <bodin.alex@gmail.com>
 2020-04-29 11:06:38 +02:00
Alexandre Bodin
096f4b0df5 Update conf and add walk utility 
Signed-off-by: Alexandre Bodin <bodin.alex@gmail.com>
 2020-04-29 11:06:37 +02:00
Alexandre Bodin
960315c066 load functions 
Signed-off-by: Alexandre Bodin <bodin.alex@gmail.com>
 2020-04-29 11:06:37 +02:00
Alexandre Bodin
9e34029878 Overwritte plugin config with user config 
Signed-off-by: Alexandre Bodin <bodin.alex@gmail.com>
 2020-04-29 11:06:37 +02:00
Alexandre Bodin
3745c7f0d0 Update project generator 
Signed-off-by: Alexandre Bodin <bodin.alex@gmail.com>
 2020-04-29 11:06:36 +02:00
Alexandre Bodin
954d838dfb Cleanup config load 
Signed-off-by: Alexandre Bodin <bodin.alex@gmail.com>
 2020-04-29 11:06:36 +02:00
Alexandre Bodin
5595f6ca94 Add policy loader 
Signed-off-by: Alexandre Bodin <bodin.alex@gmail.com>
 2020-04-29 11:06:36 +02:00
Alexandre Bodin
ed616333b2 Init new configuration management 
Signed-off-by: Alexandre Bodin <bodin.alex@gmail.com>
 2020-04-29 11:06:35 +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
Alexandre Bodin
45f1a1ffbe Remove idAttribute and idAttributeType options because breaks strapi 
Signed-off-by: Alexandre Bodin <bodin.alex@gmail.com>
 2020-04-28 15:44:05 +02:00
Ky
490d565c07 use theme for fontweight 
Signed-off-by: Ky <virginie.ky@gmail.com>
 2020-04-28 15:31:43 +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 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
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
Ky
d3a94ecfd2 update snapshots 
Signed-off-by: Ky <virginie.ky@gmail.com>
 2020-04-27 17:46:57 +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
Ky
01c1b9f8e2 update buffetjs dependencies 
Signed-off-by: Ky <virginie.ky@gmail.com>
 2020-04-27 16:03:15 +02:00
Ky
0c1105a51a Merge branch 'develop' of github.com:strapi/strapi into front/ui-improvements 2020-04-27 15:50:05 +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
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
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