 顾婧玟
|
89c80d3dbe
|
Revert "Merge branch 'gjw_branch' into develop"
This reverts commit c7158a27cd, reversing
changes made to 9d1b75bdd8.
|
4 months ago |
|
顾婧玟
|
c7158a27cd
|
Merge branch 'gjw_branch' into develop
# Conflicts:
# .idea/inspectionProfiles/Project_Default.xml
# .idea/inspectionProfiles/profiles_settings.xml
|
4 months ago |
|
顾婧玟
|
fffde1057e
|
gjw
|
4 months ago |
|
顾婧玟
|
9d1b75bdd8
|
Merge remote-tracking branch 'origin/gjw_branch' into develop
# Conflicts:
# .idea/django.iml
# .idea/workspace.xml
# src/DjangoBlog-master_1/.idea/DjangoBlog-master.iml
|
4 months ago |
|
顾婧玟
|
2a4d61db1d
|
代码注释
|
4 months ago |
 LiuR
|
1ab32f6792
|
Merge branch 'develop' of https://bdgit.educoder.net/p3mk6vbs7/Django into develop
|
4 months ago |
|
LiuR
|
ad10b1899e
|
merge it
|
4 months ago |
 cheese-egg-yolk
|
8504741f5b
|
Merge branch 'develop' of https://bdgit.educoder.net/p3mk6vbs7/Django into develop
|
4 months ago |
|
cheese-egg-yolk
|
3169b238cb
|
Merge branch 'hjn_branch' into develop
|
4 months ago |
|
cheese-egg-yolk
|
0819044632
|
滚
|
4 months ago |
 xm
|
f4d1fc2a90
|
添加.gitignore，忽略IDE配置文件
|
4 months ago |
|
xm
|
4903c5dc91
|
修复嵌套仓库问题，添加DjangoBlog项目文件
|
4 months ago |
|
xm
|
e8f91c1633
|
解决合并冲突：处理doc/报告.docx文件
|
4 months ago |
|
xm
|
53c15adc39
|
解决合并冲突：决定保留/删除 doc/报告.docx
|
4 months ago |
|
cheese-egg-yolk
|
3d2f28dc80
|
Merge branch 'hjn_branch' into develop
|
4 months ago |
|
plqo32bax
|
d78f18e2c8
|
Update context_processors.py
|
4 months ago |
|
cheese-egg-yolk
|
0c459e1ea7
|
Merge branch 'hjn_branch' of https://bdgit.educoder.net/p3mk6vbs7/Django into hjn_branch
|
4 months ago |
|
cheese-egg-yolk
|
01d2fe0a52
|
提交信息，描述本次代码变更内容
|
4 months ago |
|
LiuR
|
3ac7d80342
|
change
|
4 months ago |
|
顾婧玟
|
772740ccd2
|
Merge branch 'develop' of https://bdgit.educoder.net/p3mk6vbs7/Django into develop
|
4 months ago |
|
顾婧玟
|
974028882d
|
解决合并冲突，完成 gjw_branch 到 develop 的合并
|
4 months ago |
|
xm
|
78bf2ede9c
|
Merge branch 'xm_branch' into develop
|
4 months ago |
|
xm
|
9a39ad406c
|
解决合并冲突
|
4 months ago |
|
p3mk6vbs7
|
8581d5796c
|
Update manage.py
|
4 months ago |
|
pofyban6j
|
f13212511d
|
Update django.iml
|
4 months ago |
|
pofyban6j
|
12905bd281
|
Update profiles_settings.xml
|
4 months ago |
|
pofyban6j
|
6886087ae7
|
Update Project_Default.xml
|
4 months ago |
|
plqo32bax
|
329670346f
|
ADD file via upload
|
4 months ago |
|
xm
|
6fda0dbde7
|
Merge branch 'xm_branch' into develop
|
4 months ago |
|
xm
|
991376a40e
|
更新项目IDE配置文件
|
4 months ago |
|
p3mk6vbs7
|
3a17741ef0
|
Update DjangoBlog-master.iml
|
4 months ago |
|
顾婧玟
|
95e86f4d8d
|
添加代码注释：完善xml配置文件和CI流程注释
|
4 months ago |
|
p32cia7zh
|
c1c8aea746
|
ADD file via upload
|
4 months ago |
|
plqo32bax
|
c7bf8f69dd
|
ADD file via upload
|
4 months ago |
|
p3mk6vbs7
|
20a712f420
|
ADD file via upload
|
4 months ago |
|
pofyban6j
|
181d564333
|
ADD file via upload
|
4 months ago |
|
p3mk6vbs7
|
47214b18fd
|
ADD file via upload
|
4 months ago |
|
cheese-egg-yolk
|
46fbfc6305
|
完成用户登录功能的开发
|
4 months ago |
|
LiuR
|
be4e2bd82c
|
again
|
4 months ago |
|
LiuR
|
fd633aaac9
|
try it
|
4 months ago |
|
顾婧玟
|
db188a9aef
|
Add test files in src and doc
|
4 months ago |
|
xm
|
10f76e8aa5
|
源代码
|
4 months ago |
|
p3mk6vbs7
|
b07d7f3956
|
Initial commit
|
5 months ago |
