 ziji Wu
|
a54af39b13
|
Merge remote-tracking branch 'origin/develop'
# Conflicts:
# doc/1_小米便签代码质量分析报告 - 吴子吉-方群天.docx
# src/.gradle/5.4.1/executionHistory/executionHistory.bin
# src/.gradle/5.4.1/executionHistory/executionHistory.lock
# src/.gradle/5.4.1/fileHashes/fileHashes.lock
# src/.gradle/buildOutputCleanup/buildOutputCleanup.lock
# src/.gradle/buildOutputCleanup/cache.properties
# src/.idea/caches/build_file_checksums.ser
# src/.idea/caches/gradle_models.ser
# src/.idea/misc.xml
# src/.idea/modules.xml
# src/.idea/workspace.xml
# src/app/app.iml
# src/gradle/wrapper/gradle-wrapper.properties
# src/local.properties
# src/src.iml
|
2019-10-12 00:15:53 +08:00 |
|
ziji Wu
|
718807e64b
|
merge
|
2019-10-12 00:15:11 +08:00 |
|
ziji Wu
|
7467a51ddb
|
merge
|
2019-10-12 00:13:44 +08:00 |
|
ziji Wu
|
949ac5f670
|
merge into develop
|
2019-10-12 00:07:42 +08:00 |
|
ziji Wu
|
73f37833b8
|
Merge remote-tracking branch 'origin/ziji_wu' into develop
# Conflicts:
# src/.gradle/5.4.1/executionHistory/executionHistory.bin
# src/.gradle/5.4.1/executionHistory/executionHistory.lock
# src/.gradle/5.4.1/fileHashes/fileHashes.bin
# src/.gradle/5.4.1/fileHashes/fileHashes.lock
# src/.gradle/5.4.1/fileHashes/resourceHashesCache.bin
# src/.gradle/5.4.1/javaCompile/javaCompile.lock
# src/.gradle/buildOutputCleanup/buildOutputCleanup.lock
# src/.gradle/buildOutputCleanup/outputFiles.bin
# src/.idea/caches/build_file_checksums.ser
# src/.idea/caches/gradle_models.ser
# src/.idea/sonarlint/issuestore/1/e/1eb2363b523dbcae43d3c6e4790c64436af61b13
# src/.idea/sonarlint/issuestore/3/e/3e688be40dc69cfd1062f41d0fc27fe261a26710
# src/.idea/sonarlint/issuestore/5/7/577f30d26378ec8a2bd2e4a43f3c79b3f04c402c
# src/.idea/sonarlint/issuestore/6/a/6a65e747031f27aef20597b4181148a9fbf963d5
# src/.idea/sonarlint/issuestore/a/7/a7641cfac724321d508c2a284223a711011a93f5
# src/.idea/sonarlint/issuestore/a/d/ad72331a1bed265bb9c0fe838faa74dbf69fce32
# src/.idea/sonarlint/issuestore/d/d/dd970bd8ce083850fca1d4d159647ccd110e57cb
# src/.idea/workspace.xml
# src/app/app.iml
# src/app/build.gradle
# src/app/build/intermediates/dex/debug/mergeDexDebug/out/classes.dex
# src/app/build/intermediates/incremental/packageDebug/tmp/debug/dex-renamer-state.txt
# src/app/build/intermediates/incremental/packageDebug/tmp/debug/zip-cache/dPcwR9oS2EmiImbvDZ1Qg_iwk3M=
# src/app/build/intermediates/javac/debug/classes/net/micode/notes/data/NotesDatabaseHelper.class
# src/app/build/intermediates/javac/debug/classes/net/micode/notes/data/NotesProvider.class
# src/app/build/intermediates/processed_res/debug/processDebugResources/out/resources-debug.ap_
# src/app/build/intermediates/transforms/dexBuilder/debug/0/net/micode/notes/data/NotesDatabaseHelper.dex
# src/app/build/intermediates/transforms/dexBuilder/debug/0/net/micode/notes/data/NotesProvider.dex
# src/app/build/outputs/apk/debug/app-debug.apk
# src/app/src/main/java/net/micode/notes/data/NotesProvider.java
|
2019-10-12 00:06:58 +08:00 |
|
吴子吉
|
ee13ee922c
|
Merge branch 'qutian_Fang' into 'develop'
quntianfang merge
See merge request !10
|
2019-10-12 00:02:21 +08:00 |
|
ziji Wu
|
0e046e6d91
|
Merge remote-tracking branch 'origin/ziji_wu' into develop
# Conflicts:
# src/.gradle/5.4.1/executionHistory/executionHistory.bin
# src/.gradle/5.4.1/executionHistory/executionHistory.lock
# src/.gradle/5.4.1/fileHashes/fileHashes.bin
# src/.gradle/5.4.1/fileHashes/fileHashes.lock
# src/.gradle/5.4.1/fileHashes/resourceHashesCache.bin
# src/.gradle/5.4.1/javaCompile/javaCompile.lock
# src/.gradle/buildOutputCleanup/buildOutputCleanup.lock
# src/.gradle/buildOutputCleanup/outputFiles.bin
# src/.idea/caches/build_file_checksums.ser
# src/.idea/caches/gradle_models.ser
# src/.idea/sonarlint/issuestore/1/e/1eb2363b523dbcae43d3c6e4790c64436af61b13
# src/.idea/sonarlint/issuestore/3/e/3e688be40dc69cfd1062f41d0fc27fe261a26710
# src/.idea/sonarlint/issuestore/5/7/577f30d26378ec8a2bd2e4a43f3c79b3f04c402c
# src/.idea/sonarlint/issuestore/6/a/6a65e747031f27aef20597b4181148a9fbf963d5
# src/.idea/sonarlint/issuestore/a/7/a7641cfac724321d508c2a284223a711011a93f5
# src/.idea/sonarlint/issuestore/a/d/ad72331a1bed265bb9c0fe838faa74dbf69fce32
# src/.idea/sonarlint/issuestore/d/d/dd970bd8ce083850fca1d4d159647ccd110e57cb
# src/.idea/workspace.xml
# src/app/app.iml
# src/app/build.gradle
# src/app/build/intermediates/dex/debug/mergeDexDebug/out/classes.dex
# src/app/build/intermediates/incremental/packageDebug/tmp/debug/dex-renamer-state.txt
# src/app/build/intermediates/incremental/packageDebug/tmp/debug/zip-cache/dPcwR9oS2EmiImbvDZ1Qg_iwk3M=
# src/app/build/intermediates/javac/debug/classes/net/micode/notes/data/NotesDatabaseHelper.class
# src/app/build/intermediates/javac/debug/classes/net/micode/notes/data/NotesProvider.class
# src/app/build/intermediates/processed_res/debug/processDebugResources/out/resources-debug.ap_
# src/app/build/intermediates/transforms/dexBuilder/debug/0/net/micode/notes/data/NotesDatabaseHelper.dex
# src/app/build/intermediates/transforms/dexBuilder/debug/0/net/micode/notes/data/NotesProvider.dex
# src/app/build/outputs/apk/debug/app-debug.apk
# src/app/src/main/java/net/micode/notes/data/NotesProvider.java
|
2019-10-11 23:59:11 +08:00 |
|
ziji Wu
|
199c8ed72f
|
Merge remote-tracking branch 'origin/qutian_Fang' into develop
|
2019-10-11 23:54:28 +08:00 |
 square group sky
|
122ed2135a
|
1
|
2019-10-11 23:51:57 +08:00 |
|
ziji Wu
|
6c7336cf57
|
Merge remote-tracking branch 'origin/ziji_wu' into develop
# Conflicts:
# src/.gradle/5.4.1/executionHistory/executionHistory.bin
# src/.gradle/5.4.1/executionHistory/executionHistory.lock
# src/.gradle/5.4.1/fileHashes/fileHashes.bin
# src/.gradle/5.4.1/fileHashes/fileHashes.lock
# src/.gradle/buildOutputCleanup/buildOutputCleanup.lock
# src/.idea/workspace.xml
# src/app/src/main/java/net/micode/notes/ui/NoteEditActivity.java
|
2019-10-11 23:50:17 +08:00 |
|
ziji Wu
|
63744eba7c
|
n
|
2019-10-11 23:44:29 +08:00 |
|
ziji Wu
|
57e835edac
|
Merge remote-tracking branch 'origin/ziji_wu' into develop
# Conflicts:
# src/.gradle/5.4.1/executionHistory/executionHistory.bin
# src/.gradle/5.4.1/executionHistory/executionHistory.lock
# src/.gradle/5.4.1/fileHashes/fileHashes.bin
# src/.gradle/5.4.1/fileHashes/fileHashes.lock
# src/.gradle/5.4.1/fileHashes/resourceHashesCache.bin
# src/.gradle/5.4.1/javaCompile/javaCompile.lock
# src/.gradle/buildOutputCleanup/buildOutputCleanup.lock
# src/.gradle/buildOutputCleanup/outputFiles.bin
# src/.idea/caches/build_file_checksums.ser
# src/.idea/caches/gradle_models.ser
# src/.idea/sonarlint/issuestore/1/e/1eb2363b523dbcae43d3c6e4790c64436af61b13
# src/.idea/sonarlint/issuestore/3/e/3e688be40dc69cfd1062f41d0fc27fe261a26710
# src/.idea/sonarlint/issuestore/5/7/577f30d26378ec8a2bd2e4a43f3c79b3f04c402c
# src/.idea/sonarlint/issuestore/6/a/6a65e747031f27aef20597b4181148a9fbf963d5
# src/.idea/sonarlint/issuestore/a/7/a7641cfac724321d508c2a284223a711011a93f5
# src/.idea/sonarlint/issuestore/a/d/ad72331a1bed265bb9c0fe838faa74dbf69fce32
# src/.idea/sonarlint/issuestore/d/d/dd970bd8ce083850fca1d4d159647ccd110e57cb
# src/.idea/workspace.xml
# src/app/app.iml
# src/app/build.gradle
# src/app/build/intermediates/dex/debug/mergeDexDebug/out/classes.dex
# src/app/build/intermediates/incremental/packageDebug/tmp/debug/dex-renamer-state.txt
# src/app/build/intermediates/incremental/packageDebug/tmp/debug/zip-cache/dPcwR9oS2EmiImbvDZ1Qg_iwk3M=
# src/app/build/intermediates/javac/debug/classes/net/micode/notes/data/NotesDatabaseHelper.class
# src/app/build/intermediates/javac/debug/classes/net/micode/notes/data/NotesProvider.class
# src/app/build/intermediates/processed_res/debug/processDebugResources/out/resources-debug.ap_
# src/app/build/intermediates/transforms/dexBuilder/debug/0/net/micode/notes/data/NotesDatabaseHelper.dex
# src/app/build/intermediates/transforms/dexBuilder/debug/0/net/micode/notes/data/NotesProvider.dex
# src/app/build/outputs/apk/debug/app-debug.apk
# src/app/src/main/java/net/micode/notes/data/NotesProvider.java
|
2019-10-11 23:43:54 +08:00 |
|
ziji Wu
|
634087f21a
|
Merge remote-tracking branch 'origin/ziji_wu' into develop
# Conflicts:
# src/.gradle/5.4.1/executionHistory/executionHistory.bin
# src/.gradle/5.4.1/executionHistory/executionHistory.lock
# src/.gradle/5.4.1/fileHashes/fileHashes.bin
# src/.gradle/5.4.1/fileHashes/fileHashes.lock
# src/.gradle/5.4.1/fileHashes/resourceHashesCache.bin
# src/.gradle/5.4.1/javaCompile/javaCompile.lock
# src/.gradle/buildOutputCleanup/buildOutputCleanup.lock
# src/.gradle/buildOutputCleanup/outputFiles.bin
# src/.idea/caches/build_file_checksums.ser
# src/.idea/caches/gradle_models.ser
# src/.idea/sonarlint/issuestore/1/e/1eb2363b523dbcae43d3c6e4790c64436af61b13
# src/.idea/sonarlint/issuestore/3/e/3e688be40dc69cfd1062f41d0fc27fe261a26710
# src/.idea/sonarlint/issuestore/5/7/577f30d26378ec8a2bd2e4a43f3c79b3f04c402c
# src/.idea/sonarlint/issuestore/6/a/6a65e747031f27aef20597b4181148a9fbf963d5
# src/.idea/sonarlint/issuestore/a/7/a7641cfac724321d508c2a284223a711011a93f5
# src/.idea/sonarlint/issuestore/a/d/ad72331a1bed265bb9c0fe838faa74dbf69fce32
# src/.idea/sonarlint/issuestore/d/d/dd970bd8ce083850fca1d4d159647ccd110e57cb
# src/.idea/workspace.xml
# src/app/app.iml
# src/app/build.gradle
# src/app/build/intermediates/dex/debug/mergeDexDebug/out/classes.dex
# src/app/build/intermediates/incremental/packageDebug/tmp/debug/dex-renamer-state.txt
# src/app/build/intermediates/incremental/packageDebug/tmp/debug/zip-cache/dPcwR9oS2EmiImbvDZ1Qg_iwk3M=
# src/app/build/intermediates/javac/debug/classes/net/micode/notes/data/NotesDatabaseHelper.class
# src/app/build/intermediates/javac/debug/classes/net/micode/notes/data/NotesProvider.class
# src/app/build/intermediates/processed_res/debug/processDebugResources/out/resources-debug.ap_
# src/app/build/intermediates/transforms/dexBuilder/debug/0/net/micode/notes/data/NotesDatabaseHelper.dex
# src/app/build/intermediates/transforms/dexBuilder/debug/0/net/micode/notes/data/NotesProvider.dex
# src/app/build/outputs/apk/debug/app-debug.apk
# src/app/src/main/java/net/micode/notes/data/NotesProvider.java
|
2019-10-11 23:28:23 +08:00 |
|
square group sky
|
2186942fb4
|
1
|
2019-10-11 21:16:47 +08:00 |
|
ziji Wu
|
1d33df2c53
|
develop
|
2019-10-11 15:48:52 +08:00 |
|
ziji Wu
|
392ce4279f
|
Merge remote-tracking branch 'origin/ziji_wu' into develop
# Conflicts:
# src/.gradle/5.4.1/executionHistory/executionHistory.bin
# src/.gradle/5.4.1/executionHistory/executionHistory.lock
# src/.gradle/5.4.1/fileHashes/fileHashes.bin
# src/.gradle/5.4.1/fileHashes/fileHashes.lock
# src/.gradle/5.4.1/fileHashes/resourceHashesCache.bin
# src/.gradle/5.4.1/javaCompile/javaCompile.lock
# src/.gradle/buildOutputCleanup/buildOutputCleanup.lock
# src/.gradle/buildOutputCleanup/outputFiles.bin
# src/.idea/caches/build_file_checksums.ser
# src/.idea/caches/gradle_models.ser
# src/.idea/sonarlint/issuestore/1/e/1eb2363b523dbcae43d3c6e4790c64436af61b13
# src/.idea/sonarlint/issuestore/3/e/3e688be40dc69cfd1062f41d0fc27fe261a26710
# src/.idea/sonarlint/issuestore/5/7/577f30d26378ec8a2bd2e4a43f3c79b3f04c402c
# src/.idea/sonarlint/issuestore/6/a/6a65e747031f27aef20597b4181148a9fbf963d5
# src/.idea/sonarlint/issuestore/a/7/a7641cfac724321d508c2a284223a711011a93f5
# src/.idea/sonarlint/issuestore/a/d/ad72331a1bed265bb9c0fe838faa74dbf69fce32
# src/.idea/sonarlint/issuestore/d/d/dd970bd8ce083850fca1d4d159647ccd110e57cb
# src/.idea/workspace.xml
# src/app/app.iml
# src/app/build.gradle
# src/app/build/intermediates/dex/debug/mergeDexDebug/out/classes.dex
# src/app/build/intermediates/incremental/packageDebug/tmp/debug/dex-renamer-state.txt
# src/app/build/intermediates/incremental/packageDebug/tmp/debug/zip-cache/dPcwR9oS2EmiImbvDZ1Qg_iwk3M=
# src/app/build/intermediates/javac/debug/classes/net/micode/notes/data/NotesDatabaseHelper.class
# src/app/build/intermediates/javac/debug/classes/net/micode/notes/data/NotesProvider.class
# src/app/build/intermediates/processed_res/debug/processDebugResources/out/resources-debug.ap_
# src/app/build/intermediates/transforms/dexBuilder/debug/0/net/micode/notes/data/NotesDatabaseHelper.dex
# src/app/build/intermediates/transforms/dexBuilder/debug/0/net/micode/notes/data/NotesProvider.dex
# src/app/build/outputs/apk/debug/app-debug.apk
# src/app/src/main/java/net/micode/notes/data/NotesProvider.java
|
2019-10-11 15:47:40 +08:00 |
|
ziji Wu
|
ccf0acedb5
|
Merge remote-tracking branch 'origin/ziji_wu' into develop
# Conflicts:
# src/.gradle/5.4.1/executionHistory/executionHistory.bin
# src/.gradle/5.4.1/executionHistory/executionHistory.lock
# src/.gradle/5.4.1/fileHashes/fileHashes.bin
# src/.gradle/5.4.1/fileHashes/fileHashes.lock
# src/.gradle/5.4.1/fileHashes/resourceHashesCache.bin
# src/.gradle/5.4.1/javaCompile/javaCompile.lock
# src/.gradle/buildOutputCleanup/buildOutputCleanup.lock
# src/.gradle/buildOutputCleanup/outputFiles.bin
# src/.idea/caches/build_file_checksums.ser
# src/.idea/caches/gradle_models.ser
# src/.idea/sonarlint/issuestore/1/e/1eb2363b523dbcae43d3c6e4790c64436af61b13
# src/.idea/sonarlint/issuestore/3/e/3e688be40dc69cfd1062f41d0fc27fe261a26710
# src/.idea/sonarlint/issuestore/5/7/577f30d26378ec8a2bd2e4a43f3c79b3f04c402c
# src/.idea/sonarlint/issuestore/6/a/6a65e747031f27aef20597b4181148a9fbf963d5
# src/.idea/sonarlint/issuestore/a/7/a7641cfac724321d508c2a284223a711011a93f5
# src/.idea/sonarlint/issuestore/a/d/ad72331a1bed265bb9c0fe838faa74dbf69fce32
# src/.idea/sonarlint/issuestore/d/d/dd970bd8ce083850fca1d4d159647ccd110e57cb
# src/.idea/workspace.xml
# src/app/app.iml
# src/app/build.gradle
# src/app/build/intermediates/dex/debug/mergeDexDebug/out/classes.dex
# src/app/build/intermediates/incremental/packageDebug/tmp/debug/dex-renamer-state.txt
# src/app/build/intermediates/incremental/packageDebug/tmp/debug/zip-cache/dPcwR9oS2EmiImbvDZ1Qg_iwk3M=
# src/app/build/intermediates/javac/debug/classes/net/micode/notes/data/NotesDatabaseHelper.class
# src/app/build/intermediates/javac/debug/classes/net/micode/notes/data/NotesProvider.class
# src/app/build/intermediates/processed_res/debug/processDebugResources/out/resources-debug.ap_
# src/app/build/intermediates/transforms/dexBuilder/debug/0/net/micode/notes/data/NotesDatabaseHelper.dex
# src/app/build/intermediates/transforms/dexBuilder/debug/0/net/micode/notes/data/NotesProvider.dex
# src/app/build/outputs/apk/debug/app-debug.apk
# src/app/src/main/java/net/micode/notes/data/NotesProvider.java
|
2019-10-11 09:11:09 +08:00 |
|
ziji Wu
|
f1c344fa9b
|
m
|
2019-10-11 09:05:56 +08:00 |
|
ziji Wu
|
7abe778b07
|
m
|
2019-10-11 09:04:59 +08:00 |
|
ziji Wu
|
28c432d2fa
|
comment
|
2019-10-11 09:02:14 +08:00 |
|
ziji Wu
|
c30e0a020d
|
comment more
|
2019-10-11 08:58:08 +08:00 |
|
ziji Wu
|
c23517c494
|
comment more
|
2019-10-10 21:19:39 +08:00 |
|
ziji Wu
|
8ecc3315ce
|
sdk 23
comment more
|
2019-10-10 20:49:27 +08:00 |
|
ziji Wu
|
a0ce16049b
|
comment
|
2019-10-10 19:59:41 +08:00 |
|
ziji Wu
|
f97578591f
|
comment
|
2019-10-10 19:42:49 +08:00 |
|
ziji Wu
|
4231e1220e
|
noteslistactivity
|
2019-10-10 10:14:26 +08:00 |
|
吴子吉
|
44d1000625
|
Merge branch 'qutian_Fang' into 'develop'
quntian_fang
See merge request !8
|
2019-10-10 09:42:35 +08:00 |
|
square group sky
|
5c7304d459
|
1
|
2019-10-08 20:02:48 +08:00 |
|
ziji Wu
|
ab216006c4
|
noteslistactivity
|
2019-10-08 17:50:38 +08:00 |
|
ziji Wu
|
88f0cdbffa
|
noteslistactivity
|
2019-10-08 17:45:02 +08:00 |
|
ziji Wu
|
deb170941a
|
noteslistactivity
|
2019-10-08 17:35:14 +08:00 |
|
ziji Wu
|
648f70b3b9
|
noteslistactivity
|
2019-10-08 17:24:18 +08:00 |
|
吴子吉
|
fe7d200181
|
Merge branch 'qutian_Fang' into 'develop'
ziji wu
none
See merge request !5
|
2019-10-07 12:24:07 +08:00 |
|
ziji Wu
|
9350aa9faf
|
pdf版
|
2019-10-07 12:19:02 +08:00 |
|
ziji Wu
|
3e43b4b411
|
终版
|
2019-10-07 12:16:43 +08:00 |
|
ziji Wu
|
c6a5710e3e
|
ziji
|
2019-10-07 12:07:46 +08:00 |
|
ziji Wu
|
381245d10d
|
noteslistactivity
|
2019-10-07 10:28:40 +08:00 |
|
ziji Wu
|
be043ac97f
|
noteslistactivity
|
2019-10-07 10:28:29 +08:00 |
|
ziji Wu
|
3d270fc2d7
|
noteslistactivity
|
2019-10-06 16:18:49 +08:00 |
|
ziji Wu
|
caec1560c8
|
ziji wu
|
2019-10-04 12:47:03 +08:00 |
|
ziji Wu
|
8c12d0d44c
|
noteslistactivity
|
2019-10-04 10:47:00 +08:00 |
|
ziji Wu
|
1872a76a36
|
noteslistactivity
|
2019-10-04 10:45:21 +08:00 |
|
ziji Wu
|
95ca41903d
|
noteslistadapter && noteslistactivity
|
2019-10-04 10:32:09 +08:00 |
|
ziji Wu
|
4ade19f858
|
noteslistadapter
|
2019-10-04 10:13:39 +08:00 |
|
ziji Wu
|
0e55da8e8d
|
introduction
|
2019-10-04 09:45:43 +08:00 |
|
ziji Wu
|
d1679c7da6
|
comment
|
2019-10-04 09:42:15 +08:00 |
|
ziji Wu
|
281a845005
|
ziji wu
|
2019-10-01 15:14:00 +08:00 |
|
square group sky
|
2b25434ccd
|
1
|
2019-10-01 02:02:51 +08:00 |
|
ziji Wu
|
2e71c876f1
|
2019/9/24
|
2019-09-24 09:47:35 +08:00 |
|
ziji Wu
|
bdc6b9cbd5
|
new
|
2019-09-23 22:56:12 +08:00 |