BUAA-SE-2023-Lab01-Group5

Commit Graph

Select branches

Hide Pull Requests

Feature-20351005

Student-20241069

Student-20241077

Student-20241085

Student-20351005

Student-20374319

dev

master

23c31feb7d Merge pull request 'xjx' (#21) from buaa20351005/BUAA-SE-2023-Lab01-Group5:Feature-20351005 into dev 1739887753153559019/tmp_refs/heads/dev 1739887753153559019/dev 1723394849673809357/tmp_refs/heads/dev 1723394849673809357/dev buaa20241069 2023-03-13 21:49:44 +0800
ead5364bf0 Merge branch 'dev' into Feature-20351005 Feature-20351005 20351005 2023-03-13 21:41:55 +0800
9202710b81 Merge pull request 'balabala' (#20) from mwlegj4uv/BUAA-SE-2023-Lab01-Group5:Feature-20374319 into dev buaa20241069 2023-03-13 17:30:15 +0800
8f5722e372 dwadasda Q9-K 2023-03-13 17:19:52 +0800
2888ac6b70 delete_pics Geoffrey 2023-03-13 17:10:21 +0800
0133c1faa6 Merge pull request '合并1' (#13) from mwlegj4uv/BUAA-SE-2023-Lab01-Group5:Feature-20374319 into dev buaa20241069 2023-03-13 17:05:03 +0800
64bc0887f4 Merge pull request '处理完冲突后推送至远程仓库并再次发起 PR 让组长审核' (#19) from buaa20241085/BUAA-SE-2023-Lab01-Group5:Feather-20241085 into dev buaa20241069 2023-03-13 16:58:21 +0800
8de2881013 处理冲突完成 DISGUISE 2023-03-13 16:50:09 +0800
42e66bcd60 1 DISGUISE 2023-03-13 16:48:23 +0800
71ca6b6cc0 Merge pull request '666' (#18) from buaa20241077/BUAA-SE-2023-Lab01-Group5:Feature-20241077 into dev buaa20241069 2023-03-13 11:45:31 +0800
87a1c8cce3 1 Valentin 2023-03-13 11:43:26 +0800
a0bbefbe67 Merge pull request '111' (#10) from buaa20241077/BUAA-SE-2023-Lab01-Group5:Feature-20241077 into dev buaa20241077 2023-03-13 11:38:11 +0800
9ffd888e67 1 Valentin 2023-03-13 11:28:14 +0800
26722254d5 1 Valentin 2023-03-13 11:23:25 +0800
0575d1ab1b 2 Valentin 2023-03-13 11:18:03 +0800
16c74c4a0e Merge pull request 'Pull Request' (#16) from Feature-20241069 into dev buaa20241069 2023-03-13 11:13:25 +0800
27862cf642 new_branch creat Geoffrey 2023-03-13 11:12:21 +0800
546c84be73 l10 20351005 2023-03-13 00:33:48 +0800
56ddac5819 dwada Student-20374319 Q9-K 2023-03-12 21:01:49 +0800
dff24e6fc6 issue图片 Q9-K 2023-03-12 20:54:00 +0800
4af568db79 Merge branch 'dev' into Feature-20374319 Q9-K 2023-03-12 20:45:50 +0800
04ff1d6ee4 Merge remote-tracking branch 'origin/dev' into dev Q9-K 2023-03-12 20:45:14 +0800
99aea97f57 变更main.py Q9-K 2023-03-12 20:09:02 +0800
0ec620f9bc Merge branch 'dev' into Feature-20374319 Q9-K 2023-03-12 20:05:10 +0800
29226558a5 变更main.py Q9-K 2023-03-12 20:04:23 +0800
018407df6b 变更main.py Q9-K 2023-03-12 20:03:32 +0800
6d764740e0 Merge remote-tracking branch 'origin/dev' into dev Q9-K 2023-03-12 20:03:20 +0800
ce64f50367 Merge pull request '向上游仓库的 dev 分支发起 Pull Request' (#11) from buaa20241085/BUAA-SE-2023-Lab01-Group5:Feather-20241085 into dev dev buaa20241085 2023-03-12 19:58:03 +0800
3d7255eafa 修改main.py 黎耀坤 2023-03-12 11:54:39 +0000
b39c444886 变更main.py Q9-K 2023-03-12 18:29:53 +0800
3724e25c85 branch_merged master Geoffrey 2023-03-12 14:19:57 +0800
03380292bb 1 Valentin 2023-03-12 13:49:38 +0800
9edce9f4f8 "1" Valentin 2023-03-12 13:26:49 +0800
a630370faa Update Function-20351005.py buaa20241069 2023-03-12 12:47:29 +0800
aafbcc4845 Update Function-20351005.py buaa20241069 2023-03-12 12:47:10 +0800
a8ad2de4c2 branch_merge Geoffrey 2023-03-12 12:14:49 +0800
50b07814e5 Merge branch 'dev' Geoffrey 2023-03-12 12:14:36 +0800
83d86f72b2 变更main.py Q9-K 2023-03-12 10:13:20 +0800
5cab566ec7 变更main.py Q9-K 2023-03-12 10:08:32 +0800
631958e97f 变更main.py Q9-K 2023-03-12 09:57:32 +0800
f7a3fbf4fe 没有问题 mwlegj4uv 2023-03-12 09:54:44 +0800
4798c8cc3d 修改function-20374319内容 Q9-K 2023-03-12 09:52:07 +0800
a7a77831d9 Merge pull request '向 dev 分支发起 Pull Request' (#8) from Feather-20241085 into dev buaa20241085 2023-03-12 01:13:55 +0800
99010adc0f 修改Function-20241085.py文件黎耀坤 2023-03-11 17:09:35 +0000
439659bbad ADD file via upload buaa20241077 2023-03-11 23:33:14 +0800
e193eb4963 Merge pull request 'qiuqiuning' (#7) from Feature-20241077 into dev buaa20241077 2023-03-11 23:29:40 +0800
bf19ba306e 1 zzr 2023-03-11 15:28:06 +0000
95bb69fbf1 Merge pull request 'Branch_Merge' (#5) from Feature-20241069 into dev buaa20241069 2023-03-11 22:21:33 +0800
10190fbf39 NewBranch_pull GeoffreyZhang 2023-03-11 13:56:36 +0000
e501d02ad9 ADD file via upload buaa20241069 2023-03-11 20:31:06 +0800
67a550a2af ADD file via upload buaa20241069 2023-03-11 20:30:46 +0800
ea0eb663cf new_push Student-20241069 GeoffreyZhang 2023-03-11 12:17:05 +0000
668fdc81e4 Delete 'Function-20241077.py' buaa20241069 2023-03-11 20:14:56 +0800
72a478f212 push_branch GeoffreyZhang 2023-03-11 12:13:30 +0000
1f2384aab1 Merge branch 'dev' of https://bdgit.educoder.net/buaa20241069/BUAA-SE-2023-Lab01-Group5 into dev zzr 2023-03-11 09:38:41 +0000
ccb7c0a6c4 Merge remote-tracking branch 'origin/dev2' 20351005 2023-03-11 17:37:34 +0800
27c9a9a31c Conflict Solved Q9-K 2023-03-11 17:35:59 +0800
f9db64360d Merge branch 'dev' of https://bdgit.educoder.net/buaa20241069/BUAA-SE-2023-Lab01-Group5 into dev2 zzr 2023-03-11 09:31:50 +0000
a6b26daeea Merge branch 'master' of https://bdgit.educoder.net/buaa20241069/BUAA-SE-2023-Lab01-Group5 20351005 2023-03-11 17:31:46 +0800
73d77b3b22 Merge 黎耀坤 2023-03-11 09:27:44 +0000
31764a1b90 save Student-20241085 黎耀坤 2023-03-11 09:23:59 +0000
c02e4ad40a dbwadwada Q9-K 2023-03-11 17:21:07 +0800
edcd46cbf8 1 Student-20241077 zzr 2023-03-11 09:15:48 +0000
34aaf22ac4 Merge branch 'dev' of https://bdgit.educoder.net/buaa20241069/BUAA-SE-2023-Lab01-Group5 into dev 黎耀坤 2023-03-11 09:14:23 +0000
d6412d0cbb 1 zzr 2023-03-11 09:14:15 +0000
6b9aa98d50 3433 黎耀坤 2023-03-11 09:12:20 +0000
c2d3da48c6 Merge branch 'dev' of https://bdgit.educoder.net/buaa20241069/BUAA-SE-2023-Lab01-Group5 into Student-20241077 zzr 2023-03-11 09:12:06 +0000
b839f6417d 32 黎耀坤 2023-03-11 09:12:00 +0000
898eb8b75e Update README.md buaa20241069 2023-03-11 17:09:44 +0800
ff2c4a05cc 2 zzr 2023-03-11 09:08:14 +0000
7c92a81039 Update main.py buaa20241069 2023-03-11 17:04:07 +0800
7266520779 Merge branch 'dev' of https://bdgit.educoder.net/buaa20241069/BUAA-SE-2023-Lab01-Group5 into dev 黎耀坤 2023-03-11 09:03:48 +0000
4eb2d2396b jgjgjg zzr 2023-03-11 09:02:40 +0000
8f02016f86 1 zzr 2023-03-11 09:01:22 +0000
ebfdbf46dc 删除黎耀坤 2023-03-11 08:59:18 +0000
8cb878a7ac Merge branch 'dev' of https://bdgit.educoder.net/buaa20241069/BUAA-SE-2023-Lab01-Group5 into dev zzr 2023-03-11 08:55:48 +0000
30c1bbdbdd 修改py文件黎耀坤 2023-03-11 08:54:22 +0000
3b84b97d9f Merge branch 'Student-20374319' into dev Q9-K 2023-03-11 16:52:19 +0800
f4147c625c 添加Function-20241085.py 黎耀坤 2023-03-11 08:50:30 +0000
29bb1a381a 添加Function-20241085.py 黎耀坤 2023-03-11 08:47:58 +0000
840c30cfd0 kujgiuhk 221 2023-03-11 08:47:29 +0000
79dfdd45e7 q21313221 221 2023-03-11 08:44:25 +0000
bf909de959 push 1 Q9-K 2023-03-11 16:38:53 +0800
924445509a p2 20351005 2023-03-11 16:28:45 +0800
395bafdf17 m1 20351005 2023-03-11 16:27:27 +0800
a6df5a58bc push 1 Q9-K 2023-03-11 15:44:11 +0800
f177a54932 Merge branch 'xjx-20351005' into dev 20351005 2023-03-11 16:19:55 +0800
34a3143f1f py2 Student-20351005 20351005 2023-03-11 16:18:44 +0800
319ce494d0 ADD file via upload buaa20241069 2023-03-11 16:17:08 +0800
a3873d9128 fun 20351005 2023-03-11 16:11:05 +0800
5e50e8eae7 Initial commit buaa20241069 2023-03-11 15:30:40 +0800