yujunjun/strapi
1
0
Fork 0
mirror of https://github.com/strapi/strapi.git synced 2025-08-08 08:46:42 +00:00
Code Issues Packages Projects Releases Wiki Activity
13,206 Commits 113 Branches 488 Tags
Commit Graph

13206 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Ky
ec71ed2c92 Merge branch 'develop' of github.com:strapi/strapi into front/ui-improvements 
Signed-off-by: Ky <virginie.ky@gmail.com>
 2020-04-29 15:45: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
Alexandre BODIN
a7436e2248
Merge pull request #5747 from strapi/chore/new-config 
Chore/new config
 2020-04-29 12:12:43 +02:00
Alexandre BODIN
6cc5fc55dc
Merge pull request #5988 from strapi/chore/remove-idAttribute-broken-option 
Remove idAttribute and idAttributeType options because breaks strapi
 2020-04-29 12:12:29 +02:00
Ky
c11cc6ab97 apply design review 
Signed-off-by: Ky <virginie.ky@gmail.com>
 2020-04-29 11:47:38 +02:00
soupette
b9bd8085d6 Fixes #5992 
Signed-off-by: soupette <cyril.lpz@gmail.com>
 2020-04-29 11:34:12 +02:00
Alexandre Bodin
55b977dc52 Review updates 
Signed-off-by: Alexandre Bodin <bodin.alex@gmail.com>
 2020-04-29 11:24:05 +02:00
Alexandre Bodin
2d80ced7f5 Revert chagnes made on alpha doc 
Signed-off-by: Alexandre Bodin <bodin.alex@gmail.com>
 2020-04-29 11:06:45 +02:00
Alexandre Bodin
dbda1cc254 Fix wrong behavior of env helper with defautl values 
Signed-off-by: Alexandre Bodin <bodin.alex@gmail.com>
 2020-04-29 11:06:44 +02:00
Alexandre Bodin
da910b0b39 Fix create new project cli option for mongo not handled correctly 
Signed-off-by: Alexandre Bodin <bodin.alex@gmail.com>

Fix typos

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

Add tests for env helpers

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

Typo

Signed-off-by: Alexandre Bodin <bodin.alex@gmail.com>
 2020-04-29 11:06:44 +02:00
Alexandre Bodin
789e29e2c5 Updated deployment doc 
Signed-off-by: Alexandre Bodin <bodin.alex@gmail.com>
 2020-04-29 11:06:43 +02:00
Alexandre Bodin
2e31afe6dd Upgrade doc to use env var and js config files 
Signed-off-by: Alexandre Bodin <bodin.alex@gmail.com>
 2020-04-29 11:06:43 +02:00
Alexandre Bodin
3d071f5869 Use static paths 
Signed-off-by: Alexandre Bodin <bodin.alex@gmail.com>
 2020-04-29 11:06:43 +02:00
Alexandre Bodin
0ed90fd2f1 Use default host and port 
Signed-off-by: Alexandre Bodin <bodin.alex@gmail.com>
 2020-04-29 11:06:42 +02:00
Alexandre Bodin
6ca740bd29 Fix env casting should return undefined if var is not defined 
Signed-off-by: Alexandre Bodin <bodin.alex@gmail.com>
 2020-04-29 11:06:42 +02:00
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
virginieky
a43386a6de
Merge branch 'develop' into front/media-lib-loader 2020-04-27 23:52:37 +02:00
Ky
8b1b68242a Media lib listView loadingBar and loadingIndicator 
Signed-off-by: Ky <virginie.ky@gmail.com>
 2020-04-27 23:48:43 +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
domenico ventura
3eb8e379be Improving IT translation by adding missing labels. Now IT translation aligned with EN ones 
Signed-off-by: domenico ventura <domenico@digitware.it>
 2020-04-27 17:23:46 +02:00