fz_branch #1

Open
pa2g3nmk9 wants to merge 77 commits from fz_branch into master

77 Commits (master)

Author SHA1 Message Date
pa2g3nmk9 7847457523 上传文件至 'doc'
4 months ago
pa2g3nmk9 e6e88d8df9 上传文件至 'doc'
4 months ago
pa2g3nmk9 9d80482128 更新 'src/DjangoBlog-master/README.md'
4 months ago
pa2g3nmk9 481c81a86e 更新 'src/DjangoBlog-master/requirements.txt'
4 months ago
pa2g3nmk9 0c4656fd60 更新 'src/DjangoBlog-master/manage.py'
4 months ago
pa2g3nmk9 406fe069f0 更新 'src/DjangoBlog-master/LICENSE'
4 months ago
pa2g3nmk9 44bbc5c542 更新 'src/DjangoBlog-master/Dockerfile'
4 months ago
pa2g3nmk9 33a9c9cd59 更新 'src/DjangoBlog-master/.gitignore'
4 months ago
pa2g3nmk9 c7450d0d88 更新 'src/DjangoBlog-master/.gitattributes'
4 months ago
pa2g3nmk9 06a7146cc0 更新 'src/DjangoBlog-master/.dockerignore'
4 months ago
pa2g3nmk9 09eb22d5f4 更新 'src/DjangoBlog-master/.coveragerc'
4 months ago
pa2g3nmk9 43bb22126f 更新 'src/DjangoBlog-master/templates/share_layout/nav_node.html'
4 months ago
pa2g3nmk9 5daf91747c 更新 'src/DjangoBlog-master/templates/share_layout/nav.html'
4 months ago
pa2g3nmk9 94554dd420 更新 'src/DjangoBlog-master/templates/share_layout/footer.html'
4 months ago
pa2g3nmk9 7ecb368488 更新 'src/DjangoBlog-master/templates/share_layout/base_account.html'
4 months ago
pa2g3nmk9 f77775d63e 更新 'src/DjangoBlog-master/templates/share_layout/base.html'
4 months ago
pa2g3nmk9 61bf020a5a 更新 'src/DjangoBlog-master/templates/share_layout/adsense.html'
4 months ago
pa2g3nmk9 e841ecdbf5 更新 'src/DjangoBlog-master/templates/search/search.html'
4 months ago
pa2g3nmk9 5a937af340 更新 'src/DjangoBlog-master/templates/search/indexes/blog/article_text.txt'
4 months ago
pa2g3nmk9 1ed6be5fbd 更新 'src/DjangoBlog-master/templates/owntracks/show_maps.html'
4 months ago
pa2g3nmk9 8dc305c71a 更新 'src/DjangoBlog-master/templates/owntracks/show_log_dates.html'
4 months ago
pa2g3nmk9 3662fce6ec 更新 'src/DjangoBlog-master/templates/oauth/require_email.html'
4 months ago
pa2g3nmk9 b17bb25845 更新 'src/DjangoBlog-master/templates/oauth/oauth_applications.html'
4 months ago
pa2g3nmk9 722a2043a4 更新 'src/DjangoBlog-master/templates/oauth/bindsuccess.html'
4 months ago
pa2g3nmk9 2a25c7d2f7 更新 'src/DjangoBlog-master/templates/comments/tags/post_comment.html'
4 months ago
pa2g3nmk9 cdecc8f3cd 更新 'src/DjangoBlog-master/templates/comments/tags/comment_list.html'
4 months ago
pa2g3nmk9 873d825a80 更新 'src/DjangoBlog-master/templates/comments/tags/comment_item_tree.html'
4 months ago
pa2g3nmk9 e80c253a98 更新 'src/DjangoBlog-master/templates/comments/tags/comment_item.html'
4 months ago
pa2g3nmk9 5545a58da7 更新 'src/DjangoBlog-master/templates/blog/links_list.html'
4 months ago
pa2g3nmk9 80b55cb6d3 更新 'src/DjangoBlog-master/templates/blog/error_page.html'
4 months ago
pa2g3nmk9 79be6fdc5b 更新 'src/DjangoBlog-master/templates/blog/article_index.html'
4 months ago
pa2g3nmk9 f77a67fe9f 更新 'src/DjangoBlog-master/templates/blog/article_detail.html'
4 months ago
pa2g3nmk9 df394602ee 更新 'src/DjangoBlog-master/templates/blog/article_archives.html'
4 months ago
pa2g3nmk9 a645e1abce 更新 'src/DjangoBlog-master/templates/blog/tags/sidebar.html'
4 months ago
pa2g3nmk9 2a56350e2c 更新 'src/DjangoBlog-master/templates/blog/tags/breadcrumb.html'
4 months ago
pa2g3nmk9 b91ff2e0bb 更新 'src/DjangoBlog-master/templates/blog/tags/article_tag_list.html'
4 months ago
pa2g3nmk9 3cc10121c2 更新 'src/DjangoBlog-master/templates/blog/tags/article_pagination.html'
4 months ago
pa2g3nmk9 182a742f85 更新 'src/DjangoBlog-master/templates/blog/tags/article_meta_info.html'
4 months ago
pa2g3nmk9 244fbca94d 更新 'src/DjangoBlog-master/templates/blog/tags/article_info.html'
4 months ago
pa2g3nmk9 c636f1f3dc 更新 'src/DjangoBlog-master/templates/account/result.html'
4 months ago
pa2g3nmk9 d81051bd08 更新 'src/DjangoBlog-master/templates/account/registration_form.html'
4 months ago
pa2g3nmk9 eebe49875f 更新 'src/DjangoBlog-master/templates/account/login.html'
4 months ago
pa2g3nmk9 6abf91597a 更新 'src/DjangoBlog-master/templates/account/forget_password.html'
4 months ago
fz 6875481d7e 添加电影评价系统数据模型设计文档
4 months ago
fz c15310b677 fix: resolve nested merge conflict in README.md
5 months ago
fz c1a0f16d1f merge: resolve README.md conflict, keep remote Chinese version
5 months ago
fz 2dc4112e09 添加电影评价软件界面设计说明书
5 months ago
zxc 2907454eb6 Update admin.py
5 months ago
fz 1000752d3d 解决README.md冲突并清理临时文件
5 months ago
zxc cfb4939c5a Update 0002_alter_owntracklog_options_and_more.py
5 months ago
zxc 82c7f26e8f Update 0001_initial.py
5 months ago
zxc 50b5eda147 Update 0001_initial.py
5 months ago
plhw57tbe c8630a7f95 Merge pull request '合并源代码' (#4) from smy_branch into develop
5 months ago
plhw57tbe ba2c683180 Update docker-compose.yml
5 months ago
plhw57tbe 94dd264394 Update docker-compose.es.yml
5 months ago
plhw57tbe dc3eef1f13 Update views.py
5 months ago
plhw57tbe 11ae3570e0 Update utils.py
5 months ago
fz 11203b3ce1 添加电影评价软件界面设计说明书模板
5 months ago
plhw57tbe aa95dc52b3 Update urls.py
5 months ago
plhw57tbe 955b0a6ead Update tests.py
5 months ago
plhw57tbe 82d4f9a98b Update models.py
5 months ago
plhw57tbe 65020e1115 Update forms.py
5 months ago
plhw57tbe 190f420c49 Update apps.py
5 months ago
plhw57tbe a8dcf5aa39 Update admin.py
5 months ago
plhw57tbe 4836e57e98 Update comments_tags.py
5 months ago
plhw57tbe 662cfd9759 Update 0003_alter_comment_options_remove_comment_created_time_and_more.py
5 months ago
plhw57tbe d2ff176400 Update 0002_alter_comment_is_enable.py
5 months ago
plhw57tbe 63328bcfcb Update 0001_initial.py
5 months ago
fz 2513a76c28 添加电影评价软件界面设计说明书模板
5 months ago
smy bf828e6d08 Merge branch 'smy_branch' of https://bdgit.educoder.net/plhw57tbe/SoftwareMethodology into smy_branch
5 months ago
smy f27ecb885f Merge branch 'develop' into smy_branch
5 months ago
plhw57tbe 42884c5b0d ADD file via upload
5 months ago
fz f338bb2378 备份develop分支的修改
5 months ago
smy 4201412bb4 在master分支添加doc目录及README.md文档
5 months ago
smy 192f27dd24 在master分支添加doc目录及README.md文档
5 months ago
smy 3fac0dcd23 删除master分支中的README.md文件
5 months ago
smy 0ef2d99dbc 删除README.md文件
5 months ago