Labels Milestones

新增功能并完成合并 #8

Merged

pjs4euiwk merged 4 commits from zengweiran_branch into master 4 weeks ago

Conversation 0 Commits 4 Files Changed 60

pjs4euiwk commented 4 weeks ago

Collaborator

完成了功能：插入图片，ui修改，便签加密，用户登陆注册。
与冉豪的功能进行合并。

完成了功能：插入图片，ui修改，便签加密，用户登陆注册。 与冉豪的功能进行合并。

pjs4euiwk added 4 commits 4 weeks ago

43b38729fa 增加插入图片功能相关的资源文件

263fbe4620 插入图片功能完成

c32c6ed28c 增加功能：ui修改，插入图片，用户登陆，便签上锁

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
功能合并提交

pjs4euiwk merged commit ba6effae7b into master 4 weeks ago

pjs4euiwk referenced this issue from a commit 4 weeks ago

Merge pull request '新增功能并完成合并' (#8) from zengweiran_branch into master

The pull request has been merged as ba6effae7b.

Sign in to join this conversation.

Reviewers

Request review

No reviewers

Labels

Apply labels

Clear labels

No items

No Label

Milestone

Set milestone

Clear milestone

No items

No Milestone

Projects

Clear projects

No project

Assignees

Assign users

Clear assignees

No Assignees

1 Participants

Notifications

Subscribe

Due Date

The due date is invalid or out of range. Please use the format 'yyyy-mm-dd'.

No due date set.

Dependencies

No dependencies set.

Reference: ptgkr64sc/notes#8

Write Preview

Loading…

Cancel

Save

There is no content yet.