 AetherPendragon
|
0d8db09b31
|
删除多余文件，修复富文本功能下划线功能
|
2 months ago |
 Surponess
|
5037444811
|
修改图片不能正常插入的bug，保持了与富文本的兼容
|
2 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
|
2 months ago |
|
AetherPendragon
|
a00d0d0101
|
修改富文本功能
|
2 months ago |
|
AetherPendragon
|
3b0fe8a4ab
|
修改了富文本功能与已有功能的一些冲突
|
2 months ago |
|
AetherPendragon
|
9fcad72595
|
修改了富文本功能
|
2 months ago |
|
Surponess
|
b19e95babf
|
修改一个布局文件
|
3 months ago |
|
Surponess
|
afb49ae836
|
修改富文本编辑功能与图片插入不兼容的部分
|
3 months ago |
|
AetherPendragon
|
1ccf31c177
|
增加了富文本功能，并兼容了图片插入功能
|
3 months ago |
|
Surponess
|
5e507b72fe
|
新增图片插入功能
|
3 months ago |
|
Surponess
|
362bcd4f41
|
修改部分合并后导致的错误
|
3 months ago |
|
Surponess
|
6382611563
|
修改部分内容
|
3 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
|
3 months ago |
|
Surponess
|
084ecbb84f
|
更新UI
|
3 months ago |
|
AetherPendragon
|
851e087711
|
增加了密码保护功能。解决了新增功能与回收站功能的冲突
|
3 months ago |
|
AetherPendragon
|
ed8cce084f
|
增加了回收站功能
|
3 months ago |
|
Surponess
|
0d49124274
|
修改注释
|
3 months ago |
|
Surponess
|
593b63aa8e
|
修改一处注释
|
4 months ago |
|
Surponess
|
74bb086f1a
|
Merge branch 'luogang_branch' of https://bdgit.educoder.net/p82feo7wg/MiNoteRead
# Conflicts:
# doc/小米便签泛读报告.docx
# src/Notes-master/src/net/micode/notes/data/Contact.java
# src/Notes-master/src/net/micode/notes/data/Notes.java
# src/Notes-master/src/net/micode/notes/data/NotesDatabaseHelper.java
# src/Notes-master/src/net/micode/notes/data/NotesProvider.java
# src/Notes-master/src/net/micode/notes/model/Note.java
# src/Notes-master/src/net/micode/notes/model/WorkingNote.java
# src/Notes-master/src/net/micode/notes/tool/BackupUtils.java
# src/Notes-master/src/net/micode/notes/tool/DataUtils.java
# src/Notes-master/src/net/micode/notes/tool/GTaskStringUtils.java
# src/Notes-master/src/net/micode/notes/tool/ResourceParser.java
# src/Notes-master/src/net/micode/notes/ui/AlarmAlertActivity.java
# src/Notes-master/src/net/micode/notes/ui/AlarmInitReceiver.java
# src/Notes-master/src/net/micode/notes/ui/AlarmReceiver.java
# src/Notes-master/src/net/micode/notes/ui/DateTimePicker.java
# src/Notes-master/src/net/micode/notes/ui/DateTimePickerDialog.java
# src/Notes-master/src/net/micode/notes/ui/DropdownMenu.java
# src/Notes-master/src/net/micode/notes/ui/FoldersListAdapter.java
# src/Notes-master/src/net/micode/notes/ui/NoteEditText.java
# src/Notes-master/src/net/micode/notes/ui/NoteItemData.java
# src/Notes-master/src/net/micode/notes/ui/NotesListActivity.java
# src/Notes-master/src/net/micode/notes/ui/NotesListAdapter.java
# src/Notes-master/src/net/micode/notes/ui/NotesListItem.java
# src/Notes-master/src/net/micode/notes/ui/NotesPreferenceActivity.java
# src/Notes-master/src/net/micode/notes/widget/NoteWidgetProvider.java
# src/Notes-master/src/net/micode/notes/widget/NoteWidgetProvider_2x.java
# src/Notes-master/src/net/micode/notes/widget/NoteWidgetProvider_4x.java
|
4 months ago |
|
AetherPendragon
|
bc5ca6f0a0
|
修改部分注释
|
4 months ago |
|
AetherPendragon
|
06711ccca6
|
更改了部分注释
|
4 months ago |
|
Surponess
|
90a23a35c7
|
修改注释
|
4 months ago |
|
AetherPendragon
|
4cfeb6bfd5
|
增加了所有java文件的代码注释
|
4 months ago |
|
Surponess
|
054e52d9bb
|
增添了代码注释
|
4 months ago |
|
AetherPendragon
|
30e36d76c6
|
增加 Contact 注释
|
4 months ago |
|
Surponess
|
5d0521357e
|
泛读报告的填写和按照现有理解注释了部分代码
|
5 months ago |
|
Surponess
|
6ca33b3ec1
|
新修改源码res/values/styles.xml第65道68行代码
|
5 months ago |
|
Surponess
|
e19fbb4515
|
新增src和doc
|
5 months ago |
