Commit Graph

292 Commits

Author SHA1 Message Date
caodg 46ee6b362d Merge pull request 'add publication, and 2023 news' (#52) from caodg/xuos-web:develop into master 2023-05-28 08:57:55 +08:00
Donggang Cao 80b00d93c7 add publication, and 2023 news 2023-05-28 08:54:42 +08:00
caodg 5ad479156d Merge pull request 'change trustie to gitlink in webdoc' (#51) from caodg/xuos-web:develop into master 2022-03-20 07:24:12 +08:00
Donggang Cao fd4dd39c29 change trustie to gitlink in webdoc 2022-03-20 07:22:23 +08:00
caodg f7c2609028 Merge pull request 'change repo addr to gitlink in webdoc' (#50) from caodg/xuos-web:develop into master 2022-03-20 07:18:19 +08:00
Donggang Cao c655c65413 change repo addr to gitlink in webdoc 2022-03-20 07:15:38 +08:00
caodg 3e6ad525e1 Merge pull request '新增梅老师最新UOS文章及更新gitlink链接' (#49) from caodg/xuos-web:develop into master 2022-01-29 18:54:38 +08:00
Donggang Cao 0c4a83710c udpate repo link to gitlink 2022-01-29 18:47:43 +08:00
Donggang Cao 450d338782 add cas bulletin paper of uos 2022-01-29 18:39:12 +08:00
caodg 48be7162f5 Merge pull request 'update cncc link' (#48) from caodg/xuos-web:develop into master 2021-12-30 21:20:24 +08:00
Donggang Cao df09129600 update cncc chinasoft link 2021-12-30 21:16:56 +08:00
caodg dd897a2820 Merge pull request 'add 2021 cncc and chinasoft reports' (#47) from caodg/xuos-web:develop into master 2021-12-30 20:48:00 +08:00
Donggang Cao 65d92d64cc add 2021 cncc and chinasoft report 2021-12-30 20:41:49 +08:00
xuedongliang f7de7cc15d feat that define xiuos develop-branch as prepare_for_master
it is OK
2021-12-08 17:03:41 +08:00
Liu_Weichao 3879d865d3 feat that define xiuos develop-branch as prepare_for_master 2021-12-08 16:46:11 +08:00
caodg 7f3eda0815 Merge pull request '修复已失效工具下载链接并汇总在“下载”页面' (#44) from yangtuo250/xuos-web:fix_dl into master 2021-12-01 15:13:09 +08:00
yangtuo250 310cc48cee fix(STM32_ST-LINK_Utility): remove spaces from file name 2021-12-01 15:06:52 +08:00
TLBF 8e05932803 feat(download): add tools download links provided by xuos.io site 2021-12-01 14:13:20 +08:00
TLBF 4a3d7493d0 fix(appdev): fix download links of several tools 2021-12-01 13:52:27 +08:00
Liu_Kai c83dcfecbf 更新联框架文档描述 2021-11-25 12:30:10 +04:30
caodg 32a2e231da Merge pull request '修正文档中的一些词语、标点、空格的使用不当' (#41) from RobertYuan/xuos-web:master into master 2021-11-01 07:57:52 +08:00
RobertYuan 6b1c340bd0 docs(/docs/doc/framework/gan.md, lian.md, zhi.md, kong.md): repair some small misktakes on punctuation, blank space, or words 2021-09-26 20:43:32 +08:00
RobertYuan d812028b87 docs(/docs/kernel/int.md, mm.md, /docs/component/drvmodel.md, humancompter.md, lib.md): repair some small misktakes on punctuation, blank space, or words 2021-09-26 20:31:08 +08:00
RobertYuan d400f41593 docs(kernel/task.md): replace some inappropriate/duplicate words, delete some mistake letter and adjust some mistake blankets 2021-09-22 21:29:34 +08:00
RobertYuan ae2027a2be docs(intro.md): replace some inappropriate words and delete a mistake blank 2021-09-22 21:11:23 +08:00
caodg 868e1ec844 Merge pull request 'add SCIS paper; add joint lab with langchao news' (#39) from caodg/xuos-web:develop into master 2021-07-29 22:29:43 +08:00
Donggang Cao 788659343e add SCIS paper; add joint lab with langchao news 2021-07-29 22:25:11 +08:00
caodg 97616e4d53 Merge pull request 'update china hachton news and add cccf paper info' (#38) from caodg/xuos-web:develop into master 2021-06-30 06:49:34 +08:00
Donggang Cao de95cfab0c add hackthon news, add cccf paper 2021-06-30 06:45:24 +08:00
caodg aad375ac84 Merge pull request 'add fontawesome support, add newsevents page' (#37) from caodg/xuos-web:develop into master 2021-05-20 23:54:19 +08:00
Donggang Cao 8a0e0a9f2e add fontawesome support, add newsevents, tech pages 2021-05-20 23:50:36 +08:00
caodg 311d24d303 Merge pull request 'add activity of 4th china software opensource contest' (#36) from caodg/xuos-web:develop into master 2021-05-13 10:30:51 +08:00
Donggang Cao 1b778c3211 add 4th software opensource contest activity 2021-05-13 10:28:49 +08:00
caodg 77c2544eaa Merge pull request 'add news and tech page to resource menu' (#35) from caodg/xuos-web:develop into master 2021-05-11 22:09:02 +08:00
Donggang Cao e0e92703ea add content to resource dir 2021-05-11 22:06:57 +08:00
caodg 8c866e1f03 Merge pull request 'update license' (#34) from caodg/xuos-web:develop into master 2021-05-06 18:01:54 +08:00
Donggang Cao 876363e039 update license 2021-05-06 17:58:19 +08:00
leebaok 09ffe3b086 Merge pull request 'Modify the documentation of jlink-kd233 and stm32f407-discovery' (#32) from TangYiwen123/xuos-web:develop into master 2021-05-06 17:28:08 +08:00
TangYiwen123 85831caff2 update jlink-kd233 link 2021-05-06 17:25:45 +08:00
leebaok d3692142f1 Merge pull request '修改kd233入门文档' (#33) from TangYiwen123/xuos-web:kd233 into master 2021-05-06 17:17:30 +08:00
TangYiwen123 38ceee35b2 update stm32f407-discovery link 2021-05-06 17:02:40 +08:00
TangYiwen123 1f7ba9ea3f kd233 board link update 2021-05-06 16:54:22 +08:00
TangYiwen123 5a95eeac92 modify kd233.md 2021-05-06 15:39:35 +08:00
TangYiwen123 ac52082220 Merge branch 'master' of https://git.trustie.net/xuos/xuos-web into develop 2021-05-06 14:24:18 +08:00
TangYiwen123 6e5691f247 Modify the documentation of jlink-kd233 and f407 2021-05-06 14:23:09 +08:00
caodg 02566a1259 Merge pull request 'fix errors in webdoc' (#30) from caodg/xuos-web:develop into master 2021-05-01 12:22:30 +08:00
Donggang Cao 9195ebef1c update webdoc, make steps accurate 2021-05-01 12:20:27 +08:00
xuedongliang b1f29c161d Modify QEMU version from Zhan_Jiasheng
it is perfect
2021-04-30 20:49:28 +08:00
Zhao_Jiasheng 8300e04c8a Modify qemu version 2021-04-30 20:37:00 +08:00
xuedongliang a0f170b3cf modify kernel contents from Wang Weigen
it is OK
2021-04-30 18:56:25 +08:00