测试 #26

Closed

p3f2h9ljk wants to merge 34 commits from tangbo_branch into taojunyu_branch

p3f2h9ljk commented

Owner

There is no content yet.

p3f2h9ljk added 34 commits

92cbdd2a0a 小米便签开源代码的泛读报告-列出小米便签的基本功能

e7667314a8 1

08c8110e47 Delete 'doc/小米便签开源代码的泛读报告-列出小米便签的基本功能.docx'

8f8ba4d8b4 小米便签开源代码的泛读报告-列出小米便签的基本功能

f015022e3d 小米便签开源代码的泛读报告-列出小米便签的基本功能

a21383278f 小米便签开源代码的泛读报告-列出小米便签的基本功能

0014de90a5 删除6.txt

b2e07224c0 Merge pull request '报告合并' (#1 ) from tangbo_branch into master

dd9a3d0c8f 修改

43dab13971 修改

2a98b19e02 修改

6b2cd8c45e 添加了收获和反思

87cf1a298a 更新

7fcf3e2d17 修改

ba4363ade1 删除旧报告，上传新报告

d8019ab454 稍微修改

54bd5dece9 修改

688ac9a381 为ui包、model包、widget包以及MainActivity.java添加代码注释

9f8ae5b462 Merge pull request '为ui包、model包、widget包以及MainActivity.java添加代码注释' (#3 ) from taojunyu_branch into master

ea7bfb9ab0 Merge branch 'master' of https://bdgit.educoder.net/p3f2h9ljk/git-test

de42c9b4a4 删除不规范的报告

a2fc85ff74 添加了报告的代码标注部分

ba8a8bc944 添加了tangbo_branch中缺少的src文件夹，并添加了data、gtask、tool包中的注释

c2fc4cb5d9 由于合并冲突，尝试把word变成相同的再合并

a9eebbb6d5 尝试解决合并冲突，把tangbo_branch中自己新建的src文件夹删除

b238f2a6af Merge pull request '把master分支中的src文件夹复制进tangbo_branch分支' (#8 ) from master into tangbo_branch

d4e00e4310 添加了data、gtask、tool三个包的注释

ca8c2205e0 解决了在文件夹中点击back键会直接整个退出小米便签的bug

07df63aaf5 新增了文件夹嵌套的功能

0612081c31 新增了富文本编辑功能

ea4ebf9efc 新增了自动删除空白便签的功能

53adea2949 新增了便签模板的功能

63901af350 修复合并错误

c424fd7095 修复合并冲突

p3f2h9ljk closed this pull request

This pull request cannot be reopened because the branch was deleted.

Sign in to join this conversation.

No reviewers

No Label

No Milestone

No project

No Assignees

1 Participants

Notifications

Due Date

No due date set.

Dependencies

No dependencies set.

Reference: p3f2h9ljk/git-test#26