Commit Graph

Select branches

Hide Pull Requests

develop

master

tangbo_branch

taojunyu_branch

#1

#10

#11

#12

#13

#14

#15

#16

#17

#18

#19

#2

#20

#21

#22

#23

#24

#25

#26

#27

#28

#29

#3

#30

#31

#32

#33

#34

#35

#36

#37

#38

#39

#4

#40

#41

#42

#43

#44

#45

#46

#47

#48

#5

#6

#7

#8

#9

Mono Color

• a176792dd8 完善ppt与表格 master tb202302116011 2026-02-05 19:01:27 +0800
• d48627ee1e 完善ppt 陶俊宇 2026-02-05 08:02:40 +0800
• aa3ba46743 上传实践考评文件 陶俊宇 2026-02-05 02:02:01 +0800
• 64fc5ff5e2 修改表格名字 陶俊宇 2026-02-04 19:53:51 +0800
• 4cf3e805af 文档内容修改 陶俊宇 2026-02-04 19:49:12 +0800
• 2e406afabb 修改部分内容 tb202302116011 2026-01-31 20:40:49 +0800
• 792550789b 修改部分内容 tb202302116011 2026-01-31 19:46:26 +0800
• 000f3a0c37 完成小米便签泛读、标注和维护报告文档 tb202302116011 2026-01-28 17:06:06 +0800
• dad464aab4 Merge pull request '完善拍照插入图片功能' (#48) from taojunyu_branch into master p3f2h9ljk 2026-01-28 11:49:40 +0800
• 1febbc1a64 完善拍照插入图片打不开相机的bug #48 taojunyu_branch 陶俊宇 2026-01-28 11:42:43 +0800
• f50b19f4aa Merge remote-tracking branch 'remotes/origin/taojunyu_branch' 本地解决taojunyu_branch合并到master的合并冲突并提交 # Conflicts: # src/main/java/net/micode/notes/ui/NoteEditActivity.java # src/main/java/net/micode/notes/ui/NoteEditText.java # src/main/res/menu/note_edit.xml # src/main/res/values/strings.xml 陶俊宇 2026-01-27 12:52:25 +0800
• 0b89941200 尝试解决冲突 #47 陶俊宇 2026-01-27 11:59:17 +0800
• 9fcf798f8a 解决冲突 陶俊宇 2026-01-27 11:58:06 +0800
• 76b36afc94 增加图片出入和删除的逻辑 陶俊宇 2026-01-27 11:49:25 +0800
• 6e8f5f0ea0 Merge pull request '新增字符统计功能' (#46) from tangbo_branch into master p7fulywfa 2026-01-27 09:01:21 +0800
• 7319daf75b 新增字符统计功能 #46 tangbo_branch tb202302116011 2026-01-27 08:58:58 +0800
• 6b83502b12 删除解决冲突时git添加的无法让编译通过的语句： <<<<<<< HEAD ======= >>>>>>> taojunyu_branch 陶俊宇 2026-01-27 00:58:34 +0800
• 236a22e8fe 同步master #45 陶俊宇 2026-01-27 00:54:56 +0800
• 7d1be7e53f Squashed commit of the following: 陶俊宇 2026-01-27 00:36:31 +0800
• fffe5ba193 修复密码锁安全漏洞 #44 陶俊宇 2026-01-27 00:18:46 +0800
• c7360e4342 Merge pull request '修复了search时无法正确显示文本内容的bug' (#43) from tangbo_branch into master p7fulywfa 2026-01-27 00:12:14 +0800
• b956dee8ab 修改search时无法正确显示文本内容的bug #43 tb202302116011 2026-01-27 00:11:13 +0800
• 40db3899df 复原版本失败，一直存在合并冲突，无法回溯到之前的版本，现在直接提交先前合并成功的版本，该版本是通过tangbo_branch成功合并到master的结果 tb202302116011 2026-01-26 17:38:23 +0800
• 0b3e4a0c08 清空master tb202302116011 2026-01-26 17:35:39 +0800
• a9135868c9 尝试复原到正确的版本 tb202302116011 2026-01-26 17:28:58 +0800
• 0415436b6b 尝试复原版本 tb202302116011 2026-01-26 17:27:57 +0800
• 035b653dae 复原之前的版本 tb202302116011 2026-01-26 17:26:16 +0800
• e7130c7ecf 尝试解决合并冲突 tb202302116011 2026-01-26 17:24:53 +0800
• 04f1838ad7 尝试复原为更早的版本 tb202302116011 2026-01-26 17:21:14 +0800
• 695cde0c2a 复原之前的版本 tb202302116011 2026-01-26 17:19:59 +0800
• 28562b015f 复原doc文件夹 tb202302116011 2026-01-26 17:07:58 +0800
• bb73a8c90a Merge pull request '尝试解决合并冲突，修复因合并冲突产生的bug' (#42) from tangbo_branch into master p7fulywfa 2026-01-26 17:06:46 +0800
• 53563dd540 尝试修复合并冲突，重新上传先前的版本 tb202302116011 2026-01-26 17:05:54 +0800
• eb4b577912 Merge pull request '测试' (#40) from tangbo_branch into develop #41 develop p7fulywfa 2026-01-26 17:01:20 +0800
• 29e939b0fa 修复合并冲突，修复因合并而产生的bug #42 #40 #39 #38 #37 tb202302116011 2026-01-26 16:51:45 +0800
• 3cc68c96a9 修复合并冲突 tb202302116011 2026-01-26 16:50:02 +0800
• ab42f90484 解决合并冲突 tb202302116011 2026-01-26 16:44:32 +0800
• a8bdfa0004 修复合并代码产生的bug #36 #35 #34 tb202302116011 2026-01-26 16:31:31 +0800
• e253e826d8 Merge pull request '增加便签模板功能' (#32) from tangbo_branch into master #33 p3f2h9ljk 2026-01-26 15:44:28 +0800
• 27657b263c 补充缺少的文档 #32 tb202302116011 2026-01-26 15:43:40 +0800
• 9fb7aaabec 解决合并冲突 #30 tb202302116011 2026-01-26 15:33:54 +0800
• 048b9271f3 修复合并冲突 tb202302116011 2026-01-26 15:32:01 +0800
• a5fa58e621 修复合并冲突 tb202302116011 2026-01-26 15:27:45 +0800
• c424fd7095 修复合并冲突 #26 tb202302116011 2026-01-26 15:20:38 +0800
• 63901af350 修复合并错误 tb202302116011 2026-01-26 15:17:44 +0800
• bdb0d92d7c Merge pull request '测试有没有合并冲突' (#24) from taojunyu_branch into master #31 #29 #28 #27 #25 p3f2h9ljk 2026-01-26 15:13:24 +0800
• 62df2add6e 重传 #24 陶俊宇 2026-01-26 15:12:38 +0800
• 026dee7711 清空 陶俊宇 2026-01-26 15:11:57 +0800
• 0df7b98ad4 重传 陶俊宇 2026-01-26 15:10:03 +0800
• b8ffc7d30a 清空 陶俊宇 2026-01-26 15:09:20 +0800
• 66fa79abe2 修改 陶俊宇 2026-01-26 15:03:18 +0800
• 436a9d32f5 Merge pull request '增加回收站功能' (#23) from taojunyu_branch into master p3f2h9ljk 2026-01-26 14:56:54 +0800
• 0411508bf3 清空重传 陶俊宇 2026-01-26 14:55:41 +0800
• 4f078b40cd 解决合并冲突问题 陶俊宇 2026-01-26 14:43:44 +0800
• d88918c6ec 补传之前未上传的文件 #23 #22 陶俊宇 2026-01-26 14:36:35 +0800
• 672abc00e6 Merge pull request '新增了便签模板的功能' (#21) from tangbo_branch into master p7fulywfa 2026-01-22 15:35:22 +0800
• 53adea2949 新增了便签模板的功能 #21 tb202302116011 2026-01-22 15:33:50 +0800
• 39c703c6e5 Merge pull request '实现回收站和修复搜索功能' (#20) from taojunyu_branch into master p3f2h9ljk 2026-01-21 21:20:53 +0800
• 4f90f1643d 实现回收站 #20 陶俊宇 2026-01-21 21:19:22 +0800
• 0f51cc05e6 taojunyu_branch合并错误，重新上传代码备份 陶俊宇 2026-01-21 20:21:24 +0800
• c936ba456d Merge pull request '重新合并，上传误删代码' (#19) from taojunyu_branch into master p3f2h9ljk 2026-01-21 20:09:27 +0800
• 4ade8df1f4 上传代码备份 #19 陶俊宇 2026-01-21 20:07:37 +0800
• a6fec72005 Merge pull request '新增回收站功能' (#18) from taojunyu_branch into master p3f2h9ljk 2026-01-21 19:49:07 +0800
• 78adb84048 添加最近删除功能 #18 陶俊宇 2026-01-21 19:46:58 +0800
• 7a9a171034 Merge pull request '新增了自动删除空白便签的功能' (#17) from tangbo_branch into master p7fulywfa 2026-01-21 14:42:29 +0800
• ea4ebf9efc 新增了自动删除空白便签的功能 #17 tb202302116011 2026-01-21 14:41:10 +0800
• 960eb0b233 Merge pull request '新增富文本编辑功能' (#16) from tangbo_branch into master p7fulywfa 2026-01-20 15:53:56 +0800
• 0612081c31 新增了富文本编辑功能 #16 tb202302116011 2026-01-20 15:50:18 +0800
• 4bd28062bf Merge pull request ' 修复小米便签底部系统栏只显示一半的问题' (#15) from taojunyu_branch into master p3f2h9ljk 2026-01-19 20:16:41 +0800
• 3facc601a2 修复了小米便签主界面底部系统栏显示不全的问题 #15 陶俊宇 2026-01-19 20:15:44 +0800
• 4426200dfd Merge pull request '新增了文件夹嵌套的功能' (#14) from tangbo_branch into master p7fulywfa 2026-01-19 10:16:39 +0800
• 07df63aaf5 新增了文件夹嵌套的功能 #14 tb202302116011 2026-01-19 10:11:55 +0800
• 0f676498c5 Merge pull request '新增为便签加密功能' (#13) from taojunyu_branch into master p3f2h9ljk 2026-01-18 19:53:12 +0800
• b3d7c1a32c 新增了为便签加密的功能 #13 陶俊宇 2026-01-18 19:53:28 +0800
• c26bb0d60b Merge pull request '解决了在文件夹中点击back键会直接退出小米便签的bug' (#12) from tangbo_branch into master p7fulywfa 2026-01-18 15:27:51 +0800
• ca8c2205e0 解决了在文件夹中点击back键会直接整个退出小米便签的bug #12 tb202302116011 2026-01-18 15:26:09 +0800
• c42e585e08 Merge pull request '撤销了部分错误修改' (#11) from taojunyu_branch into master p3f2h9ljk 2026-01-18 12:07:31 +0800
• a5a619b01c UI遮挡问题的补充修改 #11 陶俊宇 2026-01-18 12:02:41 +0800
• 9e72eb81c6 Merge pull request '修复小米便签主界面底部写便签按钮被白色ui框遮挡的问题' (#10) from taojunyu_branch into master p3f2h9ljk 2026-01-16 19:05:43 +0800
• 97c874815f 修复了小米便签主界面底部写便签按钮被系统UI遮挡的问题 #10 陶俊宇 2026-01-16 18:18:40 +0800
• 2e58c25abf 文档修改 陶俊宇 2026-01-07 15:46:40 +0800
• d03c1fe5df 修改质量分析报告 tb202302116011 2026-01-07 10:40:50 +0800
• e3a1d27cf6 提交小米便签的质量分析报告文档 陶俊宇 2026-01-07 01:57:40 +0800
• ec8b0436ef 文档修改 陶俊宇 2025-12-24 18:31:12 +0800
• 5221b2434d Merge pull request '合并代码注释，添加了data、gtask、tool三个包的注释' (#9) from tangbo_branch into master p7fulywfa 2025-12-23 19:39:28 +0800
• d4e00e4310 添加了data、gtask、tool三个包的注释 #9 tb202302116011 2025-12-23 19:38:35 +0800
• b238f2a6af Merge pull request '把master分支中的src文件夹复制进tangbo_branch分支' (#8) from master into tangbo_branch p7fulywfa 2025-12-23 19:35:53 +0800
• a9eebbb6d5 尝试解决合并冲突，把tangbo_branch中自己新建的src文件夹删除 tb202302116011 2025-12-23 19:32:18 +0800
• c2fc4cb5d9 由于合并冲突，尝试把word变成相同的再合并 #6 #5 tb202302116011 2025-12-23 19:11:30 +0800
• ba8a8bc944 添加了tangbo_branch中缺少的src文件夹，并添加了data、gtask、tool包中的注释 #4 tb202302116011 2025-12-23 19:03:10 +0800
• a2fc85ff74 添加了报告的代码标注部分 #8 #7 陶俊宇 2025-12-23 18:38:12 +0800
• de42c9b4a4 删除不规范的报告 陶俊宇 2025-12-23 18:36:51 +0800
• ea7bfb9ab0 Merge branch 'master' of https://bdgit.educoder.net/p3f2h9ljk/git-test 陶俊宇 2025-12-23 15:45:39 +0800
• 9f8ae5b462 Merge pull request '为ui包、model包、widget包以及MainActivity.java添加代码注释' (#3) from taojunyu_branch into master p3f2h9ljk 2025-12-23 15:44:51 +0800
• 688ac9a381 为ui包、model包、widget包以及MainActivity.java添加代码注释 陶俊宇 2025-12-23 15:42:54 +0800
• 9848db5355 为ui包、model包、widget包以及MainActivity添加了代码注释 #3 陶俊宇 2025-12-23 15:38:36 +0800
• 54bd5dece9 修改 tb202302116011 2025-12-04 08:03:08 +0800
• d8019ab454 稍微修改 tb202302116011 2025-12-03 23:13:52 +0800
• ba4363ade1 删除旧报告，上传新报告 陶俊宇 2025-12-03 23:04:39 +0800
• 7fcf3e2d17 修改 tb202302116011 2025-11-29 21:21:29 +0800