Group11

Commit Graph

Select branches

Hide Pull Requests

Feature-20231159

Feature-21371101

Feature-21373067

Feature-21373081

Student-20231159

Student-21371101

Student-21371396

Student-21373067

dev

master

student-21373081

#1

#10

#11

#12

#13

#14

#15

#16

#17

#18

#19

#2

#20

#21

#22

#23

#24

#25

#26

#27

#28

#29

#3

#4

#5

#6

#7

#8

#9

4d93d921e4 10 #29 #28 zhr 2023-03-13 19:49:29 +0800
43a546134e 9 zhr 2023-03-13 19:11:51 +0800
6d2b9cbe24 8 #26 #25 zhr 2023-03-13 19:06:55 +0800
80b489d178 restart #27 #24 陶佑鹏 2023-03-13 19:05:56 +0800
4d851f7932 7 #20 zhr 2023-03-13 19:04:06 +0800
bbef659dcb try 陶佑鹏 2023-03-13 18:59:03 +0800
ce46061d73 Merge branch 'dev' of https://bdgit.educoder.net/buaa21373067/Group11 into Feature-21373081 陶佑鹏 2023-03-13 18:52:06 +0800
b3a18b6b53 6 #19 zhr 2023-03-13 17:45:20 +0800
4a3fbb2405 5 #17 #16 zhr 2023-03-13 17:28:45 +0800
1464b7a9a3 4 zhr 2023-03-13 17:26:47 +0800
adce1163a1 10.3.7 已更改为组长学号 #23 #22 #21 #18 #14 陶佑鹏 2023-03-13 17:11:24 +0800
6bcc2668e7 2 #12 zhr 2023-03-13 17:02:09 +0800
3cd0e2bbba Merge pull request 'feature-21371396与dev二次合并申请（main.py修改为了组长的学号）' (#15) from buaa21371396/Group11:Feature-21371396 into dev master dev buaa21373067 2023-03-13 17:01:30 +0800
50b2f04e5f 1.3.7 #15 buaa21371396 2023-03-13 16:45:54 +0800
ded818c648 1.3.7 buaa21371396 2023-03-13 16:44:20 +0800
05534b8c7a Merge pull request '10.3.7 陶佑鹏' (#13) from buaa21373081/Group11:Feature-21373081 into Feature-21373081 Feature-21373081 buaa21373067 2023-03-13 16:30:50 +0800
e6e57349e5 Merge pull request 'feature-21371396与dev合并申请' (#11) from buaa21371396/Group11:Feature-21371396 into dev buaa21373067 2023-03-13 16:30:40 +0800
17f6d72140 try zhr 2023-03-13 15:54:15 +0800
5b4b5213b9 3.4 #11 buaa21371396 2023-03-13 15:49:37 +0800
c1d2496df0 Merge pull request 'zzc_request' (#10) from buaa20231159/Group11:Feature-20231159 into Feature-20231159 Feature-20231159 buaa20231159 2023-03-13 15:01:11 +0800
b8a4cbeb58 123 #10 Gabriel1159 2023-03-13 15:00:32 +0800
8f9fe885f3 Merge branch 'dev' into Feature-21373081 #13 陶佑鹏 2023-03-13 14:04:20 +0800
883213ab50 Merge pull request 'zzc_request' (#9) from buaa20231159/Group11:Feature-20231159 into dev Feature-21371101 buaa20231159 2023-03-13 12:08:18 +0800
13e5a756c6 0313 #9 Gabriel1159 2023-03-13 12:07:04 +0800
3001a2c031 Merge pull request '10-3-5-yhf' (#8) from Feature-21373067 into dev buaa21373067 2023-03-13 11:44:38 +0800
043690a861 10.3.5 #8 Feature-21373067 AlpaCa 2023-03-13 11:42:46 +0800
0c35dd5f48 0313-2 Gabriel1159 2023-03-13 11:32:06 +0800
3ffcd053fd 0313 #7 Gabriel1159 2023-03-13 11:28:05 +0800
593176b4c2 Conflict Solved Gabriel1159 2023-03-13 11:10:36 +0800
f47b45257e ConflictSolved buaa21371396 2023-03-13 10:57:31 +0800
16d8332db8 ... Student-21371396 buaa21371396 2023-03-13 10:54:29 +0800
9e6964f0a7 .. buaa21371396 2023-03-13 10:50:59 +0800
6c94600e2b 0313 Student-20231159 Gabriel1159 2023-03-13 10:27:20 +0800
432a9c2755 Merge branch 'dev' of https://bdgit.educoder.net/buaa21373067/Group11 into dev Gabriel1159 2023-03-13 10:20:52 +0800
656599cf29 Merge pull request 'feature-21371396与dev合并申请' (#5) from Feature-21371396 into dev buaa21373067 2023-03-13 10:20:41 +0800
96fe7f643a Conflict Solved Gabriel1159 2023-03-13 10:20:36 +0800
851b55c5b3 Conflict Solved Gabriel1159 2023-03-13 10:19:20 +0800
ea1a241e20 0313 Gabriel1159 2023-03-13 10:13:57 +0800
1a2f094197 3013 Gabriel1159 2023-03-13 10:12:38 +0800
8db4b70d29 change #5 buaa21371396 2023-03-13 09:53:36 +0800
3f017f2865 . buaa21371396 2023-03-13 09:30:50 +0800
474994c199 新分支推送至各自的远程仓库 #4 陶佑鹏 2023-03-13 08:51:26 +0800
1cd627e2d1 Confilict Solved AlpaCa 2023-03-13 08:23:57 +0800
db0f741b36 Merge pull request '将新分支推送至远程仓库并向 dev 分支发起 Pull Request' (#2) from Feature-21371101 into dev buaa21373067 2023-03-13 08:08:02 +0800
b770be9409 Merge pull request '10-4-yhf' (#3) from Feature-21373067 into dev buaa21373067 2023-03-13 08:07:46 +0800
27ead23f91 10-4-yhf #3 AlpaCa 2023-03-13 08:06:06 +0800
712b367fcf try #2 zhr 2023-03-12 22:09:13 +0800
6bbad6a97f add Feature-21373081 #1 陶佑鹏 2023-03-12 11:25:48 +0800
76d3020b09 Conflict Solved AlpaCa 2023-03-11 20:13:52 +0800
d6195402ca Conflict Solved zhr 2023-03-11 20:08:50 +0800
d4b11980de test Student-21371101 zhr 2023-03-11 20:05:19 +0800
05e6efade4 Merge branch 'Student-21371101' into dev zhr 2023-03-11 19:07:13 +0800
007572a898 ttest zhr 2023-03-11 19:03:20 +0800
8b5cf10474 solve AlpaCa 2023-03-11 19:02:07 +0800
592674905e 21371396 buaa21371396 2023-03-11 18:55:56 +0800
0bb6a6d16d . buaa21371396 2023-03-11 18:53:05 +0800
4a036e8473 Merge branch 'dev' of https://bdgit.educoder.net/buaa21373067/Group11 into dev buaa21371396 2023-03-11 18:51:19 +0800
2aa55d3ce0 change py buaa21371396 2023-03-11 18:50:58 +0800
6005b0eb18 test zhr 2023-03-11 17:39:28 +0800
d4620e5241 test zhr 2023-03-11 17:37:30 +0800
48f436391b Merge branch 'student-21373081' into dev 陶佑鹏 2023-03-11 17:29:57 +0800
20ef287cd2 Merge branch 'dev' of https://bdgit.educoder.net/buaa21373067/Group11 into dev buaa21371396 2023-03-11 17:27:14 +0800
81a21a8634 21373081 main.py21373081 student-21373081 陶佑鹏 2023-03-11 17:25:45 +0800
2b72727ab6 Merge branch 'dev' of https://bdgit.educoder.net/buaa21373067/Group11 into dev buaa21371396 2023-03-11 17:24:48 +0800
148affa07a Merge branch 'Student-21373067' into dev AlpaCa 2023-03-11 17:24:39 +0800
ae11e191bf 213730812137308121373081213730812137308121373081213730812137308121373081213730812137308121373081213730812137308121373081213730812137308121373081213730812137308121373081 陶佑鹏 2023-03-11 17:21:54 +0800
47ca447086 123 Gabriel1159 2023-03-11 17:19:43 +0800
1fb103beb7 Merge branch 'dev' of https://bdgit.educoder.net/buaa21373067/Group11 into dev buaa21371396 2023-03-11 17:18:40 +0800
d7005f2172 Merge branch 'dev' of https://bdgit.educoder.net/buaa21373067/Group11 into dev Gabriel1159 2023-03-11 17:17:21 +0800
ef52172d0f Merge branch 'Student-20231159' into dev Gabriel1159 2023-03-11 17:17:05 +0800
044b522a8d Merge branch 'Student-21371101' into dev zhr 2023-03-11 17:16:32 +0800
8274272691 asd Gabriel1159 2023-03-11 17:16:00 +0800
4ffdbd0bfd 2 zhr 2023-03-11 17:14:46 +0800
25fdfce40b Merge branch 'dev' of https://bdgit.educoder.net/buaa21373067/Group11 into dev zhr 2023-03-11 17:09:18 +0800
8b2bfea65a Merge branch 'Student-21371396' into dev buaa21371396 2023-03-11 17:05:06 +0800
22722225f3 修改py文件 buaa21371396 2023-03-11 17:04:08 +0800
0a665f79b7 Merge branch 'Student-21371101' into dev buaa21371396 2023-03-11 17:02:32 +0800
dee9fa840d Merge branch 'dev' of https://bdgit.educoder.net/buaa21373067/Group11 into dev Gabriel1159 2023-03-11 17:01:05 +0800
2cbf3159de Merge branch 'Student-21371101' into dev zhr 2023-03-11 17:00:46 +0800
81c2e401a8 1 zhr 2023-03-11 16:56:20 +0800
8f51826958 添加.py文件 buaa21371396 2023-03-11 16:56:06 +0800
cd4224b47c 8-yhf Student-21373067 AlpaCa 2023-03-11 16:54:50 +0800
34d53079a8 Merge branch 'student-21373081' of https://bdgit.educoder.net/buaa21373067/Group11 into Student-20231159 Gabriel1159 2023-03-11 16:49:19 +0800
a2eb2df8e1 Merge branch 'Student-21373067' into dev AlpaCa 2023-03-11 16:49:05 +0800
c9a3d44ea6 Merge branch 'Student-21371396' of https://bdgit.educoder.net/buaa21373067/Group11 into Student-20231159 Gabriel1159 2023-03-11 16:48:35 +0800
437cf3c8e2 shj buaa21371396 2023-03-11 16:43:58 +0800
cf3aa97fe0 add Function 21370381.py 陶佑鹏 2023-03-11 16:43:52 +0800
b12fad4ba7 5-yhf AlpaCa 2023-03-11 16:27:05 +0800
ef29c54be2 5-yhf AlpaCa 2023-03-11 16:05:01 +0800
69da94e654 2 AlpaCa 2023-03-11 16:01:25 +0800
4bd0b2eee7 2 #6 AlpaCa 2023-03-11 15:35:49 +0800
fbca68f636 Initial commit buaa21373067 2023-03-11 15:04:24 +0800