16 Commits (80a64e553d1f624acd1fcd81dbf1fdc971dafa82)

Author	SHA1	Message	Date
AetherPendragon	0d8db09b31	删除多余文件，修复富文本功能下划线功能	4 months ago
Surponess	5037444811	修改图片不能正常插入的bug，保持了与富文本的兼容	4 months ago
AetherPendragon	5b1a3021f5	Merge branch 'master' of https://bdgit.educoder.net/p82feo7wg/MiNoteRead into luogang_branch ... # Conflicts: # src/Notes-master/res/layout/note_edit.xml # src/Notes-master/res/values-zh-rCN/strings.xml # src/Notes-master/res/values/strings.xml # src/Notes-master/src/net/micode/notes/tool/DataUtils.java # src/Notes-master/src/net/micode/notes/ui/NoteEditActivity.java	4 months ago
AetherPendragon	a00d0d0101	修改富文本功能	4 months ago
AetherPendragon	3b0fe8a4ab	修改了富文本功能与已有功能的一些冲突	4 months ago
AetherPendragon	9fcad72595	修改了富文本功能	4 months ago
Surponess	b19e95babf	修改一个布局文件	4 months ago
Surponess	afb49ae836	修改富文本编辑功能与图片插入不兼容的部分	4 months ago
AetherPendragon	1ccf31c177	增加了富文本功能，并兼容了图片插入功能	4 months ago
Surponess	5e507b72fe	新增图片插入功能	4 months ago
Surponess	a4c169eb3a	Merge branch 'master' of https://bdgit.educoder.net/p82feo7wg/MiNoteRead into wangjiaqi_branch ... # Conflicts: # src/Notes-master/res/menu/note_list.xml # src/Notes-master/src/net/micode/notes/data/Notes.java # src/Notes-master/src/net/micode/notes/model/WorkingNote.java # src/Notes-master/src/net/micode/notes/ui/NoteItemData.java # src/Notes-master/src/net/micode/notes/ui/NotesListActivity.java	4 months ago
Surponess	084ecbb84f	更新UI	4 months ago
AetherPendragon	851e087711	增加了密码保护功能。解决了新增功能与回收站功能的冲突	4 months ago
AetherPendragon	ed8cce084f	增加了回收站功能	4 months ago
Surponess	6ca33b3ec1	新修改源码res/values/styles.xml第65道68行代码	6 months ago
Surponess	e19fbb4515	新增src和doc	6 months ago