Labels Milestones

develop #6

Closed

pofyban6j wants to merge 30 commits from develop into gjw_branch

pull from: develop

merge into: p3mk6vbs7:gjw_branch

p3mk6vbs7:gjw_branch

p3mk6vbs7:hjn_branch

p3mk6vbs7:master

p3mk6vbs7:xm_branch

p3mk6vbs7:onet

p3mk6vbs7:qz_branch

p3mk6vbs7:lr_branch

Conversation 0 Commits 30 Files Changed 491

pofyban6j commented 4 months ago

Collaborator

There is no content yet.

pofyban6j added 12 commits 4 months ago

fd633aaac9 try it

be4e2bd82c again

47214b18fd ADD file via upload

c1c8aea746 ADD file via upload

3a17741ef0 Update DjangoBlog-master.iml

991376a40e 更新项目IDE配置文件

6fda0dbde7 Merge branch 'xm_branch' into develop

8581d5796c Update manage.py

9a39ad406c 解决合并冲突

78bf2ede9c Merge branch 'xm_branch' into develop

974028882d 解决合并冲突，完成 gjw_branch 到 develop 的合并

772740ccd2 Merge branch 'develop' of https://bdgit.educoder.net/p3mk6vbs7/Django into develop

plqo32bax added 7 commits 4 months ago

46fbfc6305 完成用户登录功能的开发

20a712f420 ADD file via upload

c7bf8f69dd ADD file via upload

329670346f ADD file via upload

01d2fe0a52 提交信息，描述本次代码变更内容

0c459e1ea7 Merge branch 'hjn_branch' of https://bdgit.educoder.net/p3mk6vbs7/Django into hjn_branch

3d2f28dc80 Merge branch 'hjn_branch' into develop

p3mk6vbs7 added 4 commits 4 months ago

d78f18e2c8 Update context_processors.py

53c15adc39 解决合并冲突：决定保留/删除 doc/报告.docx

e8f91c1633 解决合并冲突：处理doc/报告.docx文件

4903c5dc91 修复嵌套仓库问题，添加DjangoBlog项目文件

p3mk6vbs7 added 1 commit 4 months ago

f4d1fc2a90 添加.gitignore，忽略IDE配置文件

plqo32bax added 3 commits 4 months ago

0819044632 滚

3169b238cb Merge branch 'hjn_branch' into develop

8504741f5b Merge branch 'develop' of https://bdgit.educoder.net/p3mk6vbs7/Django into develop

p32cia7zh added 3 commits 4 months ago

3ac7d80342 change

ad10b1899e merge it

1ab32f6792 Merge branch 'develop' of https://bdgit.educoder.net/p3mk6vbs7/Django into develop

pofyban6j closed this pull request 4 months ago

This pull request cannot be reopened because the branch was deleted.

Sign in to join this conversation.

Reviewers

Request review

No reviewers

Labels

Apply labels

Clear labels

No items

No Label

Milestone

Set milestone

Clear milestone

No items

No Milestone

Projects

Clear projects

No project

Assignees

Assign users

Clear assignees

No Assignees

4 Participants

Notifications

Subscribe

Due Date

The due date is invalid or out of range. Please use the format 'yyyy-mm-dd'.

No due date set.

Dependencies

No dependencies set.

Reference: p3mk6vbs7/Django#6

Write Preview

Loading…

Cancel

Save

There is no content yet.