 tb202302116011
|
a176792dd8
|
完善ppt与表格
|
3 weeks ago |
 陶俊宇
|
d48627ee1e
|
完善ppt
|
3 weeks ago |
|
陶俊宇
|
aa3ba46743
|
上传实践考评文件
|
3 weeks ago |
|
陶俊宇
|
64fc5ff5e2
|
修改表格名字
|
3 weeks ago |
|
陶俊宇
|
4cf3e805af
|
文档内容修改
|
3 weeks ago |
|
tb202302116011
|
2e406afabb
|
修改部分内容
|
3 weeks ago |
|
tb202302116011
|
792550789b
|
修改部分内容
|
3 weeks ago |
|
tb202302116011
|
000f3a0c37
|
完成小米便签泛读、标注和维护报告文档
|
4 weeks ago |
|
p3f2h9ljk
|
dad464aab4
|
Merge pull request '完善拍照插入图片功能' (#48) from taojunyu_branch into master
|
4 weeks ago |
|
陶俊宇
|
1febbc1a64
|
完善拍照插入图片打不开相机的bug
|
4 weeks 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
|
4 weeks ago |
|
陶俊宇
|
0b89941200
|
尝试解决冲突
|
4 weeks ago |
|
陶俊宇
|
9fcf798f8a
|
解决冲突
|
4 weeks ago |
|
陶俊宇
|
76b36afc94
|
增加图片出入和删除的逻辑
|
4 weeks ago |
|
p7fulywfa
|
6e8f5f0ea0
|
Merge pull request '新增字符统计功能' (#46) from tangbo_branch into master
|
4 weeks ago |
|
tb202302116011
|
7319daf75b
|
新增字符统计功能
|
4 weeks ago |
|
陶俊宇
|
6b83502b12
|
删除解决冲突时git添加的无法让编译通过的语句：
<<<<<<< HEAD
=======
>>>>>>> taojunyu_branch
|
4 weeks ago |
|
陶俊宇
|
236a22e8fe
|
同步master
|
4 weeks 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
|
4 weeks ago |
|
陶俊宇
|
fffe5ba193
|
修复密码锁安全漏洞
|
4 weeks ago |
|
p7fulywfa
|
c7360e4342
|
Merge pull request '修复了search时无法正确显示文本内容的bug' (#43) from tangbo_branch into master
|
4 weeks ago |
|
tb202302116011
|
b956dee8ab
|
修改search时无法正确显示文本内容的bug
|
4 weeks ago |
|
tb202302116011
|
40db3899df
|
复原版本失败，一直存在合并冲突，无法回溯到之前的版本，现在直接提交先前合并成功的版本，该版本是通过tangbo_branch成功合并到master的结果
|
4 weeks ago |
|
tb202302116011
|
0b3e4a0c08
|
清空master
|
4 weeks ago |
|
tb202302116011
|
a9135868c9
|
尝试复原到正确的版本
|
4 weeks ago |
|
tb202302116011
|
0415436b6b
|
尝试复原版本
|
4 weeks ago |
|
tb202302116011
|
035b653dae
|
复原之前的版本
|
4 weeks ago |
|
tb202302116011
|
e7130c7ecf
|
尝试解决合并冲突
|
4 weeks ago |
|
tb202302116011
|
04f1838ad7
|
尝试复原为更早的版本
|
4 weeks ago |
|
tb202302116011
|
695cde0c2a
|
复原之前的版本
|
4 weeks ago |
|
tb202302116011
|
28562b015f
|
复原doc文件夹
|
4 weeks ago |
|
p7fulywfa
|
bb73a8c90a
|
Merge pull request '尝试解决合并冲突，修复因合并冲突产生的bug' (#42) from tangbo_branch into master
|
4 weeks ago |
|
tb202302116011
|
53563dd540
|
尝试修复合并冲突，重新上传先前的版本
|
4 weeks ago |
|
tb202302116011
|
29e939b0fa
|
修复合并冲突，修复因合并而产生的bug
|
4 weeks ago |
|
tb202302116011
|
3cc68c96a9
|
修复合并冲突
|
4 weeks ago |
|
tb202302116011
|
ab42f90484
|
解决合并冲突
|
4 weeks ago |
|
tb202302116011
|
a8bdfa0004
|
修复合并代码产生的bug
|
4 weeks ago |
|
p3f2h9ljk
|
e253e826d8
|
Merge pull request '增加便签模板功能' (#32) from tangbo_branch into master
|
4 weeks ago |
|
tb202302116011
|
27657b263c
|
补充缺少的文档
|
4 weeks ago |
|
tb202302116011
|
9fb7aaabec
|
解决合并冲突
|
4 weeks ago |
|
tb202302116011
|
048b9271f3
|
修复合并冲突
|
4 weeks ago |
|
tb202302116011
|
a5fa58e621
|
修复合并冲突
|
4 weeks ago |
|
tb202302116011
|
c424fd7095
|
修复合并冲突
|
4 weeks ago |
|
tb202302116011
|
63901af350
|
修复合并错误
|
4 weeks ago |
|
p3f2h9ljk
|
bdb0d92d7c
|
Merge pull request '测试有没有合并冲突' (#24) from taojunyu_branch into master
|
4 weeks ago |
|
陶俊宇
|
62df2add6e
|
重传
|
4 weeks ago |
|
陶俊宇
|
026dee7711
|
清空
|
4 weeks ago |
|
陶俊宇
|
0df7b98ad4
|
重传
|
4 weeks ago |
|
陶俊宇
|
b8ffc7d30a
|
清空
|
4 weeks ago |
|
陶俊宇
|
66fa79abe2
|
修改
|
4 weeks ago |
