 mbhvfy6mx
|
285af32e55
|
Merge pull request '版本控制' (#17) from master into cyx_branch
|
3 years ago |
|
庞浩
|
deeba68c2f
|
修改
|
3 years ago |
 蔡玉祥
|
e750fe86a1
|
Merge branch 'cyx_branch' of https://bdgit.educoder.net/mbhvfy6mx/gitProject into cyx_branch
# Conflicts:
# .idea/workspace.xml
|
3 years ago |
|
蔡玉祥
|
aa2749eff7
|
dd
|
3 years ago |
|
mbhvfy6mx
|
97f59e709a
|
Merge pull request 'ddd' (#16) from master into cyx_branch
|
3 years ago |
|
庞浩
|
f70425f321
|
更改
|
3 years ago |
|
蔡玉祥
|
026e1f0cba
|
Merge branch 'master' of https://bdgit.educoder.net/mbhvfy6mx/gitProject
# Conflicts:
# src/.idea/deploymentTargetDropDown.xml
# src/app/src/main/java/net/micode/notes/gtask/data/SqlData.java
|
3 years ago |
|
蔡玉祥
|
1446cf7d54
|
更新
|
3 years ago |
|
mbhvfy6mx
|
b193b83e7d
|
Merge pull request '版本控制' (#14) from master into cyx_branch
|
3 years ago |
|
庞浩
|
25eb5a04c0
|
注释
|
3 years ago |
|
庞浩
|
abfa3096e7
|
注释
|
3 years ago |
|
mbhvfy6mx
|
49f90c91d5
|
Merge pull request '蔡玉祥的注释' (#12) from cyx_branch into master
|
3 years ago |
|
庞浩
|
ce28b7edc9
|
Merge branch 'master' into cyx_branch
# Conflicts:
# src/.idea/deploymentTargetDropDown.xml
# src/.idea/modules/app/minote.app.androidTest.iml
# src/.idea/modules/app/minote.app.iml
# src/.idea/modules/app/minote.app.main.iml
# src/.idea/modules/app/minote.app.unitTest.iml
# src/minote.iml
|
3 years ago |
|
庞浩
|
c1a759803c
|
分组注释
|
3 years ago |
|
庞浩
|
8d860e7a00
|
修改
|
3 years ago |
|
庞浩
|
b48f8248c6
|
更改
|
3 years ago |
|
庞浩
|
add039a4a1
|
Merge branch 'master' of https://bdgit.educoder.net/mbhvfy6mx/gitProject
# Conflicts:
# app/src/main/java/net/micode/notes/tool/BackupUtils.java
# app/src/main/java/net/micode/notes/tool/DataUtils.java
# app/src/main/java/net/micode/notes/tool/GTaskStringUtils.java
# app/src/main/java/net/micode/notes/tool/ResourceParser.java
# app/src/main/java/net/micode/notes/ui/NotesPreferenceActivity.java
# app/src/main/java/net/micode/notes/widget/NoteWidgetProvider.java
# app/src/main/java/net/micode/notes/widget/NoteWidgetProvider_2x.java
# app/src/main/java/net/micode/notes/widget/NoteWidgetProvider_4x.java
# src/.idea/modules/app/minote.app.androidTest.iml
|
3 years ago |
|
庞浩
|
8741dc4cf6
|
统一控制
|
3 years ago |
|
mbhvfy6mx
|
7d312c9c4a
|
Merge pull request '注释代码' (#10) from zxy_branch into master
|
3 years ago |
 邹兴云
|
f1955e5c4a
|
邹兴云注释
|
3 years ago |
|
蔡玉祥
|
006919e15e
|
Merge remote-tracking branch 'origin/cyx_branch' into cyx_branch
|
3 years ago |
|
蔡玉祥
|
e21db9d3d8
|
蔡玉祥注释
|
3 years ago |
|
蔡玉祥
|
293c984ad5
|
蔡玉祥注释
|
3 years ago |
|
邹兴云
|
4dd18f2d5c
|
邹兴云注释
|
3 years ago |
|
邹兴云
|
3d803bc080
|
邹兴云注释
|
3 years ago |
|
蔡玉祥
|
6054384cf0
|
蔡玉祥注释
|
3 years ago |
|
邹兴云
|
5c27788389
|
邹兴云注释
|
3 years ago |
|
邹兴云
|
d600a5fb23
|
邹兴云注释
|
3 years ago |
|
庞浩
|
ced305cd3b
|
庞浩的注释
|
3 years ago |
|
庞浩
|
f5b025db80
|
庞浩的注释
|
3 years ago |
|
庞浩
|
4ad8e66d2b
|
庞浩的注释
|
3 years ago |
|
庞浩
|
30352f16b0
|
注释
|
3 years ago |
|
庞浩
|
21b28459b6
|
注释
|
3 years ago |
|
mbhvfy6mx
|
225f60584e
|
Merge pull request 'heb' (#9) from master into zxy_branch
|
3 years ago |
|
mbhvfy6mx
|
19b28b5571
|
Merge pull request 'heb' (#8) from master into cyx_branch
|
3 years ago |
|
庞浩
|
66263d260e
|
更新
|
3 years ago |
|
mbhvfy6mx
|
a8dbc2e1d7
|
Merge pull request '注释代码' (#7) from master into zxy_branch
|
3 years ago |
|
mbhvfy6mx
|
b5b286f576
|
Merge pull request 'heb' (#6) from dev into master
|
3 years ago |
|
庞浩
|
80f77bc1c1
|
Merge branch 'dev' of https://bdgit.educoder.net/mbhvfy6mx/gitProject into dev
|
3 years ago |
|
mbhvfy6mx
|
8482c88b75
|
Merge pull request 'heb' (#5) from master into dev
|
3 years ago |
|
mbhvfy6mx
|
414c9b39b4
|
Merge pull request 'heb' (#5) from master into dev
|
3 years ago |
|
庞浩
|
136b4a1591
|
Merge branch 'master' of https://bdgit.educoder.net/mbhvfy6mx/gitProject
|
3 years ago |
|
庞浩
|
846fa8ced2
|
Merge branch 'master' of https://bdgit.educoder.net/mbhvfy6mx/gitProject
|
3 years ago |
|
mbhvfy6mx
|
4cfce06d64
|
Merge pull request 'heb' (#4) from master into zxy_branch
|
3 years ago |
|
mbhvfy6mx
|
7a2ca273ed
|
Merge pull request 'heb' (#3) from master into cyx_branch
|
3 years ago |
|
mbhvfy6mx
|
f591b2f5d1
|
Merge pull request 'heb' (#2) from master into dev
|
3 years ago |
|
庞浩
|
c5e05a650e
|
Merge branch 'master' of https://bdgit.educoder.net/mbhvfy6mx/gitProject
|
3 years ago |
|
mbhvfy6mx
|
9628a3aede
|
d
|
3 years ago |
|
mbhvfy6mx
|
f6c6c577f2
|
Delete 'model'
|
3 years ago |
|
mbhvfy6mx
|
96bc83e7ca
|
Merge pull request 'heb' (#1) from zxy_branch into master
|
3 years ago |
