 Tom
|
128e856312
|
完善
|
3 months ago |
 fancy
|
41b448d372
|
Merge branch 'master' of https://bdgit.educoder.net/plyf8vez7/fcytom
|
3 months ago |
|
fancy
|
f1e4091d6c
|
修改
|
3 months ago |
|
plyf8vez7
|
69446deff3
|
Merge pull request '添加文本重做功能' (#18) from fancanyu_branch into master
|
3 months ago |
|
fancy
|
7e8fab2281
|
xiug
|
3 months ago |
|
plyf8vez7
|
99e0b3e51e
|
Merge pull request '添加主界面切换背景的功能' (#17) from fancanyu_branch into master
|
3 months ago |
|
fancy
|
46e8515bfb
|
xiug
|
3 months ago |
|
fancy
|
4d59df4ffc
|
修改
|
3 months ago |
|
fancy
|
3efe8ebc38
|
修改
|
3 months ago |
|
fancy
|
84e7c1c970
|
修改
|
3 months ago |
|
fancy
|
632ce3f5f7
|
修改
|
3 months ago |
|
fancy
|
df15c86665
|
修改代码
|
3 months ago |
|
fancy
|
f7adbc4589
|
修改
|
3 months ago |
|
fancy
|
08b46be548
|
修改文件
|
3 months ago |
|
fancy
|
5d6b59033a
|
提交各个文件
|
3 months ago |
|
fancy
|
fcfffc5a6e
|
Merge branch 'master' of https://bdgit.educoder.net/plyf8vez7/fcytom
|
3 months ago |
|
fancy
|
b09e25bf77
|
提交文档
|
3 months ago |
|
pu9e8mzyq
|
586745bb1a
|
Merge pull request '新增撤回、恢复、回收站、字数统计、设置便签标题功能' (#16) from sujiazheng_branch into master
|
3 months ago |
|
Tom
|
1ad5fad977
|
Merge branch 'master' of https://bdgit.educoder.net/plyf8vez7/fcytom into sujiazheng_branch
# Conflicts:
# src/Notes-master/app/src/main/java/net/micode/notes/MainActivity.java
# src/Notes-master/app/src/main/java/net/micode/notes/command/Command.java
# src/Notes-master/app/src/main/java/net/micode/notes/command/TextChangeCommand.java
# src/Notes-master/app/src/main/java/net/micode/notes/data/Contact.java
# src/Notes-master/app/src/main/java/net/micode/notes/data/Notes.java
# src/Notes-master/app/src/main/java/net/micode/notes/data/NotesDatabaseHelper.java
# src/Notes-master/app/src/main/java/net/micode/notes/data/NotesProvider.java
# src/Notes-master/app/src/main/java/net/micode/notes/gtask/data/MetaData.java
# src/Notes-master/app/src/main/java/net/micode/notes/gtask/data/Node.java
# src/Notes-master/app/src/main/java/net/micode/notes/gtask/data/SqlData.java
# src/Notes-master/app/src/main/java/net/micode/notes/gtask/data/SqlNote.java
# src/Notes-master/app/src/main/java/net/micode/notes/gtask/data/Task.java
# src/Notes-master/app/src/main/java/net/micode/notes/gtask/data/TaskList.java
# src/Notes-master/app/src/main/java/net/micode/notes/gtask/exception/ActionFailureException.java
# src/Notes-master/app/src/main/java/net/micode/notes/gtask/exception/NetworkFailureException.java
# src/Notes-master/app/src/main/java/net/micode/notes/gtask/remote/GTaskASyncTask.java
# src/Notes-master/app/src/main/java/net/micode/notes/gtask/remote/GTaskClient.java
# src/Notes-master/app/src/main/java/net/micode/notes/gtask/remote/GTaskManager.java
# src/Notes-master/app/src/main/java/net/micode/notes/gtask/remote/GTaskSyncService.java
# src/Notes-master/app/src/main/java/net/micode/notes/model/Note.java
# src/Notes-master/app/src/main/java/net/micode/notes/model/WorkingNote.java
# src/Notes-master/app/src/main/java/net/micode/notes/tool/BackupUtils.java
# src/Notes-master/app/src/main/java/net/micode/notes/tool/DataUtils.java
# src/Notes-master/app/src/main/java/net/micode/notes/tool/GTaskStringUtils.java
# src/Notes-master/app/src/main/java/net/micode/notes/tool/ResourceParser.java
# src/Notes-master/app/src/main/java/net/micode/notes/ui/AlarmAlertActivity.java
# src/Notes-master/app/src/main/java/net/micode/notes/ui/AlarmInitReceiver.java
# src/Notes-master/app/src/main/java/net/micode/notes/ui/AlarmReceiver.java
# src/Notes-master/app/src/main/java/net/micode/notes/ui/DateTimePicker.java
# src/Notes-master/app/src/main/java/net/micode/notes/ui/DateTimePickerDialog.java
# src/Notes-master/app/src/main/java/net/micode/notes/ui/DropdownMenu.java
# src/Notes-master/app/src/main/java/net/micode/notes/ui/FoldersListAdapter.java
# src/Notes-master/app/src/main/java/net/micode/notes/ui/NoteEditActivity.java
# src/Notes-master/app/src/main/java/net/micode/notes/ui/NoteEditText.java
# src/Notes-master/app/src/main/java/net/micode/notes/ui/NoteItemData.java
# src/Notes-master/app/src/main/java/net/micode/notes/ui/NotesListActivity.java
# src/Notes-master/app/src/main/java/net/micode/notes/ui/NotesListAdapter.java
# src/Notes-master/app/src/main/java/net/micode/notes/ui/NotesListItem.java
# src/Notes-master/app/src/main/java/net/micode/notes/ui/NotesPreferenceActivity.java
# src/Notes-master/app/src/main/java/net/micode/notes/widget/NoteWidgetProvider.java
# src/Notes-master/app/src/main/java/net/micode/notes/widget/NoteWidgetProvider_2x.java
# src/Notes-master/app/src/main/java/net/micode/notes/widget/NoteWidgetProvider_4x.java
|
3 months ago |
|
Tom
|
7a464e2ef8
|
修改
|
3 months ago |
|
Tom
|
983c0768e6
|
修改
|
3 months ago |
|
Tom
|
8b89d6fef7
|
修改代码
|
3 months ago |
|
Tom
|
03b4449326
|
修改代码
|
3 months ago |
|
Tom
|
fb25896658
|
重提交
|
3 months ago |
|
Tom
|
b45e50658c
|
修改代码
|
3 months ago |
|
Tom
|
577cb73c51
|
添加新功能
|
3 months ago |
|
Tom
|
d0d240a58e
|
Merge branch 'sujiazheng_branch' of https://bdgit.educoder.net/plyf8vez7/fcytom
# Conflicts:
# doc/小米便签开源代码的泛读报告_粟嘉政.docx
|
3 months ago |
|
Tom
|
02ab732cda
|
新增功能
|
3 months ago |
|
Tom
|
6f36e1b62a
|
新增撤回、恢复、回收站、字数统计、设置便签标题功能
|
4 months ago |
|
plyf8vez7
|
1e09e71f32
|
Merge pull request '添加主界面使用密码登录的功能' (#9) from fancanyu_branch into master
|
4 months ago |
|
fancy
|
f54db693fe
|
新增加功能：应用主界面密码锁
|
4 months ago |
|
plyf8vez7
|
06270b439d
|
Merge pull request '添加便签内插入图片的功能，修复Settings不能正常启动的bug' (#8) from fancanyu_branch into master
|
4 months ago |
|
fancy
|
99a6b701c8
|
新增功能
|
4 months ago |
|
fancy
|
bda67f011c
|
添加便签内输入图片的功能
修复Settings不能正常启动的bug
|
4 months ago |
|
fancy
|
0c5fca8610
|
修改文档
|
4 months ago |
|
fancy
|
5dc0e04658
|
提交文档
|
4 months ago |
|
plyf8vez7
|
2878be70aa
|
Merge pull request '修改代码注释' (#7) from fancanyu_branch into master
|
4 months ago |
|
fancy
|
16377fd50a
|
修改文档
|
4 months ago |
|
fancy
|
066b272b95
|
修改注释
|
4 months ago |
|
fancy
|
096780f0f5
|
删除多余文件
|
4 months ago |
|
fancy
|
e0ecf3e67d
|
提交文件
|
4 months ago |
|
fancy
|
d21621d39a
|
Merge branch 'master' of https://bdgit.educoder.net/plyf8vez7/fcytom
|
4 months ago |
|
fancy
|
a1767c9baf
|
删掉多余文件
|
4 months ago |
|
Tom
|
2560354549
|
修改报告
|
5 months ago |
|
pu9e8mzyq
|
fc6806a28c
|
Merge pull request '注释代码' (#5) from sujiazheng_branch into master
|
5 months ago |
|
Tom
|
2ae5a9f0fe
|
修改
|
5 months ago |
|
fancy
|
90a58f8513
|
修改内容
|
5 months ago |
|
fancy
|
53d52fe71a
|
已修改泛读报告
|
5 months ago |
|
fancy
|
075284c4ab
|
修改文档
|
5 months ago |
|
plyf8vez7
|
573122af50
|
Merge pull request '注释remote包和exception包' (#4) from fancanyu_branch into master
|
5 months ago |
