1088 Commits

Author SHA1 Message Date
openharmony_ci b93eba7255 !47 【CI看板】ID为CVE-2023-50471和CVE-2023-50472的漏洞处理
Merge pull request !47 from 刘波/master
weekly_20240115-v master-v OpenHarmony-v4.1.1-Release OpenHarmony-v4.1-Release
2023-12-29 02:44:37 +00:00
liubo 8c2fdf2ac6 Description: 漏洞处理
IssueNo:https://gitee.com/openharmony/third_party_cJSON/issues/I8S4Y8
Feature or Bugfix: Bugfix
Binary Source:No
Signed-off-by: liubo419 <liubo419@huawei.com>
2023-12-28 17:40:30 +08:00
openharmony_ci 1cb3f15297 !46 cJSON三方库升级1.7.16
Merge pull request !46 from wyk99/master
OpenHarmony-v4.1-Beta1
2023-11-27 09:09:31 +00:00
w00845693 f1c9937639 Description: updata user guide
IssueNo: https://gitee.com/openharmony/third_party_cJSON/issues/I8JGFE
Feature or Bugfix: Feature
Binary Source:No
Signed-off-by: wyk99 <wangyuekai1@huawei.com>
2023-11-27 09:46:09 +08:00
openharmony_ci d9f215c92a !44 部件名整改
Merge pull request !44 from 张兴泰/master
OpenHarmony-v4.0-Release OpenHarmony-v4.0-Beta2
2023-06-30 06:03:49 +00:00
xing-tai-zhang b13dc1f4ac Description: Correct the part name to the cJSON defined by SPLE
IssueNo: https://gitee.com/openharmony/third_party_cJSON/issues/I6V448
Feature or Bugfix: Bugfix
Binary Source:NO
Signed-off-by: xing-tai-zhang <zhangxingtai@huawei.com>
2023-06-08 14:52:15 +08:00
openharmony_ci e97241a1bb !43 feat: 添加innerapi_tag
Merge pull request !43 from cheng_jinsong/fly0516
2023-06-02 07:10:56 +00:00
chengjinsong2 212690a971 add innertag on third_party_cJSON
Signed-off-by: chengjinsong2 <chengjinsong2@huawei.com>
2023-05-17 15:09:28 +08:00
openharmony_ci 9a8dced360 !42 回退 'Pull Request !41 : 部件名整改,将部件名整改为SPLE定义的cJSON'
Merge pull request !42 from openharmony_ci/revert-merge-41-master
OpenHarmony-v4.0-Beta1
2023-03-31 09:31:18 +00:00
openharmony_ci df36837f1d 回退 'Pull Request !41 : 部件名整改,将部件名整改为SPLE定义的cJSON' 2023-03-31 09:30:55 +00:00
openharmony_ci eca276f1c4 !41 部件名整改,将部件名整改为SPLE定义的cJSON
Merge pull request !41 from 张兴泰/master
2023-03-31 09:07:50 +00:00
xing-tai-zhang fa5c00d462 Description: Correct the part name to the cJSON defined by SPLE
IssueNo: https://gitee.com/openharmony/third_party_cJSON/issues/I6NEOH
Feature or Bugfix: Bugfix
Binary Source:NO
Signed-off-by: xing-tai-zhang <zhangxingtai@huawei.com>
2023-03-29 16:24:00 +08:00
openharmony_ci abca1971ca !39 修复未定义board_chaintool_type导致编译报错
Merge pull request !39 from suwenxiang/master
OpenHarmony-v3.2-Beta5 OpenHarmony-v3.2.4-Release OpenHarmony-v3.2.3-Release OpenHarmony-v3.2.2-Release OpenHarmony-v3.2.1-Release OpenHarmony-v3.2-Beta3 OpenHarmony-v3.2-Release OpenHarmony-v3.2-Beta4
2022-09-13 06:29:00 +00:00
suwenxiang 25b9d765ca Description: Fix undefined board_chaintool_type resulting in compilation error
IssueNo: https://gitee.com/openharmony/third_party_cJSON/issues/I5ODQ6
Feature or Bugfix: Bugfix
Binary Source: No
Signed-off-by: suwenxiang <suwenxiang@huawei.com>
2022-09-09 17:36:32 +08:00
openharmony_ci 6d3d387e93 !35 控制解析层数,防止cJSON库递归解析爆栈风险
Merge pull request !35 from piggyguy_jdx/master
2022-08-18 12:35:15 +00:00
jiadexiang 076c7bae42 Description: add CJSON_NESTING_LIMIT as 128 for stack overflow issue
IssueNo:I5IBWV
Feature or Bugfix: Feature
Binary Source:No

Signed-off-by: jiadexiang <jiadexiang@huawei.com>
2022-08-15 14:45:17 +08:00
openharmony_ci 8719ea3b6b !33 modify samgr part-name
Merge pull request !33 from huangxiaolinabc123/730
2022-08-06 04:21:51 +00:00
openharmony_ci efe0c0f36b !32 解决 iccarm + gn 文件编译问题
Merge pull request !32 from suwenxiang/master
2022-07-30 08:39:42 +00:00
huangxiaolinabc123 b8a1fbce1d modify samgr
Signed-off-by: huangxiaolinabc123 <huangxiaolin12@huawei.com>
Change-Id: Ida26129fe96f79d74996e6f22f6508ba4442dfb8
2022-07-30 15:25:13 +08:00
suwenxiang 7288dc52ef Description: Mini platform GN + iccarm compile and build
IssueNo: https://gitee.com/openharmony/arkui_ace_engine_lite/issues/I5JLZ7
Feature or Bugfix: Feature
Binary Source: No
Signed-off-by: suwenxiang <suwenxiang@huawei.com>
2022-07-29 16:02:26 +08:00
openharmony_ci d5ab6078ce !30 FIX: 安装CJSON动态库
Merge pull request !30 from Mupceet/master
OpenHarmony-v3.2-Beta2
2022-07-06 09:39:41 +00:00
laiguizhong deb59ca852 安装CJSON动态库
Signed-off-by: laiguizhong <laiguizhong@huawei.com>
2022-07-06 15:09:48 +08:00
openharmony_ci f84d0d08d0 !29 三方开源软件部件名称使用原始名称,统一归属到thirdparty子系统
Merge pull request !29 from peitaiyi/master
2022-07-04 08:43:56 +00:00
taiyi.pei 46c4ed79b8 correct part and subsystem name
Signed-off-by: taiyi.pei <peitaiyi@huawei.com>
2022-07-04 15:29:17 +08:00
openharmony_ci 737e854cb6 !27 update version to v1.7.15
Merge pull request !27 from piggyguy_jdx/update-cjson-version
2022-06-16 02:22:12 +00:00
jiadexiang 6b94bd0906 Description: update version to v1.7.15
IssueNo:I5CE1Z
Feature or Bugfix: Feature
Binary Source:No

Signed-off-by: jiadexiang <jiadexiang@huawei.com>
2022-06-15 15:04:36 +08:00
openharmony_ci 7d2f0c5442 !26 更新README.OpenSource中的owner邮箱
Merge pull request !26 from liuyuxiang_bear/master
OpenHarmony-v3.2-Beta1
2022-03-15 11:31:27 +00:00
liuyuxiang-bear 6a713d3da1 Description: update owner's mailbox
IssueNo: https://gitee.com/openharmony/third_party_cJSON/issues/I4XTRL
Feature or Bugfix: Bugfix
Binary Source:No
Signed-off-by: liuyuxiang <liuyuxiang7@huawei.com>
2022-03-15 10:03:27 +08:00
openharmony_ci 57a34c3083 !23 feat: add bundle.json
Merge pull request !23 from pjscc/master
OpenHarmony-v3.1.1-Release OpenHarmony-v3.1.2-Release OpenHarmony-v3.1-Release
2022-01-20 06:44:14 +00:00
pjscc b7b515fb54 add bundle.json
Signed-off-by: pjscc <pangjiashuai@huawei.com>
2022-01-19 19:18:31 +08:00
openharmony_ci 377d3196aa !3 Add issue and PR template for master
Merge pull request !3 from mamingshuai/add_issus_pr_template_for_master
OpenHarmony-v3.1-Beta
2021-09-28 13:59:19 +00:00
openharmony_ci 219b6f4f59 !19 fix binary OAT issue
Merge pull request !19 from piggyguy_jdx/master
2021-09-28 13:57:54 +00:00
jiadexiang 6161efbdd7 Description: fix oat issue
IssueNo:I44MMZ
Feature or Bugfix: Feature
Binary Source:No

Signed-off-by: jiadexiang <jiadexiang@huawei.com>
2021-09-28 21:52:00 +08:00
openharmony_ci 2a91f7b579 !17 修复 OAT 问题
Merge pull request !17 from piggyguy_jdx/OAT_Process
OpenHarmony-v3.0-Beta1
2021-08-09 14:16:22 +00:00
openharmony_ci 683bf4393d !17 修复 OAT 问题
Merge pull request !17 from piggyguy_jdx/OAT_Process
2021-08-09 14:16:22 +00:00
jiadexiang cfaa0a85c2 Description: fix OAT by updating BUILD.gn
IssueNo:I44MMZ
Feature or Bugfix: Feature
Binary Source:No

Signed-off-by: jiadexiang <jiadexiang@huawei.com>
2021-08-09 21:15:36 +08:00
openharmony_ci 6d9e1b7a9f !15 【轻量级 PR】:update BUILD.gn.
Merge pull request !15 from songcy-hw/N/A
OpenHarmony-v2.2-Beta2 OpenHarmony-2.0-Canary
2021-05-20 11:38:27 +08:00
songcy-hw 5f45612194 update BUILD.gn. 2021-05-19 14:54:18 +08:00
openharmony_ci 6853af4a98 !12 sync diff with L2
Merge pull request !12 from songcy-hw/master
2021-05-18 16:51:18 +08:00
scyhssm 2b7f3470b1 sync diff with L2 2021-05-18 11:44:18 +08:00
openharmony_ci 0fa6908575 !5 回退BUILD.gn修改
Merge pull request !5 from borne/fix_#I3EGR4
2021-04-12 16:14:15 +08:00
borne b521bf9dd7 IssueNo:#I3EGR4
Description:Revert the release1.0.1 gn modify, branch use the
build/lite/config/component/cJSON/BUILD.gn instead
Feature or Bugfix:Bugfix
Binary Source:No
2021-04-10 18:24:14 +08:00
mamingshuai 191c0aceaa add issue and pr template 2021-04-07 14:59:58 +08:00
mamingshuai 8256a0a332 update openharmony 1.0.1 OpenHarmony_release_v1.1.0 2021-03-11 20:34:23 +08:00
openharmony_ci 32774fc2ca !2 [Lightweight PR]: 支持独立编译
Merge pull request !2 from dianhades/N/A
2020-10-22 19:50:40 +08:00
dianhades 4da1846062 支持独立编译 2020-10-22 11:25:36 +08:00
wenjun 03bfdbbcdf add OpenHarmony 1.0 baseline OpenHarmony-1.0 2020-09-09 09:26:41 +08:00
l00495960 040cc2d4e2 TicketNo:DTS2020082507KYRVP0H00
Description: README: change 1.7.11 -> 1.7.13

Team:PDU_DRV
Feature or Bugfix:Bugfix
Binary Source:No
PrivateCode(Yes/No):No

Change-Id: Ia083f565917697760776c5105dc2bb3864472e64
Reviewed-on: http://mgit-tm.rnd.huawei.com/10435079
Tested-by: public jenkins <public_jenkins@notesmail.huawei.com>
Reviewed-by: wangxing 00438353 <raymond.wangxing@huawei.com>
2020-08-25 14:55:00 +08:00
w00438353 1cdab97f0d Modify namespace to ohos form harmonyos
Change-Id: Ia29013889dd9f784266e06998eb6c61bb37441cc
2020-08-21 19:46:59 +08:00
s00445842 2a536714e8 TicketNo:DTS2020080402804
Description:add copyright
Team:OTHERS
Feature or Bugfix:Bugfix
Binary Source:NA
PrivateCode(Yes/No):No

Change-Id: I16601ec5cc9ce643ad13902f9fe9b74de524eae6
Reviewed-on: http://mgit-tm.rnd.huawei.com/10061919
Tested-by: public jenkins <public_jenkins@notesmail.huawei.com>
Reviewed-by: gongjunsong 00284668 <gongjunsong@huawei.com>
2020-08-04 19:46:19 +08:00