-
Notifications
You must be signed in to change notification settings - Fork 88
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #356 from jeffshuai/release/eagle
feat: base master merge into release/eagle
- Loading branch information
Showing
219 changed files
with
5,690 additions
and
1,767 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file was deleted.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,43 @@ | ||
| test_build: | ||
| steps: | ||
| - link_package: | ||
| source_project: deepin:Develop:dde | ||
| source_package: %{SCM_REPOSITORY_NAME} | ||
| target_project: deepin:CI | ||
|
|
||
| - configure_repositories: | ||
| project: deepin:CI | ||
| repositories: | ||
| - name: deepin_develop | ||
| paths: | ||
| - target_project: deepin:CI | ||
| target_repository: deepin_develop | ||
| architectures: | ||
| - x86_64 | ||
| - aarch64 | ||
|
|
||
| - name: debian | ||
| paths: | ||
| - target_project: deepin:CI | ||
| target_repository: debian_sid | ||
| architectures: | ||
| - x86_64 | ||
|
|
||
| filters: | ||
| event: pull_request | ||
|
|
||
| tag_build: | ||
| steps: | ||
| - trigger_services: | ||
| project: deepin:Unstable:dde | ||
| package: %{SCM_REPOSITORY_NAME} | ||
| filters: | ||
| event: tag_push | ||
|
|
||
| commit_build: | ||
| steps: | ||
| - trigger_services: | ||
| project: deepin:Develop:dde | ||
| package: %{SCM_REPOSITORY_NAME} | ||
| filters: | ||
| event: push |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,2 +1,2 @@ | ||
| [transifex] | ||
| branch = m20 | ||
| branch = m20 |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,19 @@ | ||
| { | ||
| "magic": "dsg.config.meta", | ||
| "version": "1.0", | ||
| "contents": { | ||
| "log_rules": { | ||
| "value": "*.debug=false;*.info=false;*.warning=true", | ||
| "serial": 0, | ||
| "flags": [ | ||
| "global" | ||
| ], | ||
| "name": "log rules", | ||
| "name[zh_CN]": "日志规则", | ||
| "description": "log rules", | ||
| "description[zh_CN]": "日志规则", | ||
| "permissions": "readwrite", | ||
| "visibility": "public" | ||
| } | ||
| } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,19 @@ | ||
| { | ||
| "magic": "dsg.config.meta", | ||
| "version": "1.0", | ||
| "contents": { | ||
| "log_rules": { | ||
| "value": "*.debug=false;*.info=false;*.warning=true", | ||
| "serial": 0, | ||
| "flags": [ | ||
| "global" | ||
| ], | ||
| "name": "log rules", | ||
| "name[zh_CN]": "日志规则", | ||
| "description": "log rules", | ||
| "description[zh_CN]": "日志规则", | ||
| "permissions": "readwrite", | ||
| "visibility": "public" | ||
| } | ||
| } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,19 @@ | ||
| { | ||
| "magic": "dsg.config.meta", | ||
| "version": "1.0", | ||
| "contents": { | ||
| "log_rules": { | ||
| "value": "*.debug=false;*.info=false;*.warning=true", | ||
| "serial": 0, | ||
| "flags": [ | ||
| "global" | ||
| ], | ||
| "name": "log rules", | ||
| "name[zh_CN]": "日志规则", | ||
| "description": "log rules", | ||
| "description[zh_CN]": "日志规则", | ||
| "permissions": "readwrite", | ||
| "visibility": "public" | ||
| } | ||
| } | ||
| } |
19 changes: 19 additions & 0 deletions
19
assets/configs/org.deepin.system-monitor.plugin.popup.json
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,19 @@ | ||
| { | ||
| "magic": "dsg.config.meta", | ||
| "version": "1.0", | ||
| "contents": { | ||
| "log_rules": { | ||
| "value": "*.debug=false;*.info=false;*.warning=true", | ||
| "serial": 0, | ||
| "flags": [ | ||
| "global" | ||
| ], | ||
| "name": "log rules", | ||
| "name[zh_CN]": "日志规则", | ||
| "description": "log rules", | ||
| "description[zh_CN]": "日志规则", | ||
| "permissions": "readwrite", | ||
| "visibility": "public" | ||
| } | ||
| } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,19 @@ | ||
| { | ||
| "magic": "dsg.config.meta", | ||
| "version": "1.0", | ||
| "contents": { | ||
| "log_rules": { | ||
| "value": "*.debug=false;*.info=false;*.warning=true", | ||
| "serial": 0, | ||
| "flags": [ | ||
| "global" | ||
| ], | ||
| "name": "log rules", | ||
| "name[zh_CN]": "日志规则", | ||
| "description": "log rules", | ||
| "description[zh_CN]": "日志规则", | ||
| "permissions": "readwrite", | ||
| "visibility": "public" | ||
| } | ||
| } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,29 @@ | ||
| { | ||
| "name": "deepin-system-monitor", | ||
| "group": "", | ||
| "submodules": [ | ||
| { | ||
| "name": "deepin-system-monitor", | ||
| "filter": "", | ||
| "exec": "/usr/bin/deepin-system-monitor", | ||
| "logType": "journal", | ||
| "logPath": "" | ||
| }, | ||
| { | ||
| "name": "deepin-system-monitor-plugin-popup", | ||
| "filter": "", | ||
| "exec": "/usr/bin/deepin-system-monitor-plugin-popup", | ||
| "logType": "journal", | ||
| "logPath": "" | ||
| }, | ||
| { | ||
| "name": "deepin-system-monitor-server", | ||
| "filter": "", | ||
| "exec": "/usr/bin/deepin-system-monitor-server", | ||
| "logType": "journal", | ||
| "logPath": "" | ||
| } | ||
| ], | ||
| "visible": true, | ||
| "version": "V1.0" | ||
| } |
Oops, something went wrong.