 pjs4euiwk
|
7a646aee20
|
Merge pull request '完善汇报PPT' (#15) from zengweiran_branch into master
|
3 weeks ago |
|
s2_cc
|
4b6620b8a6
|
完善汇报PPT
|
3 weeks ago |
|
pjs4euiwk
|
0a403c76e4
|
Merge pull request '文档合并' (#14) from zengweiran_branch into master
|
3 weeks ago |
|
s2_cc
|
30449d41ac
|
完善维护文档和汇报PPT
|
3 weeks ago |
|
s2_cc
|
d358de80dc
|
完成汇报PPT，excel表
|
3 weeks ago |
|
pjs4euiwk
|
7889413fa8
|
Merge pull request '修复bug的代码补交' (#13) from zengweiran_branch into master
|
3 weeks ago |
|
s2_cc
|
74a9944960
|
修改bug的代码补交
|
3 weeks ago |
|
pjs4euiwk
|
91ffb62aea
|
Merge pull request 'bug修复' (#12) from zengweiran_branch into master
|
3 weeks ago |
|
s2_cc
|
4a3ca6579f
|
修复了一些问题
1. 云端上传下载失败
2. 带富文本内容便签删除后从回收站恢复时消失
3. 带富文本内容便签上传云端下载消失
4. 加锁便签输入密码错误后内容消失
|
3 weeks ago |
|
pjs4euiwk
|
efb5d3313b
|
Merge pull request '完成云同步功能' (#11) from zengweiran_branch into master
|
4 weeks ago |
|
s2_cc
|
9a63818be5
|
完成云同步功能
|
4 weeks ago |
|
pjs4euiwk
|
460b18111b
|
Merge pull request '合并res' (#10) from zengweiran_branch into master
|
4 weeks ago |
|
s2_cc
|
c004652fba
|
重新提交res
|
4 weeks ago |
 ptgkr64sc
|
bd69796124
|
Merge pull request 'res资源合并' (#9) from ranhao_branch into master
|
4 weeks ago |
|
ranhao
|
e90809de69
|
res重新提交
|
4 weeks ago |
|
ranhao
|
14511514c3
|
Merge branch 'master' of https://bdgit.educoder.net/ptgkr64sc/notes into ranhao_branch
|
4 weeks ago |
|
ranhao
|
ac943a8e84
|
res上传
|
4 weeks ago |
|
pjs4euiwk
|
ba6effae7b
|
Merge pull request '新增功能并完成合并' (#8) from zengweiran_branch into master
|
4 weeks ago |
|
s2_cc
|
aceefdb2e3
|
Merge branch 'master' of https://bdgit.educoder.net/ptgkr64sc/notes
# Conflicts:
# src/notes/ui/NoteEditActivity.java
# src/notes/ui/NotesListActivity.java
# src/notes/ui/NotesPreferenceActivity.java
功能合并提交
|
4 weeks ago |
|
s2_cc
|
c32c6ed28c
|
增加功能：ui修改，插入图片，用户登陆，便签上锁
|
4 weeks ago |
|
ptgkr64sc
|
50488bc6de
|
Merge pull request '新增富文本编辑功能，优化原代码中的搜索功能' (#7) from ranhao_branch into master
|
4 weeks ago |
|
ranhao
|
9c06b0dac5
|
增加富文本编辑功能，优化搜索功能
|
4 weeks ago |
|
ptgkr64sc
|
5b7fc75f49
|
Merge pull request '增加回收站，加密，置顶功能' (#6) from ranhao_branch into master
|
4 weeks ago |
|
ranhao
|
207cea7ccb
|
完成第二个issue
|
4 weeks ago |
|
s2_cc
|
263fbe4620
|
插入图片功能完成
|
1 month ago |
|
s2_cc
|
43b38729fa
|
增加插入图片功能相关的资源文件
|
1 month ago |
|
s2_cc
|
6a8a79b519
|
增加老年功能版的资源文件
|
1 month ago |
|
s2_cc
|
776d774b5d
|
Merge branch 'master' of https://bdgit.educoder.net/ptgkr64sc/notes
|
1 month ago |
|
ranhao
|
60335d1fd4
|
Merge branch 'master' of https://bdgit.educoder.net/ptgkr64sc/notes
|
1 month ago |
|
ranhao
|
c71ce7fa26
|
补丁
|
1 month ago |
|
s2_cc
|
6b2bf4d9c5
|
Merge branch 'master' of https://bdgit.educoder.net/ptgkr64sc/notes
# Conflicts:
# src/notes/tool/BackupUtils.java
|
1 month ago |
|
s2_cc
|
247e6513c8
|
完善注释
|
1 month ago |
|
ptgkr64sc
|
fc35706380
|
Merge pull request '完成issue：新增老年人界面功能' (#5) from ranhao_branch into master
|
1 month ago |
|
ranhao
|
971c304015
|
增加了老年人界面功能
|
1 month ago |
|
s2_cc
|
d226591280
|
完成开源软件质量分析出版
|
2 months ago |
|
s2_cc
|
22525cbc9c
|
完成开源软件质量分析报告初版
|
2 months ago |
|
s2_cc
|
387bb12a7c
|
完成小米便签泛读报告代码注释情况部分
|
2 months ago |
|
s2_cc
|
be826664e4
|
Merge branch 'master' of https://bdgit.educoder.net/ptgkr64sc/notes
|
2 months ago |
|
s2_cc
|
29632d1c4a
|
删掉莫名其妙拉到的uml和所有类.txt
|
2 months ago |
|
ptgkr64sc
|
a758df1abb
|
Merge pull request '合并为完整注释代码' (#4) from ranhao_branch into master
|
2 months ago |
|
ranhao
|
3805eef775
|
Merge branch 'master' of https://bdgit.educoder.net/ptgkr64sc/notes
# Conflicts:
# src/notes/ui/NotesPreferenceActivity.java
|
2 months ago |
|
ptgkr64sc
|
ce88012784
|
Merge pull request '代码注释' (#1) from zengweiran_branch into master
|
2 months ago |
|
ranhao
|
34327faa97
|
增加ui，tool，widget注释
|
2 months ago |
|
ranhao
|
039984b840
|
已经增加tool，ui，widget的部分注释。
|
2 months ago |
|
s2_cc
|
fd4c983ae3
|
Merge branch 'zengweiran_branch' of https://bdgit.educoder.net/ptgkr64sc/notes
|
2 months ago |
|
s2_cc
|
cf42140051
|
全新版本小米便签开源代码泛读报告
|
3 months ago |
|
s2_cc
|
ab8afe24e7
|
完善代码泛读报告
|
3 months ago |
|
s2_cc
|
924a991e9a
|
规范小米便签泛读报告类图
|
3 months ago |
|
s2_cc
|
8db5d30924
|
Merge branch 'zengweiran_branch' of https://bdgit.educoder.net/ptgkr64sc/notes into zengweiran_branch
|
3 months ago |
|
s2_cc
|
8e1123248b
|
实验分支，自己本地分支
|
3 months ago |
