Commit Graph

Select branches

Hide Pull Requests

develop

hxs_xiaomi1

hxs_xiaomi2

lixiang

luoxinxin

master

remotes/origin/lixiang

tanxiaolong_branch

#1

#10

#11

#12

#13

#14

#15

#16

#17

#18

#19

#2

#20

#21

#22

#23

#3

#4

#5

#6

#7

#8

#9

Mono Color

• 19392d7189 Merge pull request '最终维护报告 by 谈晓龙' (#23) from luoxinxin into master master pbyhqr72x 2021-12-31 09:30:31 +0800
• 0f06910773 提交维护报告 develop pbyhqr72x 2021-12-31 09:30:05 +0800
• 6f06a96998 Merge pull request '1' (#21) from luoxinxin into tanxiaolong_branch #22 tanxiaolong_branch pbyhqr72x 2021-12-31 09:27:41 +0800
• 7c4aedeb93 提交最终维护报告 by 谈晓龙 #23 #21 luoxinxin xxl 2021-12-31 09:26:40 +0800
• f3357a91ef ADD file via upload p5p4z86nr 2021-12-30 17:26:25 +0800
• 4de2b2cea7 Merge pull request '最终版本 assets放在main目录下' (#20) from develop into master pbyhqr72x 2021-12-23 15:41:32 +0800
• 08f3ec7c1a Merge pull request '最终版本 注意assets放在main目录下' (#19) from luoxinxin into develop #20 pbyhqr72x 2021-12-23 15:40:51 +0800
• 0bbb5e0bf0 最终版本 #19 xxl 2021-12-23 15:39:23 +0800
• 6a16f3c4d1 11 #18 hxs_xiaomi1 Aoi 2021-12-22 16:03:52 +0800
• 7474af1905 Delete 'src/Notes-master/res/AndroidManifest.xml' pbyhqr72x 2021-12-22 15:56:40 +0800
• b64096cbd5 Merge pull request 'sync' (#17) from develop into master pbyhqr72x 2021-12-22 15:53:57 +0800
• 3d429f238d sync #17 pbyhqr72x 2021-12-22 15:53:22 +0800
• 775d22645f sync #16 xxl 2021-12-22 15:52:50 +0800
• 00dc58e80a Merge branch 'master' of https://bdgit.educoder.net/pbyhqr72x/Xiao_Mi_promote into luoxinxin xxl 2021-12-22 15:50:41 +0800
• 06518a8f34 Delete 'doc/开源软件维护.docx' pbyhqr72x 2021-12-22 15:47:20 +0800
• 311fb81dc4 ppt xxl 2021-12-22 15:46:23 +0800
• c070419617 Merge remote-tracking branch 'origin/hxs_xiaomi1' into luoxinxin xxl 2021-12-22 15:36:25 +0800
• 71695c874a 11 #15 Aoi 2021-12-18 00:31:04 +0800
• 6d35b9476a tongyi pbyhqr72x 2021-12-15 19:41:15 +0800
• 52e29900d5 增加功能： 1、登录注册功能、并且登录的时候会自动下载云端对应账号的便签内容 2、云数据库储存便签内容 3、支持便签的上传和下载数据 #14 xxl 2021-12-13 15:02:20 +0800
• 00d5be128e bug lixiang 李想 2021-12-08 10:40:12 +0800
• 8c397f596a 修改字体功能 Signed-off-by: Aoi <916327053@qq.com> #13 hxs_xiaomi2 Aoi 2021-11-17 20:20:08 +0800
• d01c3b5117 Merge pull request '小米便签1.1.2 修改了新建文件夹有设置密码弹窗的bug' (#12) from develop into master pbyhqr72x 2021-11-17 19:48:46 +0800
• fa5b5fd66f 同意 #12 pbyhqr72x 2021-11-17 19:46:35 +0800
• 953edd0d8a 修改创建文件夹会有检验密码弹窗的bug #11 xxl 2021-11-17 19:43:18 +0800
• 87216814a8 同意 pbyhqr72x 2021-11-17 17:17:12 +0800
• 8ca916b8a4 同意 #10 pbyhqr72x 2021-11-17 17:15:25 +0800
• d330687bad 完善维护了密码功能包括： 1、用Activity实现密码检验 2、设置密码和删除密码逻辑的完善 3、加密便签内容不可见和加密标志的添加 #9 xxl 2021-11-17 17:11:26 +0800
• 58c45909b8 Merge pull request 'bug修复' (#8) from lixiang into develop pbyhqr72x 2021-11-10 17:00:14 +0800
• 2a42d48dbb Merge branch 'master' of https://bdgit.educoder.net/pbyhqr72x/Xiao_Mi_promote into luoxinxin xxl 2021-11-10 16:50:31 +0800
• e012e4479f 小米便签1.1:密码功能+置顶功能 xxl 2021-11-10 16:35:44 +0800
• 58a9b5461a bug修改 #8 李想 2021-11-10 10:46:54 +0800
• b13f11bdde Merge branch 'lixiang' of https://bdgit.educoder.net/pbyhqr72x/Xiao_Mi_promote into remotes/origin/lixiang remotes/origin/lixiang 李想 2021-11-10 10:43:33 +0800
• 0e8934378d bug修改 李想 2021-11-10 10:42:13 +0800
• 1f76f6a8c1 分析 李想 2021-11-10 10:39:46 +0800
• 01a4fdd656 代码分析 李想 2021-11-10 10:38:17 +0800
• 652c61b8d9 同意 pbyhqr72x 2021-11-10 09:03:39 +0800
• 1a6ea7fb5e 完善了增加密码功能： 验证密码通过一个Avtivity实现 增加删除密码功能，删除密码需要再次验证密码。 解决了之前版本新建便签时会报错的bug 解决了新建便签仍然需要密码验证且默认密码为0的bug 主要修改： 修改了AndroidManifest.xml文件，增加了一个新的Activity 增加了一个activity_password.xml文件作为验证密码时的布局 对于验证密码、修改密码、设置密码等相关代码打包成了函数。 #7 xxl 2021-11-10 08:57:51 +0800
• d1df4a314a Merge pull request '简单置顶功能' (#6) from hxs_xiaomi2 into develop phmsuvtwa 2021-11-10 08:32:42 +0800
• 172705ab5a 同意 pbyhqr72x 2021-11-10 08:29:52 +0800
• 603bb850b9 同意 pbyhqr72x 2021-11-10 08:26:26 +0800
• 9843c01c9e xiaomibianqian #6 #5 Aoi 2021-11-09 20:58:56 +0800
• b185c59467 小米便签 Signed-off-by: Aoi <916327053@qq.com> Aoi 2021-11-09 20:56:45 +0800
• b2da26bb48 1 李想 2021-11-02 22:05:30 +0800
• acaedfb5c5 增加密码设置功能之后代码 #4 xxl 2021-11-01 16:52:37 +0800
• ee94a7e1c3 Merge branch 'master' of https://bdgit.educoder.net/pbyhqr72x/Xiao_Mi_promote xxl 2021-10-29 11:07:09 +0800
• 7825157d34 提交小米便签源码，修改基于此源码上，修改完毕后请及时提交请求合并。 xxl 2021-10-29 11:02:56 +0800
• 2b53cead21 同意 pbyhqr72x 2021-10-22 21:12:09 +0800
• c49a3ea049 补充模板 #3 xxl 2021-10-22 21:10:19 +0800
• 46f2530434 接受 pbyhqr72x 2021-10-22 21:09:20 +0800
• d556d8a19a 删除模板 #2 xxl 2021-10-22 21:08:15 +0800
• db447391ca Merge branch 'master' of https://bdgit.educoder.net/pbyhqr72x/Xiao_Mi_promote into luoxinxin xxl 2021-10-22 21:03:42 +0800
• 536e117436 提交模板 xxl 2021-10-22 20:41:54 +0800
• e46abc7efa 完善一下2.1 2.2 #1 xxl 2021-10-14 20:07:20 +0800
• 7fafef7a7b 完成2.1、2.2 xxl 2021-10-14 20:00:46 +0800
• 460a900527 创建doc文件夹 xxl 2021-10-13 20:59:39 +0800
• 757c619c08 Signed-off-by: xxl <2532500952@qq.com> 提交模板 xxl 2021-10-13 20:51:17 +0800
• 598aad3044 Initial commit pbyhqr72x 2021-10-13 17:00:25 +0800