BUAA-SE-2023-Lab01-Group20

Commit Graph

Select branches

Hide Pull Requests

Feature-21371334

Feature-21373129

Student-21371334

Student-21371363

Student-21373129

Student-21373135

Student-21373138

dev

master

#1

#10

#11

#12

#13

#14

#15

#16

#17

#18

#19

#2

#3

#4

#5

#6

#7

#8

#9

833a691d32 Merge pull request 'pr' (#12) from buaa21373138/BUAA-SE-2023-Lab01-Group20:Feature-21373138 into dev master dev buaa21373129 2023-03-13 13:48:11 +0800
db967337cf Conflict Solved #19 何宇楷 2023-03-13 09:03:10 +0800
b6c06c0a88 10-3 何宇楷 2023-03-13 09:01:23 +0800
e284739c03 4 #18 Heyukai 2023-03-12 23:54:14 +0800
0709aba02c 1 Feature-21371334 Heyukai 2023-03-12 23:51:16 +0800
c26f053986 解决冲突 #17 陈子恒 2023-03-12 23:42:24 +0800
daae918872 1 Heyukai 2023-03-12 23:23:02 +0800
321f8c04f4 21371334 #13 Heyukai 2023-03-12 23:07:07 +0800
bd136a5adb Confict Solved #12 夏厚敬 2023-03-12 22:58:40 +0800
5184212020 Merge branch 'dev' into Feature-21371334 Heyukai 2023-03-12 22:47:54 +0800
4da09d5fcf 21371334 Heyukai 2023-03-12 22:46:20 +0800
0fb1c5f13c RP 陈子恒 2023-03-12 22:45:57 +0800
045e8560e4 Conflict Solved #16 #14 李扬 2023-03-12 22:39:13 +0800
c56992def7 Merge pull request '21373129' (#15) from Feature-21373129 into dev buaa21373129 2023-03-12 22:25:40 +0800
8fbb1fcd0f 10-3-1 李扬 2023-03-12 22:17:21 +0800
88d14ab244 21371334 Heyukai 2023-03-12 22:16:36 +0800
95f6de5450 21371334 Heyukai 2023-03-12 22:15:39 +0800
d3e73e7490 21373129 #15 Feature-21373129 王剑飞 2023-03-12 22:15:25 +0800
c6a3398958 1 夏厚敬 2023-03-12 22:15:16 +0800
0b4fa3588c Merge branch 'dev' 王剑飞 2023-03-12 22:01:58 +0800
d166874303 Merge pull request '1' (#9) from Feature-21371334 into dev buaa21373129 2023-03-12 22:00:28 +0800
9dd86f3cd9 Merge pull request 'Feature-21371363' (#7) from Feature-21371363 into dev buaa21373129 2023-03-12 22:00:19 +0800
879d0c0e53 Merge pull request 'Feature-21373135 -> dev' (#8) from Feature-21373135 into dev buaa21373129 2023-03-12 22:00:10 +0800
c94e9526d1 Merge pull request '21373129request' (#10) from Feature-21373129 into dev buaa21373129 2023-03-12 21:57:18 +0800
73f79cd991 Merge pull request '111111111' (#11) from Feature-21373138 into dev buaa21373129 2023-03-12 21:56:52 +0800
3fb06003a3 21373129 #10 王剑飞 2023-03-12 21:53:42 +0800
e544dbed26 单人PR #11 夏厚敬 2023-03-12 21:36:05 +0800
0989e7d09f 10-2-2 #8 李扬 2023-03-12 21:27:26 +0800
53d6a366ec 21371334 #9 Heyukai 2023-03-12 21:25:23 +0800
4684afc29c 21371334 Heyukai 2023-03-12 21:24:44 +0800
c878fc63db 21371363 #7 #2 #1 陈子恒 2023-03-12 21:22:59 +0800
30660bc5a7 21371334 #3 Heyukai 2023-03-12 21:18:05 +0800
494bc66313 Merge branch 'dev' 王剑飞 2023-03-12 21:14:11 +0800
5b9b34b090 Conflict Solved 陈子恒 2023-03-12 21:11:57 +0800
94ed0263b2 21373138 陈子恒 2023-03-12 21:09:07 +0800
21d9db4d02 21373138 陈子恒 2023-03-12 21:08:53 +0800
5a5c55f5b5 1 陈子恒 2023-03-12 21:03:12 +0800
3105a27518 21371334 Student-21371334 Heyukai 2023-03-12 20:57:01 +0800
e05af69a34 Conflict Solved 陈子恒 2023-03-12 20:52:14 +0800
11998ea7e8 test 陈子恒 2023-03-12 20:44:02 +0800
de4c348189 Conflict Solved Heyukai 2023-03-12 19:36:47 +0800
7473e99ec8 Merge branch 'Student-21371334' into dev Heyukai 2023-03-12 19:36:24 +0800
b4ae74f035 21371334 Heyukai 2023-03-12 19:36:09 +0800
3eb6554e8e 10-2-1 #6 李扬 2023-03-12 19:30:50 +0800
8419a88078 21371334 Heyukai 2023-03-12 19:25:49 +0800
32f6e567fd 21371334 Heyukai 2023-03-12 19:25:22 +0800
833328a550 21371334 Heyukai 2023-03-12 19:19:19 +0800
f93cb26398 Merge branch 'dev' of https://bdgit.educoder.net/buaa21373129/BUAA-SE-2023-Lab01-Group20 into dev Heyukai 2023-03-12 19:17:57 +0800
f321baf7b4 10-2-1 #5 夏厚敬 2023-03-12 19:17:21 +0800
492d03a7ae Merge branch 'Student-21371334' into dev Heyukai 2023-03-12 19:16:33 +0800
f60c781acc 21371334 Heyukai 2023-03-12 19:16:03 +0800
51ef83bbc1 21373129 #4 王剑飞 2023-03-12 19:15:29 +0800
3381bec46f 21371334 Heyukai 2023-03-12 19:08:52 +0800
4701a749f0 Conflict Solved 夏厚敬 2023-03-12 19:07:39 +0800
6fc47ffb28 21373138 夏厚敬 2023-03-12 19:06:41 +0800
fc2e402d65 Conflict Solved 李扬 2023-03-12 18:53:51 +0800
2a6b401eda add_main 李扬 2023-03-12 18:53:04 +0800
beaa68962d Conflict Solved 李扬 2023-03-12 18:49:42 +0800
062ecb287f new 王剑飞 2023-03-12 13:06:02 +0800
8006cd1599 new Student-21373129 王剑飞 2023-03-12 12:50:59 +0800
181e0ec99b 21373129 王剑飞 2023-03-12 12:33:13 +0800
96b8be4fb3 main.py Student-21371363 陈子恒 2023-03-12 12:00:02 +0800
09c612fe38 add_main 李扬 2023-03-12 11:04:59 +0800
11e7bbf13e Merge branch 'dev' of https://bdgit.educoder.net/buaa21373129/BUAA-SE-2023-Lab01-Group20 into dev 陈子恒 2023-03-11 23:56:06 +0800
f8fc8eab5f 21371334 Heyukai 2023-03-11 23:52:46 +0800
9a4266141a Merge branch 'dev' of https://bdgit.educoder.net/buaa21373129/BUAA-SE-2023-Lab01-Group20 into dev Heyukai 2023-03-11 23:48:03 +0800
52a0507b3a Merge branch 'Student-21371334' into dev Heyukai 2023-03-11 23:47:57 +0800
f20b156c07 21371334 Heyukai 2023-03-11 23:47:13 +0800
96b244d46a Name 陈子恒 2023-03-11 23:27:56 +0800
fe999c2ca2 Merge branch 'dev' of https://bdgit.educoder.net/buaa21373129/BUAA-SE-2023-Lab01-Group20 into dev 陈子恒 2023-03-11 23:02:05 +0800
39a9a8371e Merge branch 'dev' of https://bdgit.educoder.net/buaa21373129/BUAA-SE-2023-Lab01-Group20 into dev Heyukai 2023-03-11 22:51:09 +0800
d517d973ec 21371334 Heyukai 2023-03-11 22:51:03 +0800
f19b56fcb7 Merge branch 'Student-21373138' into dev 夏厚敬 2023-03-11 22:41:08 +0800
8ec18a1fc1 21373138 Student-21373138 夏厚敬 2023-03-11 22:39:47 +0800
d88a6318b8 Merge branch 'dev' of https://bdgit.educoder.net/buaa21373129/BUAA-SE-2023-Lab01-Group20 into Student-21371363 陈子恒 2023-03-11 17:25:48 +0800
d7dd598965 pushmain 王剑飞 2023-03-11 17:24:41 +0800
dd1f6dd237 Function-21371363.py 陈子恒 2023-03-11 17:23:49 +0800
94ab22b46e Merge branch 'dev' of https://bdgit.educoder.net/buaa21373129/BUAA-SE-2023-Lab01-Group20 into dev Heyukai 2023-03-11 17:14:50 +0800
6a8864d98d 1 Heyukai 2023-03-11 17:14:02 +0800
eca0850988 Merge branch 'Student-21373135' into dev 李扬 2023-03-11 17:10:20 +0800
73c3e6f6d4 1 Heyukai 2023-03-11 17:09:05 +0800
677ef54940 Merge remote-tracking branch 'origin/dev' into Student-21371334 Heyukai 2023-03-11 17:07:50 +0800
d11a17cfb7 test1 Student-21373135 李扬 2023-03-11 17:04:43 +0800
7db9d6658a test 王剑飞 2023-03-11 17:03:38 +0800
7d8ce4036d test 王剑飞 2023-03-11 16:59:43 +0800
a9ee43f2c9 1 Heyukai 2023-03-11 16:45:13 +0800
4790910378 Initial commit buaa21373129 2023-03-11 15:30:27 +0800