 tb202302116011
|
a176792dd8
|
完善ppt与表格
|
4 weeks ago |
 陶俊宇
|
d48627ee1e
|
完善ppt
|
1 month ago |
|
陶俊宇
|
aa3ba46743
|
上传实践考评文件
|
1 month ago |
|
陶俊宇
|
64fc5ff5e2
|
修改表格名字
|
1 month ago |
|
陶俊宇
|
4cf3e805af
|
文档内容修改
|
1 month ago |
|
tb202302116011
|
2e406afabb
|
修改部分内容
|
1 month ago |
|
tb202302116011
|
792550789b
|
修改部分内容
|
1 month ago |
|
tb202302116011
|
000f3a0c37
|
完成小米便签泛读、标注和维护报告文档
|
1 month ago |
|
p3f2h9ljk
|
dad464aab4
|
Merge pull request '完善拍照插入图片功能' (#48) from taojunyu_branch into master
|
1 month ago |
|
陶俊宇
|
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
|
1 month ago |
|
p7fulywfa
|
6e8f5f0ea0
|
Merge pull request '新增字符统计功能' (#46) from tangbo_branch into master
|
1 month ago |
|
tb202302116011
|
7319daf75b
|
新增字符统计功能
|
1 month ago |
|
陶俊宇
|
6b83502b12
|
删除解决冲突时git添加的无法让编译通过的语句：
<<<<<<< HEAD
=======
>>>>>>> taojunyu_branch
|
1 month ago |
|
陶俊宇
|
7d1be7e53f
|
Squashed commit of the following:
commit fffe5ba193
Author: 陶俊宇 <2643473564@qq.com>
Date: Tue Jan 27 00:18:46 2026 +0800
修复密码锁安全漏洞
# Conflicts:
# src/main/java/net/micode/notes/ui/NoteEditActivity.java
# src/main/res/menu/note_edit.xml
|
1 month ago |
|
p7fulywfa
|
c7360e4342
|
Merge pull request '修复了search时无法正确显示文本内容的bug' (#43) from tangbo_branch into master
|
1 month ago |
|
tb202302116011
|
b956dee8ab
|
修改search时无法正确显示文本内容的bug
|
1 month ago |
|
tb202302116011
|
40db3899df
|
复原版本失败，一直存在合并冲突，无法回溯到之前的版本，现在直接提交先前合并成功的版本，该版本是通过tangbo_branch成功合并到master的结果
|
1 month ago |
|
tb202302116011
|
0b3e4a0c08
|
清空master
|
1 month ago |
|
tb202302116011
|
a9135868c9
|
尝试复原到正确的版本
|
1 month ago |
|
tb202302116011
|
0415436b6b
|
尝试复原版本
|
1 month ago |
|
tb202302116011
|
035b653dae
|
复原之前的版本
|
1 month ago |
|
tb202302116011
|
e7130c7ecf
|
尝试解决合并冲突
|
1 month ago |
|
tb202302116011
|
04f1838ad7
|
尝试复原为更早的版本
|
1 month ago |
|
tb202302116011
|
695cde0c2a
|
复原之前的版本
|
1 month ago |
|
tb202302116011
|
28562b015f
|
复原doc文件夹
|
1 month ago |
|
p7fulywfa
|
bb73a8c90a
|
Merge pull request '尝试解决合并冲突，修复因合并冲突产生的bug' (#42) from tangbo_branch into master
|
1 month ago |
|
tb202302116011
|
53563dd540
|
尝试修复合并冲突，重新上传先前的版本
|
1 month ago |
|
tb202302116011
|
29e939b0fa
|
修复合并冲突，修复因合并而产生的bug
|
1 month ago |
|
tb202302116011
|
3cc68c96a9
|
修复合并冲突
|
1 month ago |
|
tb202302116011
|
ab42f90484
|
解决合并冲突
|
1 month ago |
|
tb202302116011
|
a8bdfa0004
|
修复合并代码产生的bug
|
1 month ago |
|
p3f2h9ljk
|
e253e826d8
|
Merge pull request '增加便签模板功能' (#32) from tangbo_branch into master
|
1 month ago |
|
tb202302116011
|
27657b263c
|
补充缺少的文档
|
1 month ago |
|
tb202302116011
|
9fb7aaabec
|
解决合并冲突
|
1 month ago |
|
tb202302116011
|
048b9271f3
|
修复合并冲突
|
1 month ago |
|
tb202302116011
|
a5fa58e621
|
修复合并冲突
|
1 month ago |
|
tb202302116011
|
c424fd7095
|
修复合并冲突
|
1 month ago |
|
tb202302116011
|
63901af350
|
修复合并错误
|
1 month ago |
|
p3f2h9ljk
|
bdb0d92d7c
|
Merge pull request '测试有没有合并冲突' (#24) from taojunyu_branch into master
|
1 month ago |
|
陶俊宇
|
0df7b98ad4
|
重传
|
1 month ago |
|
陶俊宇
|
b8ffc7d30a
|
清空
|
1 month ago |
|
p3f2h9ljk
|
436a9d32f5
|
Merge pull request '增加回收站功能' (#23) from taojunyu_branch into master
|
1 month ago |
|
陶俊宇
|
0411508bf3
|
清空重传
|
1 month ago |
|
陶俊宇
|
4f078b40cd
|
解决合并冲突问题
|
1 month ago |
|
p7fulywfa
|
672abc00e6
|
Merge pull request '新增了便签模板的功能' (#21) from tangbo_branch into master
|
1 month ago |
|
tb202302116011
|
53adea2949
|
新增了便签模板的功能
|
1 month ago |
|
p3f2h9ljk
|
39c703c6e5
|
Merge pull request '实现回收站和修复搜索功能' (#20) from taojunyu_branch into master
|
1 month ago |
|
陶俊宇
|
0f51cc05e6
|
taojunyu_branch合并错误，重新上传代码备份
|
1 month ago |
|
p3f2h9ljk
|
c936ba456d
|
Merge pull request '重新合并，上传误删代码' (#19) from taojunyu_branch into master
|
1 month ago |
|
p3f2h9ljk
|
a6fec72005
|
Merge pull request '新增回收站功能' (#18) from taojunyu_branch into master
|
1 month ago |
|
p7fulywfa
|
7a9a171034
|
Merge pull request '新增了自动删除空白便签的功能' (#17) from tangbo_branch into master
|
2 months ago |
|
tb202302116011
|
ea4ebf9efc
|
新增了自动删除空白便签的功能
|
2 months ago |
|
p7fulywfa
|
960eb0b233
|
Merge pull request '新增富文本编辑功能' (#16) from tangbo_branch into master
|
2 months ago |
|
tb202302116011
|
0612081c31
|
新增了富文本编辑功能
|
2 months ago |
|
p3f2h9ljk
|
4bd28062bf
|
Merge pull request ' 修复小米便签底部系统栏只显示一半的问题' (#15) from taojunyu_branch into master
|
2 months ago |
|
p7fulywfa
|
4426200dfd
|
Merge pull request '新增了文件夹嵌套的功能' (#14) from tangbo_branch into master
|
2 months ago |
|
tb202302116011
|
07df63aaf5
|
新增了文件夹嵌套的功能
|
2 months ago |
|
p3f2h9ljk
|
0f676498c5
|
Merge pull request '新增为便签加密功能' (#13) from taojunyu_branch into master
|
2 months ago |
|
p7fulywfa
|
c26bb0d60b
|
Merge pull request '解决了在文件夹中点击back键会直接退出小米便签的bug' (#12) from tangbo_branch into master
|
2 months ago |
|
tb202302116011
|
ca8c2205e0
|
解决了在文件夹中点击back键会直接整个退出小米便签的bug
|
2 months ago |
|
p3f2h9ljk
|
c42e585e08
|
Merge pull request '撤销了部分错误修改' (#11) from taojunyu_branch into master
|
2 months ago |
|
p3f2h9ljk
|
9e72eb81c6
|
Merge pull request '修复小米便签主界面底部写便签按钮被白色ui框遮挡的问题' (#10) from taojunyu_branch into master
|
2 months ago |
|
陶俊宇
|
2e58c25abf
|
文档修改
|
2 months ago |
|
tb202302116011
|
d03c1fe5df
|
修改质量分析报告
|
2 months ago |
|
陶俊宇
|
e3a1d27cf6
|
提交小米便签的质量分析报告文档
|
2 months ago |
|
陶俊宇
|
ec8b0436ef
|
文档修改
|
2 months ago |
|
p7fulywfa
|
5221b2434d
|
Merge pull request '合并代码注释，添加了data、gtask、tool三个包的注释' (#9) from tangbo_branch into master
|
2 months ago |
|
tb202302116011
|
d4e00e4310
|
添加了data、gtask、tool三个包的注释
|
2 months ago |
|
p7fulywfa
|
b238f2a6af
|
Merge pull request '把master分支中的src文件夹复制进tangbo_branch分支' (#8) from master into tangbo_branch
|
2 months ago |
|
tb202302116011
|
a9eebbb6d5
|
尝试解决合并冲突，把tangbo_branch中自己新建的src文件夹删除
|
2 months ago |
|
tb202302116011
|
c2fc4cb5d9
|
由于合并冲突，尝试把word变成相同的再合并
|
2 months ago |
|
tb202302116011
|
ba8a8bc944
|
添加了tangbo_branch中缺少的src文件夹，并添加了data、gtask、tool包中的注释
|
2 months ago |
|
陶俊宇
|
a2fc85ff74
|
添加了报告的代码标注部分
|
2 months ago |
|
陶俊宇
|
de42c9b4a4
|
删除不规范的报告
|
2 months ago |
|
陶俊宇
|
ea7bfb9ab0
|
Merge branch 'master' of https://bdgit.educoder.net/p3f2h9ljk/git-test
|
2 months ago |
|
p3f2h9ljk
|
9f8ae5b462
|
Merge pull request '为ui包、model包、widget包以及MainActivity.java添加代码注释' (#3) from taojunyu_branch into master
|
2 months ago |
|
陶俊宇
|
688ac9a381
|
为ui包、model包、widget包以及MainActivity.java添加代码注释
|
2 months ago |
|
tb202302116011
|
54bd5dece9
|
修改
|
3 months ago |
|
tb202302116011
|
d8019ab454
|
稍微修改
|
3 months ago |
|
陶俊宇
|
ba4363ade1
|
删除旧报告，上传新报告
|
3 months ago |
|
tb202302116011
|
7fcf3e2d17
|
修改
|
3 months ago |
|
tb202302116011
|
87cf1a298a
|
更新
|
3 months ago |
|
陶俊宇
|
6b2cd8c45e
|
添加了收获和反思
|
3 months ago |
|
tb202302116011
|
2a98b19e02
|
修改
|
3 months ago |
|
tb202302116011
|
43dab13971
|
修改
|
4 months ago |
|
tb202302116011
|
dd9a3d0c8f
|
修改
|
4 months ago |
|
p7fulywfa
|
b2e07224c0
|
Merge pull request '报告合并' (#1) from tangbo_branch into master
|
4 months ago |
|
tb202302116011
|
0014de90a5
|
删除6.txt
|
4 months ago |
|
tb202302116011
|
a21383278f
|
小米便签开源代码的泛读报告-列出小米便签的基本功能
|
4 months ago |
|
tb202302116011
|
f015022e3d
|
小米便签开源代码的泛读报告-列出小米便签的基本功能
|
4 months ago |
|
tb202302116011
|
8f8ba4d8b4
|
小米便签开源代码的泛读报告-列出小米便签的基本功能
|
4 months ago |
|
p7fulywfa
|
08c8110e47
|
Delete 'doc/小米便签开源代码的泛读报告-列出小米便签的基本功能.docx'
|
4 months ago |
tb202302116011
|
e7667314a8
|
1
|
4 months ago |
|
tb202302116011
|
92cbdd2a0a
|
小米便签开源代码的泛读报告-列出小米便签的基本功能
|
4 months ago |
