完成了富文本，便签插入图片，便签涂鸦，回收站，漂流瓶，新闹钟，加密文件夹功能 #29

Merged

ple74bfj6 merged 6 commits from zhongkai_branch into master

ple74bfj6 commented

Collaborator

完成了富文本，便签插入图片，便签涂鸦，回收站，漂流瓶，新闹钟，加密文件夹功能

ple74bfj6 added 5 commits

e2132d66f1 增加新闹钟（选择一段时间）选项和富文本（粗体，斜体，撤回）的功能

655589a577 新增插入照片功能

b692e7e75a 新增漂流瓶功能

c3f56673d7 再传一次漂流瓶，新增回收站功能

b67dc5c129 新增加密文件夹功能

ple74bfj6 added 1 commit

954152577f Merge branch 'master' of https://bdgit.educoder.net/p6vxzahlf/Notes into zhongkai_branch

# Conflicts:
#	src/ui/NoteEditActivity.java
#	src/ui/NotesListActivity.java

ple74bfj6 merged commit c2e9e13602 into master 1 month ago

The pull request has been merged as c2e9e13602.

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: p6vxzahlf/Notes#29