diff --git a/README.md b/README.md deleted file mode 100644 index a2629a5..0000000 --- a/README.md +++ /dev/null @@ -1,2 +0,0 @@ -# Django - diff --git a/src/DjangoBlog-master_1/.coveragerc b/src/.coveragerc similarity index 100% rename from src/DjangoBlog-master_1/.coveragerc rename to src/.coveragerc diff --git a/src/DjangoBlog-master_1/.dockerignore b/src/.dockerignore similarity index 100% rename from src/DjangoBlog-master_1/.dockerignore rename to src/.dockerignore diff --git a/src/DjangoBlog-master_1/.gitattributes b/src/.gitattributes similarity index 100% rename from src/DjangoBlog-master_1/.gitattributes rename to src/.gitattributes diff --git a/src/DjangoBlog-master_1/.github/ISSUE_TEMPLATE.md b/src/.github/ISSUE_TEMPLATE.md similarity index 100% rename from src/DjangoBlog-master_1/.github/ISSUE_TEMPLATE.md rename to src/.github/ISSUE_TEMPLATE.md diff --git a/src/DjangoBlog-master_1/.github/workflows/codeql-analysis.yml b/src/.github/workflows/codeql-analysis.yml similarity index 100% rename from src/DjangoBlog-master_1/.github/workflows/codeql-analysis.yml rename to src/.github/workflows/codeql-analysis.yml diff --git a/src/DjangoBlog-master_1/.github/workflows/django.yml b/src/.github/workflows/django.yml similarity index 100% rename from src/DjangoBlog-master_1/.github/workflows/django.yml rename to src/.github/workflows/django.yml diff --git a/src/DjangoBlog-master_1/.github/workflows/docker.yml b/src/.github/workflows/docker.yml similarity index 100% rename from src/DjangoBlog-master_1/.github/workflows/docker.yml rename to src/.github/workflows/docker.yml diff --git a/src/DjangoBlog-master_1/.github/workflows/publish-release.yml b/src/.github/workflows/publish-release.yml similarity index 100% rename from src/DjangoBlog-master_1/.github/workflows/publish-release.yml rename to src/.github/workflows/publish-release.yml diff --git a/src/DjangoBlog-master_1/.gitignore b/src/.gitignore similarity index 100% rename from src/DjangoBlog-master_1/.gitignore rename to src/.gitignore diff --git a/src/DjangoBlog-master_1/DjangoBlog-master/.coveragerc b/src/DjangoBlog-master/.coveragerc similarity index 100% rename from src/DjangoBlog-master_1/DjangoBlog-master/.coveragerc rename to src/DjangoBlog-master/.coveragerc diff --git a/src/DjangoBlog-master_1/DjangoBlog-master/.dockerignore b/src/DjangoBlog-master/.dockerignore similarity index 100% rename from src/DjangoBlog-master_1/DjangoBlog-master/.dockerignore rename to src/DjangoBlog-master/.dockerignore diff --git a/src/DjangoBlog-master_1/DjangoBlog-master/.gitattributes b/src/DjangoBlog-master/.gitattributes similarity index 100% rename from src/DjangoBlog-master_1/DjangoBlog-master/.gitattributes rename to src/DjangoBlog-master/.gitattributes diff --git a/src/DjangoBlog-master_1/DjangoBlog-master/.github/ISSUE_TEMPLATE.md b/src/DjangoBlog-master/.github/ISSUE_TEMPLATE.md similarity index 100% rename from src/DjangoBlog-master_1/DjangoBlog-master/.github/ISSUE_TEMPLATE.md rename to src/DjangoBlog-master/.github/ISSUE_TEMPLATE.md diff --git a/src/DjangoBlog-master_1/DjangoBlog-master/.github/workflows/codeql-analysis.yml b/src/DjangoBlog-master/.github/workflows/codeql-analysis.yml similarity index 100% rename from src/DjangoBlog-master_1/DjangoBlog-master/.github/workflows/codeql-analysis.yml rename to src/DjangoBlog-master/.github/workflows/codeql-analysis.yml diff --git a/src/DjangoBlog-master_1/DjangoBlog-master/.github/workflows/django.yml b/src/DjangoBlog-master/.github/workflows/django.yml similarity index 100% rename from src/DjangoBlog-master_1/DjangoBlog-master/.github/workflows/django.yml rename to src/DjangoBlog-master/.github/workflows/django.yml diff --git a/src/DjangoBlog-master_1/DjangoBlog-master/.github/workflows/docker.yml b/src/DjangoBlog-master/.github/workflows/docker.yml similarity index 100% rename from src/DjangoBlog-master_1/DjangoBlog-master/.github/workflows/docker.yml rename to src/DjangoBlog-master/.github/workflows/docker.yml diff --git a/src/DjangoBlog-master_1/DjangoBlog-master/.github/workflows/publish-release.yml b/src/DjangoBlog-master/.github/workflows/publish-release.yml similarity index 100% rename from src/DjangoBlog-master_1/DjangoBlog-master/.github/workflows/publish-release.yml rename to src/DjangoBlog-master/.github/workflows/publish-release.yml diff --git a/src/DjangoBlog-master_1/DjangoBlog-master/.gitignore b/src/DjangoBlog-master/.gitignore similarity index 100% rename from src/DjangoBlog-master_1/DjangoBlog-master/.gitignore rename to src/DjangoBlog-master/.gitignore diff --git a/src/DjangoBlog-master_1/DjangoBlog-master/Dockerfile b/src/DjangoBlog-master/Dockerfile similarity index 100% rename from src/DjangoBlog-master_1/DjangoBlog-master/Dockerfile rename to src/DjangoBlog-master/Dockerfile diff --git a/src/DjangoBlog-master_1/DjangoBlog-master/LICENSE b/src/DjangoBlog-master/LICENSE similarity index 100% rename from src/DjangoBlog-master_1/DjangoBlog-master/LICENSE rename to src/DjangoBlog-master/LICENSE diff --git a/src/DjangoBlog-master_1/DjangoBlog-master/README.md b/src/DjangoBlog-master/README.md similarity index 100% rename from src/DjangoBlog-master_1/DjangoBlog-master/README.md rename to src/DjangoBlog-master/README.md diff --git a/src/DjangoBlog-master_1/DjangoBlog-master/accounts/__init__.py b/src/DjangoBlog-master/accounts/__init__.py similarity index 100% rename from src/DjangoBlog-master_1/DjangoBlog-master/accounts/__init__.py rename to src/DjangoBlog-master/accounts/__init__.py diff --git a/src/DjangoBlog-master_1/DjangoBlog-master/accounts/admin.py b/src/DjangoBlog-master/accounts/admin.py similarity index 100% rename from src/DjangoBlog-master_1/DjangoBlog-master/accounts/admin.py rename to src/DjangoBlog-master/accounts/admin.py diff --git a/src/DjangoBlog-master_1/DjangoBlog-master/accounts/apps.py b/src/DjangoBlog-master/accounts/apps.py similarity index 100% rename from src/DjangoBlog-master_1/DjangoBlog-master/accounts/apps.py rename to src/DjangoBlog-master/accounts/apps.py diff --git a/src/DjangoBlog-master_1/DjangoBlog-master/accounts/forms.py b/src/DjangoBlog-master/accounts/forms.py similarity index 100% rename from src/DjangoBlog-master_1/DjangoBlog-master/accounts/forms.py rename to src/DjangoBlog-master/accounts/forms.py diff --git a/src/DjangoBlog-master_1/DjangoBlog-master/accounts/migrations/0001_initial.py b/src/DjangoBlog-master/accounts/migrations/0001_initial.py similarity index 100% rename from src/DjangoBlog-master_1/DjangoBlog-master/accounts/migrations/0001_initial.py rename to src/DjangoBlog-master/accounts/migrations/0001_initial.py diff --git a/src/DjangoBlog-master_1/DjangoBlog-master/accounts/migrations/0002_alter_bloguser_options_remove_bloguser_created_time_and_more.py b/src/DjangoBlog-master/accounts/migrations/0002_alter_bloguser_options_remove_bloguser_created_time_and_more.py similarity index 100% rename from src/DjangoBlog-master_1/DjangoBlog-master/accounts/migrations/0002_alter_bloguser_options_remove_bloguser_created_time_and_more.py rename to src/DjangoBlog-master/accounts/migrations/0002_alter_bloguser_options_remove_bloguser_created_time_and_more.py diff --git a/src/DjangoBlog-master_1/DjangoBlog-master/accounts/migrations/__init__.py b/src/DjangoBlog-master/accounts/migrations/__init__.py similarity index 100% rename from src/DjangoBlog-master_1/DjangoBlog-master/accounts/migrations/__init__.py rename to src/DjangoBlog-master/accounts/migrations/__init__.py diff --git a/src/DjangoBlog-master_1/DjangoBlog-master/accounts/models.py b/src/DjangoBlog-master/accounts/models.py similarity index 100% rename from src/DjangoBlog-master_1/DjangoBlog-master/accounts/models.py rename to src/DjangoBlog-master/accounts/models.py diff --git a/src/DjangoBlog-master_1/DjangoBlog-master/accounts/templatetags/__init__.py b/src/DjangoBlog-master/accounts/templatetags/__init__.py similarity index 100% rename from src/DjangoBlog-master_1/DjangoBlog-master/accounts/templatetags/__init__.py rename to src/DjangoBlog-master/accounts/templatetags/__init__.py diff --git a/src/DjangoBlog-master_1/DjangoBlog-master/accounts/tests.py b/src/DjangoBlog-master/accounts/tests.py similarity index 100% rename from src/DjangoBlog-master_1/DjangoBlog-master/accounts/tests.py rename to src/DjangoBlog-master/accounts/tests.py diff --git a/src/DjangoBlog-master_1/DjangoBlog-master/accounts/urls.py b/src/DjangoBlog-master/accounts/urls.py similarity index 100% rename from src/DjangoBlog-master_1/DjangoBlog-master/accounts/urls.py rename to src/DjangoBlog-master/accounts/urls.py diff --git a/src/DjangoBlog-master_1/DjangoBlog-master/accounts/user_login_backend.py b/src/DjangoBlog-master/accounts/user_login_backend.py similarity index 100% rename from src/DjangoBlog-master_1/DjangoBlog-master/accounts/user_login_backend.py rename to src/DjangoBlog-master/accounts/user_login_backend.py diff --git a/src/DjangoBlog-master_1/DjangoBlog-master/accounts/utils.py b/src/DjangoBlog-master/accounts/utils.py similarity index 100% rename from src/DjangoBlog-master_1/DjangoBlog-master/accounts/utils.py rename to src/DjangoBlog-master/accounts/utils.py diff --git a/src/DjangoBlog-master_1/DjangoBlog-master/accounts/views.py b/src/DjangoBlog-master/accounts/views.py similarity index 100% rename from src/DjangoBlog-master_1/DjangoBlog-master/accounts/views.py rename to src/DjangoBlog-master/accounts/views.py diff --git a/src/DjangoBlog-master_1/DjangoBlog-master/blog/__init__.py b/src/DjangoBlog-master/blog/__init__.py similarity index 100% rename from src/DjangoBlog-master_1/DjangoBlog-master/blog/__init__.py rename to src/DjangoBlog-master/blog/__init__.py diff --git a/src/DjangoBlog-master_1/DjangoBlog-master/blog/admin.py b/src/DjangoBlog-master/blog/admin.py similarity index 100% rename from src/DjangoBlog-master_1/DjangoBlog-master/blog/admin.py rename to src/DjangoBlog-master/blog/admin.py diff --git a/src/DjangoBlog-master_1/DjangoBlog-master/blog/apps.py b/src/DjangoBlog-master/blog/apps.py similarity index 100% rename from src/DjangoBlog-master_1/DjangoBlog-master/blog/apps.py rename to src/DjangoBlog-master/blog/apps.py diff --git a/src/DjangoBlog-master_1/DjangoBlog-master/blog/context_processors.py b/src/DjangoBlog-master/blog/context_processors.py similarity index 100% rename from src/DjangoBlog-master_1/DjangoBlog-master/blog/context_processors.py rename to src/DjangoBlog-master/blog/context_processors.py diff --git a/src/DjangoBlog-master_1/DjangoBlog-master/blog/documents.py b/src/DjangoBlog-master/blog/documents.py similarity index 100% rename from src/DjangoBlog-master_1/DjangoBlog-master/blog/documents.py rename to src/DjangoBlog-master/blog/documents.py diff --git a/src/DjangoBlog-master_1/DjangoBlog-master/blog/forms.py b/src/DjangoBlog-master/blog/forms.py similarity index 100% rename from src/DjangoBlog-master_1/DjangoBlog-master/blog/forms.py rename to src/DjangoBlog-master/blog/forms.py diff --git a/src/DjangoBlog-master_1/DjangoBlog-master/blog/management/__init__.py b/src/DjangoBlog-master/blog/management/__init__.py similarity index 100% rename from src/DjangoBlog-master_1/DjangoBlog-master/blog/management/__init__.py rename to src/DjangoBlog-master/blog/management/__init__.py diff --git a/src/DjangoBlog-master_1/DjangoBlog-master/blog/management/commands/__init__.py b/src/DjangoBlog-master/blog/management/commands/__init__.py similarity index 100% rename from src/DjangoBlog-master_1/DjangoBlog-master/blog/management/commands/__init__.py rename to src/DjangoBlog-master/blog/management/commands/__init__.py diff --git a/src/DjangoBlog-master_1/DjangoBlog-master/blog/management/commands/build_index.py b/src/DjangoBlog-master/blog/management/commands/build_index.py similarity index 100% rename from src/DjangoBlog-master_1/DjangoBlog-master/blog/management/commands/build_index.py rename to src/DjangoBlog-master/blog/management/commands/build_index.py diff --git a/src/DjangoBlog-master_1/DjangoBlog-master/blog/management/commands/build_search_words.py b/src/DjangoBlog-master/blog/management/commands/build_search_words.py similarity index 100% rename from src/DjangoBlog-master_1/DjangoBlog-master/blog/management/commands/build_search_words.py rename to src/DjangoBlog-master/blog/management/commands/build_search_words.py diff --git a/src/DjangoBlog-master_1/DjangoBlog-master/blog/management/commands/clear_cache.py b/src/DjangoBlog-master/blog/management/commands/clear_cache.py similarity index 100% rename from src/DjangoBlog-master_1/DjangoBlog-master/blog/management/commands/clear_cache.py rename to src/DjangoBlog-master/blog/management/commands/clear_cache.py diff --git a/src/DjangoBlog-master_1/DjangoBlog-master/blog/management/commands/create_testdata.py b/src/DjangoBlog-master/blog/management/commands/create_testdata.py similarity index 100% rename from src/DjangoBlog-master_1/DjangoBlog-master/blog/management/commands/create_testdata.py rename to src/DjangoBlog-master/blog/management/commands/create_testdata.py diff --git a/src/DjangoBlog-master_1/DjangoBlog-master/blog/management/commands/ping_baidu.py b/src/DjangoBlog-master/blog/management/commands/ping_baidu.py similarity index 100% rename from src/DjangoBlog-master_1/DjangoBlog-master/blog/management/commands/ping_baidu.py rename to src/DjangoBlog-master/blog/management/commands/ping_baidu.py diff --git a/src/DjangoBlog-master_1/DjangoBlog-master/blog/management/commands/sync_user_avatar.py b/src/DjangoBlog-master/blog/management/commands/sync_user_avatar.py similarity index 100% rename from src/DjangoBlog-master_1/DjangoBlog-master/blog/management/commands/sync_user_avatar.py rename to src/DjangoBlog-master/blog/management/commands/sync_user_avatar.py diff --git a/src/DjangoBlog-master_1/DjangoBlog-master/blog/middleware.py b/src/DjangoBlog-master/blog/middleware.py similarity index 100% rename from src/DjangoBlog-master_1/DjangoBlog-master/blog/middleware.py rename to src/DjangoBlog-master/blog/middleware.py diff --git a/src/DjangoBlog-master_1/DjangoBlog-master/blog/migrations/0001_initial.py b/src/DjangoBlog-master/blog/migrations/0001_initial.py similarity index 100% rename from src/DjangoBlog-master_1/DjangoBlog-master/blog/migrations/0001_initial.py rename to src/DjangoBlog-master/blog/migrations/0001_initial.py diff --git a/src/DjangoBlog-master_1/DjangoBlog-master/blog/migrations/0002_blogsettings_global_footer_and_more.py b/src/DjangoBlog-master/blog/migrations/0002_blogsettings_global_footer_and_more.py similarity index 100% rename from src/DjangoBlog-master_1/DjangoBlog-master/blog/migrations/0002_blogsettings_global_footer_and_more.py rename to src/DjangoBlog-master/blog/migrations/0002_blogsettings_global_footer_and_more.py diff --git a/src/DjangoBlog-master_1/DjangoBlog-master/blog/migrations/0003_blogsettings_comment_need_review.py b/src/DjangoBlog-master/blog/migrations/0003_blogsettings_comment_need_review.py similarity index 100% rename from src/DjangoBlog-master_1/DjangoBlog-master/blog/migrations/0003_blogsettings_comment_need_review.py rename to src/DjangoBlog-master/blog/migrations/0003_blogsettings_comment_need_review.py diff --git a/src/DjangoBlog-master_1/DjangoBlog-master/blog/migrations/0004_rename_analyticscode_blogsettings_analytics_code_and_more.py b/src/DjangoBlog-master/blog/migrations/0004_rename_analyticscode_blogsettings_analytics_code_and_more.py similarity index 100% rename from src/DjangoBlog-master_1/DjangoBlog-master/blog/migrations/0004_rename_analyticscode_blogsettings_analytics_code_and_more.py rename to src/DjangoBlog-master/blog/migrations/0004_rename_analyticscode_blogsettings_analytics_code_and_more.py diff --git a/src/DjangoBlog-master_1/DjangoBlog-master/blog/migrations/0005_alter_article_options_alter_category_options_and_more.py b/src/DjangoBlog-master/blog/migrations/0005_alter_article_options_alter_category_options_and_more.py similarity index 100% rename from src/DjangoBlog-master_1/DjangoBlog-master/blog/migrations/0005_alter_article_options_alter_category_options_and_more.py rename to src/DjangoBlog-master/blog/migrations/0005_alter_article_options_alter_category_options_and_more.py diff --git a/src/DjangoBlog-master_1/DjangoBlog-master/blog/migrations/0006_alter_blogsettings_options.py b/src/DjangoBlog-master/blog/migrations/0006_alter_blogsettings_options.py similarity index 100% rename from src/DjangoBlog-master_1/DjangoBlog-master/blog/migrations/0006_alter_blogsettings_options.py rename to src/DjangoBlog-master/blog/migrations/0006_alter_blogsettings_options.py diff --git a/src/DjangoBlog-master_1/DjangoBlog-master/blog/migrations/__init__.py b/src/DjangoBlog-master/blog/migrations/__init__.py similarity index 100% rename from src/DjangoBlog-master_1/DjangoBlog-master/blog/migrations/__init__.py rename to src/DjangoBlog-master/blog/migrations/__init__.py diff --git a/src/DjangoBlog-master_1/DjangoBlog-master/blog/models.py b/src/DjangoBlog-master/blog/models.py similarity index 100% rename from src/DjangoBlog-master_1/DjangoBlog-master/blog/models.py rename to src/DjangoBlog-master/blog/models.py diff --git a/src/DjangoBlog-master_1/DjangoBlog-master/blog/search_indexes.py b/src/DjangoBlog-master/blog/search_indexes.py similarity index 100% rename from src/DjangoBlog-master_1/DjangoBlog-master/blog/search_indexes.py rename to src/DjangoBlog-master/blog/search_indexes.py diff --git a/src/DjangoBlog-master_1/DjangoBlog-master/blog/templatetags/__init__.py b/src/DjangoBlog-master/blog/templatetags/__init__.py similarity index 100% rename from src/DjangoBlog-master_1/DjangoBlog-master/blog/templatetags/__init__.py rename to src/DjangoBlog-master/blog/templatetags/__init__.py diff --git a/src/DjangoBlog-master_1/DjangoBlog-master/blog/templatetags/blog_tags.py b/src/DjangoBlog-master/blog/templatetags/blog_tags.py similarity index 100% rename from src/DjangoBlog-master_1/DjangoBlog-master/blog/templatetags/blog_tags.py rename to src/DjangoBlog-master/blog/templatetags/blog_tags.py diff --git a/src/DjangoBlog-master_1/DjangoBlog-master/blog/tests.py b/src/DjangoBlog-master/blog/tests.py similarity index 100% rename from src/DjangoBlog-master_1/DjangoBlog-master/blog/tests.py rename to src/DjangoBlog-master/blog/tests.py diff --git a/src/DjangoBlog-master_1/DjangoBlog-master/blog/urls.py b/src/DjangoBlog-master/blog/urls.py similarity index 100% rename from src/DjangoBlog-master_1/DjangoBlog-master/blog/urls.py rename to src/DjangoBlog-master/blog/urls.py diff --git a/src/DjangoBlog-master_1/DjangoBlog-master/blog/views.py b/src/DjangoBlog-master/blog/views.py similarity index 100% rename from src/DjangoBlog-master_1/DjangoBlog-master/blog/views.py rename to src/DjangoBlog-master/blog/views.py diff --git a/src/DjangoBlog-master_1/DjangoBlog-master/comments/__init__.py b/src/DjangoBlog-master/comments/__init__.py similarity index 100% rename from src/DjangoBlog-master_1/DjangoBlog-master/comments/__init__.py rename to src/DjangoBlog-master/comments/__init__.py diff --git a/src/DjangoBlog-master_1/DjangoBlog-master/comments/admin.py b/src/DjangoBlog-master/comments/admin.py similarity index 100% rename from src/DjangoBlog-master_1/DjangoBlog-master/comments/admin.py rename to src/DjangoBlog-master/comments/admin.py diff --git a/src/DjangoBlog-master_1/DjangoBlog-master/comments/apps.py b/src/DjangoBlog-master/comments/apps.py similarity index 100% rename from src/DjangoBlog-master_1/DjangoBlog-master/comments/apps.py rename to src/DjangoBlog-master/comments/apps.py diff --git a/src/DjangoBlog-master_1/DjangoBlog-master/comments/forms.py b/src/DjangoBlog-master/comments/forms.py similarity index 100% rename from src/DjangoBlog-master_1/DjangoBlog-master/comments/forms.py rename to src/DjangoBlog-master/comments/forms.py diff --git a/src/DjangoBlog-master_1/DjangoBlog-master/comments/migrations/0001_initial.py b/src/DjangoBlog-master/comments/migrations/0001_initial.py similarity index 100% rename from src/DjangoBlog-master_1/DjangoBlog-master/comments/migrations/0001_initial.py rename to src/DjangoBlog-master/comments/migrations/0001_initial.py diff --git a/src/DjangoBlog-master_1/DjangoBlog-master/comments/migrations/0002_alter_comment_is_enable.py b/src/DjangoBlog-master/comments/migrations/0002_alter_comment_is_enable.py similarity index 100% rename from src/DjangoBlog-master_1/DjangoBlog-master/comments/migrations/0002_alter_comment_is_enable.py rename to src/DjangoBlog-master/comments/migrations/0002_alter_comment_is_enable.py diff --git a/src/DjangoBlog-master_1/DjangoBlog-master/comments/migrations/0003_alter_comment_options_remove_comment_created_time_and_more.py b/src/DjangoBlog-master/comments/migrations/0003_alter_comment_options_remove_comment_created_time_and_more.py similarity index 100% rename from src/DjangoBlog-master_1/DjangoBlog-master/comments/migrations/0003_alter_comment_options_remove_comment_created_time_and_more.py rename to src/DjangoBlog-master/comments/migrations/0003_alter_comment_options_remove_comment_created_time_and_more.py diff --git a/src/DjangoBlog-master_1/DjangoBlog-master/comments/migrations/__init__.py b/src/DjangoBlog-master/comments/migrations/__init__.py similarity index 100% rename from src/DjangoBlog-master_1/DjangoBlog-master/comments/migrations/__init__.py rename to src/DjangoBlog-master/comments/migrations/__init__.py diff --git a/src/DjangoBlog-master_1/DjangoBlog-master/comments/models.py b/src/DjangoBlog-master/comments/models.py similarity index 100% rename from src/DjangoBlog-master_1/DjangoBlog-master/comments/models.py rename to src/DjangoBlog-master/comments/models.py diff --git a/src/DjangoBlog-master_1/DjangoBlog-master/comments/templatetags/__init__.py b/src/DjangoBlog-master/comments/templatetags/__init__.py similarity index 100% rename from src/DjangoBlog-master_1/DjangoBlog-master/comments/templatetags/__init__.py rename to src/DjangoBlog-master/comments/templatetags/__init__.py diff --git a/src/DjangoBlog-master_1/DjangoBlog-master/comments/templatetags/comments_tags.py b/src/DjangoBlog-master/comments/templatetags/comments_tags.py similarity index 100% rename from src/DjangoBlog-master_1/DjangoBlog-master/comments/templatetags/comments_tags.py rename to src/DjangoBlog-master/comments/templatetags/comments_tags.py diff --git a/src/DjangoBlog-master_1/DjangoBlog-master/comments/tests.py b/src/DjangoBlog-master/comments/tests.py similarity index 100% rename from src/DjangoBlog-master_1/DjangoBlog-master/comments/tests.py rename to src/DjangoBlog-master/comments/tests.py diff --git a/src/DjangoBlog-master_1/DjangoBlog-master/comments/urls.py b/src/DjangoBlog-master/comments/urls.py similarity index 100% rename from src/DjangoBlog-master_1/DjangoBlog-master/comments/urls.py rename to src/DjangoBlog-master/comments/urls.py diff --git a/src/DjangoBlog-master_1/DjangoBlog-master/comments/utils.py b/src/DjangoBlog-master/comments/utils.py similarity index 100% rename from src/DjangoBlog-master_1/DjangoBlog-master/comments/utils.py rename to src/DjangoBlog-master/comments/utils.py diff --git a/src/DjangoBlog-master_1/DjangoBlog-master/comments/views.py b/src/DjangoBlog-master/comments/views.py similarity index 100% rename from src/DjangoBlog-master_1/DjangoBlog-master/comments/views.py rename to src/DjangoBlog-master/comments/views.py diff --git a/src/DjangoBlog-master_1/DjangoBlog-master/deploy/docker-compose/docker-compose.es.yml b/src/DjangoBlog-master/deploy/docker-compose/docker-compose.es.yml similarity index 100% rename from src/DjangoBlog-master_1/DjangoBlog-master/deploy/docker-compose/docker-compose.es.yml rename to src/DjangoBlog-master/deploy/docker-compose/docker-compose.es.yml diff --git a/src/DjangoBlog-master_1/DjangoBlog-master/deploy/docker-compose/docker-compose.yml b/src/DjangoBlog-master/deploy/docker-compose/docker-compose.yml similarity index 100% rename from src/DjangoBlog-master_1/DjangoBlog-master/deploy/docker-compose/docker-compose.yml rename to src/DjangoBlog-master/deploy/docker-compose/docker-compose.yml diff --git a/src/DjangoBlog-master_1/DjangoBlog-master/deploy/entrypoint.sh b/src/DjangoBlog-master/deploy/entrypoint.sh similarity index 100% rename from src/DjangoBlog-master_1/DjangoBlog-master/deploy/entrypoint.sh rename to src/DjangoBlog-master/deploy/entrypoint.sh diff --git a/src/DjangoBlog-master_1/DjangoBlog-master/deploy/k8s/configmap.yaml b/src/DjangoBlog-master/deploy/k8s/configmap.yaml similarity index 100% rename from src/DjangoBlog-master_1/DjangoBlog-master/deploy/k8s/configmap.yaml rename to src/DjangoBlog-master/deploy/k8s/configmap.yaml diff --git a/src/DjangoBlog-master_1/DjangoBlog-master/deploy/k8s/deployment.yaml b/src/DjangoBlog-master/deploy/k8s/deployment.yaml similarity index 100% rename from src/DjangoBlog-master_1/DjangoBlog-master/deploy/k8s/deployment.yaml rename to src/DjangoBlog-master/deploy/k8s/deployment.yaml diff --git a/src/DjangoBlog-master_1/DjangoBlog-master/deploy/k8s/gateway.yaml b/src/DjangoBlog-master/deploy/k8s/gateway.yaml similarity index 100% rename from src/DjangoBlog-master_1/DjangoBlog-master/deploy/k8s/gateway.yaml rename to src/DjangoBlog-master/deploy/k8s/gateway.yaml diff --git a/src/DjangoBlog-master_1/DjangoBlog-master/deploy/k8s/pv.yaml b/src/DjangoBlog-master/deploy/k8s/pv.yaml similarity index 100% rename from src/DjangoBlog-master_1/DjangoBlog-master/deploy/k8s/pv.yaml rename to src/DjangoBlog-master/deploy/k8s/pv.yaml diff --git a/src/DjangoBlog-master_1/DjangoBlog-master/deploy/k8s/pvc.yaml b/src/DjangoBlog-master/deploy/k8s/pvc.yaml similarity index 100% rename from src/DjangoBlog-master_1/DjangoBlog-master/deploy/k8s/pvc.yaml rename to src/DjangoBlog-master/deploy/k8s/pvc.yaml diff --git a/src/DjangoBlog-master_1/DjangoBlog-master/deploy/k8s/service.yaml b/src/DjangoBlog-master/deploy/k8s/service.yaml similarity index 100% rename from src/DjangoBlog-master_1/DjangoBlog-master/deploy/k8s/service.yaml rename to src/DjangoBlog-master/deploy/k8s/service.yaml diff --git a/src/DjangoBlog-master_1/DjangoBlog-master/deploy/k8s/storageclass.yaml b/src/DjangoBlog-master/deploy/k8s/storageclass.yaml similarity index 100% rename from src/DjangoBlog-master_1/DjangoBlog-master/deploy/k8s/storageclass.yaml rename to src/DjangoBlog-master/deploy/k8s/storageclass.yaml diff --git a/src/DjangoBlog-master_1/DjangoBlog-master/deploy/nginx.conf b/src/DjangoBlog-master/deploy/nginx.conf similarity index 100% rename from src/DjangoBlog-master_1/DjangoBlog-master/deploy/nginx.conf rename to src/DjangoBlog-master/deploy/nginx.conf diff --git a/src/DjangoBlog-master_1/DjangoBlog-master/djangoblog/__init__.py b/src/DjangoBlog-master/djangoblog/__init__.py similarity index 100% rename from src/DjangoBlog-master_1/DjangoBlog-master/djangoblog/__init__.py rename to src/DjangoBlog-master/djangoblog/__init__.py diff --git a/src/DjangoBlog-master_1/DjangoBlog-master/djangoblog/admin_site.py b/src/DjangoBlog-master/djangoblog/admin_site.py similarity index 100% rename from src/DjangoBlog-master_1/DjangoBlog-master/djangoblog/admin_site.py rename to src/DjangoBlog-master/djangoblog/admin_site.py diff --git a/src/DjangoBlog-master_1/DjangoBlog-master/djangoblog/apps.py b/src/DjangoBlog-master/djangoblog/apps.py similarity index 100% rename from src/DjangoBlog-master_1/DjangoBlog-master/djangoblog/apps.py rename to src/DjangoBlog-master/djangoblog/apps.py diff --git a/src/DjangoBlog-master_1/DjangoBlog-master/djangoblog/blog_signals.py b/src/DjangoBlog-master/djangoblog/blog_signals.py similarity index 100% rename from src/DjangoBlog-master_1/DjangoBlog-master/djangoblog/blog_signals.py rename to src/DjangoBlog-master/djangoblog/blog_signals.py diff --git a/src/DjangoBlog-master_1/DjangoBlog-master/djangoblog/elasticsearch_backend.py b/src/DjangoBlog-master/djangoblog/elasticsearch_backend.py similarity index 100% rename from src/DjangoBlog-master_1/DjangoBlog-master/djangoblog/elasticsearch_backend.py rename to src/DjangoBlog-master/djangoblog/elasticsearch_backend.py diff --git a/src/DjangoBlog-master_1/DjangoBlog-master/djangoblog/feeds.py b/src/DjangoBlog-master/djangoblog/feeds.py similarity index 100% rename from src/DjangoBlog-master_1/DjangoBlog-master/djangoblog/feeds.py rename to src/DjangoBlog-master/djangoblog/feeds.py diff --git a/src/DjangoBlog-master_1/DjangoBlog-master/djangoblog/logentryadmin.py b/src/DjangoBlog-master/djangoblog/logentryadmin.py similarity index 100% rename from src/DjangoBlog-master_1/DjangoBlog-master/djangoblog/logentryadmin.py rename to src/DjangoBlog-master/djangoblog/logentryadmin.py diff --git a/src/DjangoBlog-master_1/DjangoBlog-master/djangoblog/plugin_manage/base_plugin.py b/src/DjangoBlog-master/djangoblog/plugin_manage/base_plugin.py similarity index 100% rename from src/DjangoBlog-master_1/DjangoBlog-master/djangoblog/plugin_manage/base_plugin.py rename to src/DjangoBlog-master/djangoblog/plugin_manage/base_plugin.py diff --git a/src/DjangoBlog-master_1/DjangoBlog-master/djangoblog/plugin_manage/hook_constants.py b/src/DjangoBlog-master/djangoblog/plugin_manage/hook_constants.py similarity index 100% rename from src/DjangoBlog-master_1/DjangoBlog-master/djangoblog/plugin_manage/hook_constants.py rename to src/DjangoBlog-master/djangoblog/plugin_manage/hook_constants.py diff --git a/src/DjangoBlog-master_1/DjangoBlog-master/djangoblog/plugin_manage/hooks.py b/src/DjangoBlog-master/djangoblog/plugin_manage/hooks.py similarity index 100% rename from src/DjangoBlog-master_1/DjangoBlog-master/djangoblog/plugin_manage/hooks.py rename to src/DjangoBlog-master/djangoblog/plugin_manage/hooks.py diff --git a/src/DjangoBlog-master_1/DjangoBlog-master/djangoblog/plugin_manage/loader.py b/src/DjangoBlog-master/djangoblog/plugin_manage/loader.py similarity index 100% rename from src/DjangoBlog-master_1/DjangoBlog-master/djangoblog/plugin_manage/loader.py rename to src/DjangoBlog-master/djangoblog/plugin_manage/loader.py diff --git a/src/DjangoBlog-master_1/DjangoBlog-master/djangoblog/settings.py b/src/DjangoBlog-master/djangoblog/settings.py similarity index 100% rename from src/DjangoBlog-master_1/DjangoBlog-master/djangoblog/settings.py rename to src/DjangoBlog-master/djangoblog/settings.py diff --git a/src/DjangoBlog-master_1/DjangoBlog-master/djangoblog/sitemap.py b/src/DjangoBlog-master/djangoblog/sitemap.py similarity index 100% rename from src/DjangoBlog-master_1/DjangoBlog-master/djangoblog/sitemap.py rename to src/DjangoBlog-master/djangoblog/sitemap.py diff --git a/src/DjangoBlog-master_1/DjangoBlog-master/djangoblog/spider_notify.py b/src/DjangoBlog-master/djangoblog/spider_notify.py similarity index 100% rename from src/DjangoBlog-master_1/DjangoBlog-master/djangoblog/spider_notify.py rename to src/DjangoBlog-master/djangoblog/spider_notify.py diff --git a/src/DjangoBlog-master_1/DjangoBlog-master/djangoblog/tests.py b/src/DjangoBlog-master/djangoblog/tests.py similarity index 100% rename from src/DjangoBlog-master_1/DjangoBlog-master/djangoblog/tests.py rename to src/DjangoBlog-master/djangoblog/tests.py diff --git a/src/DjangoBlog-master_1/DjangoBlog-master/djangoblog/urls.py b/src/DjangoBlog-master/djangoblog/urls.py similarity index 100% rename from src/DjangoBlog-master_1/DjangoBlog-master/djangoblog/urls.py rename to src/DjangoBlog-master/djangoblog/urls.py diff --git a/src/DjangoBlog-master_1/DjangoBlog-master/djangoblog/utils.py b/src/DjangoBlog-master/djangoblog/utils.py similarity index 100% rename from src/DjangoBlog-master_1/DjangoBlog-master/djangoblog/utils.py rename to src/DjangoBlog-master/djangoblog/utils.py diff --git a/src/DjangoBlog-master_1/DjangoBlog-master/djangoblog/whoosh_cn_backend.py b/src/DjangoBlog-master/djangoblog/whoosh_cn_backend.py similarity index 100% rename from src/DjangoBlog-master_1/DjangoBlog-master/djangoblog/whoosh_cn_backend.py rename to src/DjangoBlog-master/djangoblog/whoosh_cn_backend.py diff --git a/src/DjangoBlog-master_1/DjangoBlog-master/djangoblog/wsgi.py b/src/DjangoBlog-master/djangoblog/wsgi.py similarity index 100% rename from src/DjangoBlog-master_1/DjangoBlog-master/djangoblog/wsgi.py rename to src/DjangoBlog-master/djangoblog/wsgi.py diff --git a/src/DjangoBlog-master_1/DjangoBlog-master/docs/README-en.md b/src/DjangoBlog-master/docs/README-en.md similarity index 100% rename from src/DjangoBlog-master_1/DjangoBlog-master/docs/README-en.md rename to src/DjangoBlog-master/docs/README-en.md diff --git a/src/DjangoBlog-master_1/DjangoBlog-master/docs/config-en.md b/src/DjangoBlog-master/docs/config-en.md similarity index 100% rename from src/DjangoBlog-master_1/DjangoBlog-master/docs/config-en.md rename to src/DjangoBlog-master/docs/config-en.md diff --git a/src/DjangoBlog-master_1/DjangoBlog-master/docs/config.md b/src/DjangoBlog-master/docs/config.md similarity index 100% rename from src/DjangoBlog-master_1/DjangoBlog-master/docs/config.md rename to src/DjangoBlog-master/docs/config.md diff --git a/src/DjangoBlog-master_1/DjangoBlog-master/docs/docker-en.md b/src/DjangoBlog-master/docs/docker-en.md similarity index 100% rename from src/DjangoBlog-master_1/DjangoBlog-master/docs/docker-en.md rename to src/DjangoBlog-master/docs/docker-en.md diff --git a/src/DjangoBlog-master_1/DjangoBlog-master/docs/docker.md b/src/DjangoBlog-master/docs/docker.md similarity index 100% rename from src/DjangoBlog-master_1/DjangoBlog-master/docs/docker.md rename to src/DjangoBlog-master/docs/docker.md diff --git a/src/DjangoBlog-master_1/DjangoBlog-master/docs/es.md b/src/DjangoBlog-master/docs/es.md similarity index 100% rename from src/DjangoBlog-master_1/DjangoBlog-master/docs/es.md rename to src/DjangoBlog-master/docs/es.md diff --git a/src/DjangoBlog-master_1/DjangoBlog-master/docs/imgs/alipay.jpg b/src/DjangoBlog-master/docs/imgs/alipay.jpg similarity index 100% rename from src/DjangoBlog-master_1/DjangoBlog-master/docs/imgs/alipay.jpg rename to src/DjangoBlog-master/docs/imgs/alipay.jpg diff --git a/src/DjangoBlog-master_1/DjangoBlog-master/docs/imgs/pycharm_logo.png b/src/DjangoBlog-master/docs/imgs/pycharm_logo.png similarity index 100% rename from src/DjangoBlog-master_1/DjangoBlog-master/docs/imgs/pycharm_logo.png rename to src/DjangoBlog-master/docs/imgs/pycharm_logo.png diff --git a/src/DjangoBlog-master_1/DjangoBlog-master/docs/imgs/wechat.jpg b/src/DjangoBlog-master/docs/imgs/wechat.jpg similarity index 100% rename from src/DjangoBlog-master_1/DjangoBlog-master/docs/imgs/wechat.jpg rename to src/DjangoBlog-master/docs/imgs/wechat.jpg diff --git a/src/DjangoBlog-master_1/DjangoBlog-master/docs/k8s-en.md b/src/DjangoBlog-master/docs/k8s-en.md similarity index 100% rename from src/DjangoBlog-master_1/DjangoBlog-master/docs/k8s-en.md rename to src/DjangoBlog-master/docs/k8s-en.md diff --git a/src/DjangoBlog-master_1/DjangoBlog-master/docs/k8s.md b/src/DjangoBlog-master/docs/k8s.md similarity index 100% rename from src/DjangoBlog-master_1/DjangoBlog-master/docs/k8s.md rename to src/DjangoBlog-master/docs/k8s.md diff --git a/src/DjangoBlog-master_1/DjangoBlog-master/locale/en/LC_MESSAGES/django.mo b/src/DjangoBlog-master/locale/en/LC_MESSAGES/django.mo similarity index 100% rename from src/DjangoBlog-master_1/DjangoBlog-master/locale/en/LC_MESSAGES/django.mo rename to src/DjangoBlog-master/locale/en/LC_MESSAGES/django.mo diff --git a/src/DjangoBlog-master_1/DjangoBlog-master/locale/en/LC_MESSAGES/django.po b/src/DjangoBlog-master/locale/en/LC_MESSAGES/django.po similarity index 100% rename from src/DjangoBlog-master_1/DjangoBlog-master/locale/en/LC_MESSAGES/django.po rename to src/DjangoBlog-master/locale/en/LC_MESSAGES/django.po diff --git a/src/DjangoBlog-master_1/DjangoBlog-master/locale/zh_Hans/LC_MESSAGES/django.mo b/src/DjangoBlog-master/locale/zh_Hans/LC_MESSAGES/django.mo similarity index 100% rename from src/DjangoBlog-master_1/DjangoBlog-master/locale/zh_Hans/LC_MESSAGES/django.mo rename to src/DjangoBlog-master/locale/zh_Hans/LC_MESSAGES/django.mo diff --git a/src/DjangoBlog-master_1/DjangoBlog-master/locale/zh_Hans/LC_MESSAGES/django.po b/src/DjangoBlog-master/locale/zh_Hans/LC_MESSAGES/django.po similarity index 100% rename from src/DjangoBlog-master_1/DjangoBlog-master/locale/zh_Hans/LC_MESSAGES/django.po rename to src/DjangoBlog-master/locale/zh_Hans/LC_MESSAGES/django.po diff --git a/src/DjangoBlog-master_1/DjangoBlog-master/locale/zh_Hant/LC_MESSAGES/django.mo b/src/DjangoBlog-master/locale/zh_Hant/LC_MESSAGES/django.mo similarity index 100% rename from src/DjangoBlog-master_1/DjangoBlog-master/locale/zh_Hant/LC_MESSAGES/django.mo rename to src/DjangoBlog-master/locale/zh_Hant/LC_MESSAGES/django.mo diff --git a/src/DjangoBlog-master_1/DjangoBlog-master/locale/zh_Hant/LC_MESSAGES/django.po b/src/DjangoBlog-master/locale/zh_Hant/LC_MESSAGES/django.po similarity index 100% rename from src/DjangoBlog-master_1/DjangoBlog-master/locale/zh_Hant/LC_MESSAGES/django.po rename to src/DjangoBlog-master/locale/zh_Hant/LC_MESSAGES/django.po diff --git a/src/DjangoBlog-master_1/DjangoBlog-master/manage.py b/src/DjangoBlog-master/manage.py similarity index 100% rename from src/DjangoBlog-master_1/DjangoBlog-master/manage.py rename to src/DjangoBlog-master/manage.py diff --git a/src/DjangoBlog-master_1/DjangoBlog-master/oauth/__init__.py b/src/DjangoBlog-master/oauth/__init__.py similarity index 100% rename from src/DjangoBlog-master_1/DjangoBlog-master/oauth/__init__.py rename to src/DjangoBlog-master/oauth/__init__.py diff --git a/src/DjangoBlog-master_1/DjangoBlog-master/oauth/admin.py b/src/DjangoBlog-master/oauth/admin.py similarity index 100% rename from src/DjangoBlog-master_1/DjangoBlog-master/oauth/admin.py rename to src/DjangoBlog-master/oauth/admin.py diff --git a/src/DjangoBlog-master_1/DjangoBlog-master/oauth/apps.py b/src/DjangoBlog-master/oauth/apps.py similarity index 100% rename from src/DjangoBlog-master_1/DjangoBlog-master/oauth/apps.py rename to src/DjangoBlog-master/oauth/apps.py diff --git a/src/DjangoBlog-master_1/DjangoBlog-master/oauth/forms.py b/src/DjangoBlog-master/oauth/forms.py similarity index 100% rename from src/DjangoBlog-master_1/DjangoBlog-master/oauth/forms.py rename to src/DjangoBlog-master/oauth/forms.py diff --git a/src/DjangoBlog-master_1/DjangoBlog-master/oauth/migrations/0001_initial.py b/src/DjangoBlog-master/oauth/migrations/0001_initial.py similarity index 100% rename from src/DjangoBlog-master_1/DjangoBlog-master/oauth/migrations/0001_initial.py rename to src/DjangoBlog-master/oauth/migrations/0001_initial.py diff --git a/src/DjangoBlog-master_1/DjangoBlog-master/oauth/migrations/0002_alter_oauthconfig_options_alter_oauthuser_options_and_more.py b/src/DjangoBlog-master/oauth/migrations/0002_alter_oauthconfig_options_alter_oauthuser_options_and_more.py similarity index 100% rename from src/DjangoBlog-master_1/DjangoBlog-master/oauth/migrations/0002_alter_oauthconfig_options_alter_oauthuser_options_and_more.py rename to src/DjangoBlog-master/oauth/migrations/0002_alter_oauthconfig_options_alter_oauthuser_options_and_more.py diff --git a/src/DjangoBlog-master_1/DjangoBlog-master/oauth/migrations/0003_alter_oauthuser_nickname.py b/src/DjangoBlog-master/oauth/migrations/0003_alter_oauthuser_nickname.py similarity index 100% rename from src/DjangoBlog-master_1/DjangoBlog-master/oauth/migrations/0003_alter_oauthuser_nickname.py rename to src/DjangoBlog-master/oauth/migrations/0003_alter_oauthuser_nickname.py diff --git a/src/DjangoBlog-master_1/DjangoBlog-master/oauth/migrations/__init__.py b/src/DjangoBlog-master/oauth/migrations/__init__.py similarity index 100% rename from src/DjangoBlog-master_1/DjangoBlog-master/oauth/migrations/__init__.py rename to src/DjangoBlog-master/oauth/migrations/__init__.py diff --git a/src/DjangoBlog-master_1/DjangoBlog-master/oauth/models.py b/src/DjangoBlog-master/oauth/models.py similarity index 100% rename from src/DjangoBlog-master_1/DjangoBlog-master/oauth/models.py rename to src/DjangoBlog-master/oauth/models.py diff --git a/src/DjangoBlog-master_1/DjangoBlog-master/oauth/oauthmanager.py b/src/DjangoBlog-master/oauth/oauthmanager.py similarity index 100% rename from src/DjangoBlog-master_1/DjangoBlog-master/oauth/oauthmanager.py rename to src/DjangoBlog-master/oauth/oauthmanager.py diff --git a/src/DjangoBlog-master_1/DjangoBlog-master/oauth/templatetags/__init__.py b/src/DjangoBlog-master/oauth/templatetags/__init__.py similarity index 100% rename from src/DjangoBlog-master_1/DjangoBlog-master/oauth/templatetags/__init__.py rename to src/DjangoBlog-master/oauth/templatetags/__init__.py diff --git a/src/DjangoBlog-master_1/DjangoBlog-master/oauth/templatetags/oauth_tags.py b/src/DjangoBlog-master/oauth/templatetags/oauth_tags.py similarity index 100% rename from src/DjangoBlog-master_1/DjangoBlog-master/oauth/templatetags/oauth_tags.py rename to src/DjangoBlog-master/oauth/templatetags/oauth_tags.py diff --git a/src/DjangoBlog-master_1/DjangoBlog-master/oauth/tests.py b/src/DjangoBlog-master/oauth/tests.py similarity index 100% rename from src/DjangoBlog-master_1/DjangoBlog-master/oauth/tests.py rename to src/DjangoBlog-master/oauth/tests.py diff --git a/src/DjangoBlog-master_1/DjangoBlog-master/oauth/urls.py b/src/DjangoBlog-master/oauth/urls.py similarity index 100% rename from src/DjangoBlog-master_1/DjangoBlog-master/oauth/urls.py rename to src/DjangoBlog-master/oauth/urls.py diff --git a/src/DjangoBlog-master_1/DjangoBlog-master/oauth/views.py b/src/DjangoBlog-master/oauth/views.py similarity index 100% rename from src/DjangoBlog-master_1/DjangoBlog-master/oauth/views.py rename to src/DjangoBlog-master/oauth/views.py diff --git a/src/DjangoBlog-master_1/DjangoBlog-master/owntracks/__init__.py b/src/DjangoBlog-master/owntracks/__init__.py similarity index 100% rename from src/DjangoBlog-master_1/DjangoBlog-master/owntracks/__init__.py rename to src/DjangoBlog-master/owntracks/__init__.py diff --git a/src/DjangoBlog-master_1/DjangoBlog-master/owntracks/admin.py b/src/DjangoBlog-master/owntracks/admin.py similarity index 100% rename from src/DjangoBlog-master_1/DjangoBlog-master/owntracks/admin.py rename to src/DjangoBlog-master/owntracks/admin.py diff --git a/src/DjangoBlog-master_1/DjangoBlog-master/owntracks/apps.py b/src/DjangoBlog-master/owntracks/apps.py similarity index 100% rename from src/DjangoBlog-master_1/DjangoBlog-master/owntracks/apps.py rename to src/DjangoBlog-master/owntracks/apps.py diff --git a/src/DjangoBlog-master_1/DjangoBlog-master/owntracks/migrations/0001_initial.py b/src/DjangoBlog-master/owntracks/migrations/0001_initial.py similarity index 100% rename from src/DjangoBlog-master_1/DjangoBlog-master/owntracks/migrations/0001_initial.py rename to src/DjangoBlog-master/owntracks/migrations/0001_initial.py diff --git a/src/DjangoBlog-master_1/DjangoBlog-master/owntracks/migrations/0002_alter_owntracklog_options_and_more.py b/src/DjangoBlog-master/owntracks/migrations/0002_alter_owntracklog_options_and_more.py similarity index 100% rename from src/DjangoBlog-master_1/DjangoBlog-master/owntracks/migrations/0002_alter_owntracklog_options_and_more.py rename to src/DjangoBlog-master/owntracks/migrations/0002_alter_owntracklog_options_and_more.py diff --git a/src/DjangoBlog-master_1/DjangoBlog-master/owntracks/migrations/__init__.py b/src/DjangoBlog-master/owntracks/migrations/__init__.py similarity index 100% rename from src/DjangoBlog-master_1/DjangoBlog-master/owntracks/migrations/__init__.py rename to src/DjangoBlog-master/owntracks/migrations/__init__.py diff --git a/src/DjangoBlog-master_1/DjangoBlog-master/owntracks/models.py b/src/DjangoBlog-master/owntracks/models.py similarity index 100% rename from src/DjangoBlog-master_1/DjangoBlog-master/owntracks/models.py rename to src/DjangoBlog-master/owntracks/models.py diff --git a/src/DjangoBlog-master_1/DjangoBlog-master/owntracks/tests.py b/src/DjangoBlog-master/owntracks/tests.py similarity index 100% rename from src/DjangoBlog-master_1/DjangoBlog-master/owntracks/tests.py rename to src/DjangoBlog-master/owntracks/tests.py diff --git a/src/DjangoBlog-master_1/DjangoBlog-master/owntracks/urls.py b/src/DjangoBlog-master/owntracks/urls.py similarity index 100% rename from src/DjangoBlog-master_1/DjangoBlog-master/owntracks/urls.py rename to src/DjangoBlog-master/owntracks/urls.py diff --git a/src/DjangoBlog-master_1/DjangoBlog-master/owntracks/views.py b/src/DjangoBlog-master/owntracks/views.py similarity index 100% rename from src/DjangoBlog-master_1/DjangoBlog-master/owntracks/views.py rename to src/DjangoBlog-master/owntracks/views.py diff --git a/src/DjangoBlog-master_1/DjangoBlog-master/plugins/__init__.py b/src/DjangoBlog-master/plugins/__init__.py similarity index 100% rename from src/DjangoBlog-master_1/DjangoBlog-master/plugins/__init__.py rename to src/DjangoBlog-master/plugins/__init__.py diff --git a/src/DjangoBlog-master_1/DjangoBlog-master/plugins/article_copyright/__init__.py b/src/DjangoBlog-master/plugins/article_copyright/__init__.py similarity index 100% rename from src/DjangoBlog-master_1/DjangoBlog-master/plugins/article_copyright/__init__.py rename to src/DjangoBlog-master/plugins/article_copyright/__init__.py diff --git a/src/DjangoBlog-master_1/DjangoBlog-master/plugins/article_copyright/plugin.py b/src/DjangoBlog-master/plugins/article_copyright/plugin.py similarity index 100% rename from src/DjangoBlog-master_1/DjangoBlog-master/plugins/article_copyright/plugin.py rename to src/DjangoBlog-master/plugins/article_copyright/plugin.py diff --git a/src/DjangoBlog-master_1/DjangoBlog-master/plugins/external_links/__init__.py b/src/DjangoBlog-master/plugins/external_links/__init__.py similarity index 100% rename from src/DjangoBlog-master_1/DjangoBlog-master/plugins/external_links/__init__.py rename to src/DjangoBlog-master/plugins/external_links/__init__.py diff --git a/src/DjangoBlog-master_1/DjangoBlog-master/plugins/external_links/plugin.py b/src/DjangoBlog-master/plugins/external_links/plugin.py similarity index 100% rename from src/DjangoBlog-master_1/DjangoBlog-master/plugins/external_links/plugin.py rename to src/DjangoBlog-master/plugins/external_links/plugin.py diff --git a/src/DjangoBlog-master_1/DjangoBlog-master/plugins/reading_time/__init__.py b/src/DjangoBlog-master/plugins/reading_time/__init__.py similarity index 100% rename from src/DjangoBlog-master_1/DjangoBlog-master/plugins/reading_time/__init__.py rename to src/DjangoBlog-master/plugins/reading_time/__init__.py diff --git a/src/DjangoBlog-master_1/DjangoBlog-master/plugins/reading_time/plugin.py b/src/DjangoBlog-master/plugins/reading_time/plugin.py similarity index 100% rename from src/DjangoBlog-master_1/DjangoBlog-master/plugins/reading_time/plugin.py rename to src/DjangoBlog-master/plugins/reading_time/plugin.py diff --git a/src/DjangoBlog-master_1/DjangoBlog-master/plugins/seo_optimizer/__init__.py b/src/DjangoBlog-master/plugins/seo_optimizer/__init__.py similarity index 100% rename from src/DjangoBlog-master_1/DjangoBlog-master/plugins/seo_optimizer/__init__.py rename to src/DjangoBlog-master/plugins/seo_optimizer/__init__.py diff --git a/src/DjangoBlog-master_1/DjangoBlog-master/plugins/seo_optimizer/plugin.py b/src/DjangoBlog-master/plugins/seo_optimizer/plugin.py similarity index 100% rename from src/DjangoBlog-master_1/DjangoBlog-master/plugins/seo_optimizer/plugin.py rename to src/DjangoBlog-master/plugins/seo_optimizer/plugin.py diff --git a/src/DjangoBlog-master_1/DjangoBlog-master/plugins/view_count/__init__.py b/src/DjangoBlog-master/plugins/view_count/__init__.py similarity index 100% rename from src/DjangoBlog-master_1/DjangoBlog-master/plugins/view_count/__init__.py rename to src/DjangoBlog-master/plugins/view_count/__init__.py diff --git a/src/DjangoBlog-master_1/DjangoBlog-master/plugins/view_count/plugin.py b/src/DjangoBlog-master/plugins/view_count/plugin.py similarity index 100% rename from src/DjangoBlog-master_1/DjangoBlog-master/plugins/view_count/plugin.py rename to src/DjangoBlog-master/plugins/view_count/plugin.py diff --git a/src/DjangoBlog-master_1/DjangoBlog-master/requirements.txt b/src/DjangoBlog-master/requirements.txt similarity index 100% rename from src/DjangoBlog-master_1/DjangoBlog-master/requirements.txt rename to src/DjangoBlog-master/requirements.txt diff --git a/src/DjangoBlog-master_1/DjangoBlog-master/servermanager/MemcacheStorage.py b/src/DjangoBlog-master/servermanager/MemcacheStorage.py similarity index 100% rename from src/DjangoBlog-master_1/DjangoBlog-master/servermanager/MemcacheStorage.py rename to src/DjangoBlog-master/servermanager/MemcacheStorage.py diff --git a/src/DjangoBlog-master_1/DjangoBlog-master/servermanager/__init__.py b/src/DjangoBlog-master/servermanager/__init__.py similarity index 100% rename from src/DjangoBlog-master_1/DjangoBlog-master/servermanager/__init__.py rename to src/DjangoBlog-master/servermanager/__init__.py diff --git a/src/DjangoBlog-master_1/DjangoBlog-master/servermanager/admin.py b/src/DjangoBlog-master/servermanager/admin.py similarity index 100% rename from src/DjangoBlog-master_1/DjangoBlog-master/servermanager/admin.py rename to src/DjangoBlog-master/servermanager/admin.py diff --git a/src/DjangoBlog-master_1/DjangoBlog-master/servermanager/api/__init__.py b/src/DjangoBlog-master/servermanager/api/__init__.py similarity index 100% rename from src/DjangoBlog-master_1/DjangoBlog-master/servermanager/api/__init__.py rename to src/DjangoBlog-master/servermanager/api/__init__.py diff --git a/src/DjangoBlog-master_1/DjangoBlog-master/servermanager/api/blogapi.py b/src/DjangoBlog-master/servermanager/api/blogapi.py similarity index 100% rename from src/DjangoBlog-master_1/DjangoBlog-master/servermanager/api/blogapi.py rename to src/DjangoBlog-master/servermanager/api/blogapi.py diff --git a/src/DjangoBlog-master_1/DjangoBlog-master/servermanager/api/commonapi.py b/src/DjangoBlog-master/servermanager/api/commonapi.py similarity index 100% rename from src/DjangoBlog-master_1/DjangoBlog-master/servermanager/api/commonapi.py rename to src/DjangoBlog-master/servermanager/api/commonapi.py diff --git a/src/DjangoBlog-master_1/DjangoBlog-master/servermanager/apps.py b/src/DjangoBlog-master/servermanager/apps.py similarity index 100% rename from src/DjangoBlog-master_1/DjangoBlog-master/servermanager/apps.py rename to src/DjangoBlog-master/servermanager/apps.py diff --git a/src/DjangoBlog-master_1/DjangoBlog-master/servermanager/migrations/0001_initial.py b/src/DjangoBlog-master/servermanager/migrations/0001_initial.py similarity index 100% rename from src/DjangoBlog-master_1/DjangoBlog-master/servermanager/migrations/0001_initial.py rename to src/DjangoBlog-master/servermanager/migrations/0001_initial.py diff --git a/src/DjangoBlog-master_1/DjangoBlog-master/servermanager/migrations/0002_alter_emailsendlog_options_and_more.py b/src/DjangoBlog-master/servermanager/migrations/0002_alter_emailsendlog_options_and_more.py similarity index 100% rename from src/DjangoBlog-master_1/DjangoBlog-master/servermanager/migrations/0002_alter_emailsendlog_options_and_more.py rename to src/DjangoBlog-master/servermanager/migrations/0002_alter_emailsendlog_options_and_more.py diff --git a/src/DjangoBlog-master_1/DjangoBlog-master/servermanager/migrations/__init__.py b/src/DjangoBlog-master/servermanager/migrations/__init__.py similarity index 100% rename from src/DjangoBlog-master_1/DjangoBlog-master/servermanager/migrations/__init__.py rename to src/DjangoBlog-master/servermanager/migrations/__init__.py diff --git a/src/DjangoBlog-master_1/DjangoBlog-master/servermanager/models.py b/src/DjangoBlog-master/servermanager/models.py similarity index 100% rename from src/DjangoBlog-master_1/DjangoBlog-master/servermanager/models.py rename to src/DjangoBlog-master/servermanager/models.py diff --git a/src/DjangoBlog-master_1/DjangoBlog-master/servermanager/robot.py b/src/DjangoBlog-master/servermanager/robot.py similarity index 100% rename from src/DjangoBlog-master_1/DjangoBlog-master/servermanager/robot.py rename to src/DjangoBlog-master/servermanager/robot.py diff --git a/src/DjangoBlog-master_1/DjangoBlog-master/servermanager/tests.py b/src/DjangoBlog-master/servermanager/tests.py similarity index 100% rename from src/DjangoBlog-master_1/DjangoBlog-master/servermanager/tests.py rename to src/DjangoBlog-master/servermanager/tests.py diff --git a/src/DjangoBlog-master_1/DjangoBlog-master/servermanager/urls.py b/src/DjangoBlog-master/servermanager/urls.py similarity index 100% rename from src/DjangoBlog-master_1/DjangoBlog-master/servermanager/urls.py rename to src/DjangoBlog-master/servermanager/urls.py diff --git a/src/DjangoBlog-master_1/DjangoBlog-master/servermanager/views.py b/src/DjangoBlog-master/servermanager/views.py similarity index 100% rename from src/DjangoBlog-master_1/DjangoBlog-master/servermanager/views.py rename to src/DjangoBlog-master/servermanager/views.py diff --git a/src/DjangoBlog-master_1/DjangoBlog-master/templates/account/forget_password.html b/src/DjangoBlog-master/templates/account/forget_password.html similarity index 100% rename from src/DjangoBlog-master_1/DjangoBlog-master/templates/account/forget_password.html rename to src/DjangoBlog-master/templates/account/forget_password.html diff --git a/src/DjangoBlog-master_1/DjangoBlog-master/templates/account/login.html b/src/DjangoBlog-master/templates/account/login.html similarity index 100% rename from src/DjangoBlog-master_1/DjangoBlog-master/templates/account/login.html rename to src/DjangoBlog-master/templates/account/login.html diff --git a/src/DjangoBlog-master_1/DjangoBlog-master/templates/account/registration_form.html b/src/DjangoBlog-master/templates/account/registration_form.html similarity index 100% rename from src/DjangoBlog-master_1/DjangoBlog-master/templates/account/registration_form.html rename to src/DjangoBlog-master/templates/account/registration_form.html diff --git a/src/DjangoBlog-master_1/DjangoBlog-master/templates/account/result.html b/src/DjangoBlog-master/templates/account/result.html similarity index 100% rename from src/DjangoBlog-master_1/DjangoBlog-master/templates/account/result.html rename to src/DjangoBlog-master/templates/account/result.html diff --git a/src/DjangoBlog-master_1/DjangoBlog-master/templates/blog/article_archives.html b/src/DjangoBlog-master/templates/blog/article_archives.html similarity index 100% rename from src/DjangoBlog-master_1/DjangoBlog-master/templates/blog/article_archives.html rename to src/DjangoBlog-master/templates/blog/article_archives.html diff --git a/src/DjangoBlog-master_1/DjangoBlog-master/templates/blog/article_detail.html b/src/DjangoBlog-master/templates/blog/article_detail.html similarity index 100% rename from src/DjangoBlog-master_1/DjangoBlog-master/templates/blog/article_detail.html rename to src/DjangoBlog-master/templates/blog/article_detail.html diff --git a/src/DjangoBlog-master_1/DjangoBlog-master/templates/blog/article_index.html b/src/DjangoBlog-master/templates/blog/article_index.html similarity index 100% rename from src/DjangoBlog-master_1/DjangoBlog-master/templates/blog/article_index.html rename to src/DjangoBlog-master/templates/blog/article_index.html diff --git a/src/DjangoBlog-master_1/DjangoBlog-master/templates/blog/error_page.html b/src/DjangoBlog-master/templates/blog/error_page.html similarity index 100% rename from src/DjangoBlog-master_1/DjangoBlog-master/templates/blog/error_page.html rename to src/DjangoBlog-master/templates/blog/error_page.html diff --git a/src/DjangoBlog-master_1/DjangoBlog-master/templates/blog/links_list.html b/src/DjangoBlog-master/templates/blog/links_list.html similarity index 100% rename from src/DjangoBlog-master_1/DjangoBlog-master/templates/blog/links_list.html rename to src/DjangoBlog-master/templates/blog/links_list.html diff --git a/src/DjangoBlog-master_1/DjangoBlog-master/templates/blog/tags/article_info.html b/src/DjangoBlog-master/templates/blog/tags/article_info.html similarity index 100% rename from src/DjangoBlog-master_1/DjangoBlog-master/templates/blog/tags/article_info.html rename to src/DjangoBlog-master/templates/blog/tags/article_info.html diff --git a/src/DjangoBlog-master_1/DjangoBlog-master/templates/blog/tags/article_meta_info.html b/src/DjangoBlog-master/templates/blog/tags/article_meta_info.html similarity index 100% rename from src/DjangoBlog-master_1/DjangoBlog-master/templates/blog/tags/article_meta_info.html rename to src/DjangoBlog-master/templates/blog/tags/article_meta_info.html diff --git a/src/DjangoBlog-master_1/DjangoBlog-master/templates/blog/tags/article_pagination.html b/src/DjangoBlog-master/templates/blog/tags/article_pagination.html similarity index 100% rename from src/DjangoBlog-master_1/DjangoBlog-master/templates/blog/tags/article_pagination.html rename to src/DjangoBlog-master/templates/blog/tags/article_pagination.html diff --git a/src/DjangoBlog-master_1/DjangoBlog-master/templates/blog/tags/article_tag_list.html b/src/DjangoBlog-master/templates/blog/tags/article_tag_list.html similarity index 100% rename from src/DjangoBlog-master_1/DjangoBlog-master/templates/blog/tags/article_tag_list.html rename to src/DjangoBlog-master/templates/blog/tags/article_tag_list.html diff --git a/src/DjangoBlog-master_1/DjangoBlog-master/templates/blog/tags/breadcrumb.html b/src/DjangoBlog-master/templates/blog/tags/breadcrumb.html similarity index 100% rename from src/DjangoBlog-master_1/DjangoBlog-master/templates/blog/tags/breadcrumb.html rename to src/DjangoBlog-master/templates/blog/tags/breadcrumb.html diff --git a/src/DjangoBlog-master_1/DjangoBlog-master/templates/blog/tags/sidebar.html b/src/DjangoBlog-master/templates/blog/tags/sidebar.html similarity index 100% rename from src/DjangoBlog-master_1/DjangoBlog-master/templates/blog/tags/sidebar.html rename to src/DjangoBlog-master/templates/blog/tags/sidebar.html diff --git a/src/DjangoBlog-master_1/DjangoBlog-master/templates/comments/tags/comment_item.html b/src/DjangoBlog-master/templates/comments/tags/comment_item.html similarity index 100% rename from src/DjangoBlog-master_1/DjangoBlog-master/templates/comments/tags/comment_item.html rename to src/DjangoBlog-master/templates/comments/tags/comment_item.html diff --git a/src/DjangoBlog-master_1/DjangoBlog-master/templates/comments/tags/comment_item_tree.html b/src/DjangoBlog-master/templates/comments/tags/comment_item_tree.html similarity index 100% rename from src/DjangoBlog-master_1/DjangoBlog-master/templates/comments/tags/comment_item_tree.html rename to src/DjangoBlog-master/templates/comments/tags/comment_item_tree.html diff --git a/src/DjangoBlog-master_1/DjangoBlog-master/templates/comments/tags/comment_list.html b/src/DjangoBlog-master/templates/comments/tags/comment_list.html similarity index 100% rename from src/DjangoBlog-master_1/DjangoBlog-master/templates/comments/tags/comment_list.html rename to src/DjangoBlog-master/templates/comments/tags/comment_list.html diff --git a/src/DjangoBlog-master_1/DjangoBlog-master/templates/comments/tags/post_comment.html b/src/DjangoBlog-master/templates/comments/tags/post_comment.html similarity index 100% rename from src/DjangoBlog-master_1/DjangoBlog-master/templates/comments/tags/post_comment.html rename to src/DjangoBlog-master/templates/comments/tags/post_comment.html diff --git a/src/DjangoBlog-master_1/DjangoBlog-master/templates/oauth/bindsuccess.html b/src/DjangoBlog-master/templates/oauth/bindsuccess.html similarity index 100% rename from src/DjangoBlog-master_1/DjangoBlog-master/templates/oauth/bindsuccess.html rename to src/DjangoBlog-master/templates/oauth/bindsuccess.html diff --git a/src/DjangoBlog-master_1/DjangoBlog-master/templates/oauth/oauth_applications.html b/src/DjangoBlog-master/templates/oauth/oauth_applications.html similarity index 100% rename from src/DjangoBlog-master_1/DjangoBlog-master/templates/oauth/oauth_applications.html rename to src/DjangoBlog-master/templates/oauth/oauth_applications.html diff --git a/src/DjangoBlog-master_1/DjangoBlog-master/templates/oauth/require_email.html b/src/DjangoBlog-master/templates/oauth/require_email.html similarity index 100% rename from src/DjangoBlog-master_1/DjangoBlog-master/templates/oauth/require_email.html rename to src/DjangoBlog-master/templates/oauth/require_email.html diff --git a/src/DjangoBlog-master_1/DjangoBlog-master/templates/owntracks/show_log_dates.html b/src/DjangoBlog-master/templates/owntracks/show_log_dates.html similarity index 100% rename from src/DjangoBlog-master_1/DjangoBlog-master/templates/owntracks/show_log_dates.html rename to src/DjangoBlog-master/templates/owntracks/show_log_dates.html diff --git a/src/DjangoBlog-master_1/DjangoBlog-master/templates/owntracks/show_maps.html b/src/DjangoBlog-master/templates/owntracks/show_maps.html similarity index 100% rename from src/DjangoBlog-master_1/DjangoBlog-master/templates/owntracks/show_maps.html rename to src/DjangoBlog-master/templates/owntracks/show_maps.html diff --git a/src/DjangoBlog-master_1/DjangoBlog-master/templates/search/indexes/blog/article_text.txt b/src/DjangoBlog-master/templates/search/indexes/blog/article_text.txt similarity index 100% rename from src/DjangoBlog-master_1/DjangoBlog-master/templates/search/indexes/blog/article_text.txt rename to src/DjangoBlog-master/templates/search/indexes/blog/article_text.txt diff --git a/src/DjangoBlog-master_1/DjangoBlog-master/templates/search/search.html b/src/DjangoBlog-master/templates/search/search.html similarity index 100% rename from src/DjangoBlog-master_1/DjangoBlog-master/templates/search/search.html rename to src/DjangoBlog-master/templates/search/search.html diff --git a/src/DjangoBlog-master_1/DjangoBlog-master/templates/share_layout/adsense.html b/src/DjangoBlog-master/templates/share_layout/adsense.html similarity index 100% rename from src/DjangoBlog-master_1/DjangoBlog-master/templates/share_layout/adsense.html rename to src/DjangoBlog-master/templates/share_layout/adsense.html diff --git a/src/DjangoBlog-master_1/DjangoBlog-master/templates/share_layout/base.html b/src/DjangoBlog-master/templates/share_layout/base.html similarity index 100% rename from src/DjangoBlog-master_1/DjangoBlog-master/templates/share_layout/base.html rename to src/DjangoBlog-master/templates/share_layout/base.html diff --git a/src/DjangoBlog-master_1/DjangoBlog-master/templates/share_layout/base_account.html b/src/DjangoBlog-master/templates/share_layout/base_account.html similarity index 100% rename from src/DjangoBlog-master_1/DjangoBlog-master/templates/share_layout/base_account.html rename to src/DjangoBlog-master/templates/share_layout/base_account.html diff --git a/src/DjangoBlog-master_1/DjangoBlog-master/templates/share_layout/footer.html b/src/DjangoBlog-master/templates/share_layout/footer.html similarity index 100% rename from src/DjangoBlog-master_1/DjangoBlog-master/templates/share_layout/footer.html rename to src/DjangoBlog-master/templates/share_layout/footer.html diff --git a/src/DjangoBlog-master_1/DjangoBlog-master/templates/share_layout/nav.html b/src/DjangoBlog-master/templates/share_layout/nav.html similarity index 100% rename from src/DjangoBlog-master_1/DjangoBlog-master/templates/share_layout/nav.html rename to src/DjangoBlog-master/templates/share_layout/nav.html diff --git a/src/DjangoBlog-master_1/DjangoBlog-master/templates/share_layout/nav_node.html b/src/DjangoBlog-master/templates/share_layout/nav_node.html similarity index 100% rename from src/DjangoBlog-master_1/DjangoBlog-master/templates/share_layout/nav_node.html rename to src/DjangoBlog-master/templates/share_layout/nav_node.html diff --git a/src/DjangoBlog-master_1/.idea/.gitignore b/src/DjangoBlog-master_1/.idea/.gitignore deleted file mode 100644 index 359bb53..0000000 --- a/src/DjangoBlog-master_1/.idea/.gitignore +++ /dev/null @@ -1,3 +0,0 @@ -# 默认忽略的文件 -/shelf/ -/workspace.xml diff --git a/src/DjangoBlog-master_1/.idea/DjangoBlog-master.iml b/src/DjangoBlog-master_1/.idea/DjangoBlog-master.iml deleted file mode 100644 index 566804d..0000000 --- a/src/DjangoBlog-master_1/.idea/DjangoBlog-master.iml +++ /dev/null @@ -1,17 +0,0 @@ -<<<<<<< HEAD - #11 - -======= - - #当前版本是4 ->>>>>>> 8581d5796cc6f0d8331faf265b42580ab31a2bea - - - - - - - - \ No newline at end of file diff --git a/src/DjangoBlog-master_1/.idea/inspectionProfiles/profiles_settings.xml b/src/DjangoBlog-master_1/.idea/inspectionProfiles/profiles_settings.xml deleted file mode 100644 index 105ce2d..0000000 --- a/src/DjangoBlog-master_1/.idea/inspectionProfiles/profiles_settings.xml +++ /dev/null @@ -1,6 +0,0 @@ - - - - \ No newline at end of file diff --git a/src/DjangoBlog-master_1/.idea/misc.xml b/src/DjangoBlog-master_1/.idea/misc.xml deleted file mode 100644 index 7717a04..0000000 --- a/src/DjangoBlog-master_1/.idea/misc.xml +++ /dev/null @@ -1,7 +0,0 @@ - - - - - - \ No newline at end of file diff --git a/src/DjangoBlog-master_1/.idea/modules.xml b/src/DjangoBlog-master_1/.idea/modules.xml deleted file mode 100644 index 5494c00..0000000 --- a/src/DjangoBlog-master_1/.idea/modules.xml +++ /dev/null @@ -1,8 +0,0 @@ - - - - - - - - \ No newline at end of file diff --git a/src/DjangoBlog-master_1/.idea/vcs.xml b/src/DjangoBlog-master_1/.idea/vcs.xml deleted file mode 100644 index 2dd0ec8..0000000 --- a/src/DjangoBlog-master_1/.idea/vcs.xml +++ /dev/null @@ -1,7 +0,0 @@ - - #11 - - - - - \ No newline at end of file diff --git a/src/DjangoBlog-master_1/Dockerfile b/src/Dockerfile similarity index 100% rename from src/DjangoBlog-master_1/Dockerfile rename to src/Dockerfile diff --git a/src/DjangoBlog-master_1/LICENSE b/src/LICENSE similarity index 100% rename from src/DjangoBlog-master_1/LICENSE rename to src/LICENSE diff --git a/src/DjangoBlog-master_1/README.md b/src/README.md similarity index 100% rename from src/DjangoBlog-master_1/README.md rename to src/README.md diff --git a/src/DjangoBlog-master_1/accounts/__init__.py b/src/accounts/__init__.py similarity index 100% rename from src/DjangoBlog-master_1/accounts/__init__.py rename to src/accounts/__init__.py diff --git a/src/DjangoBlog-master_1/accounts/admin.py b/src/accounts/admin.py similarity index 100% rename from src/DjangoBlog-master_1/accounts/admin.py rename to src/accounts/admin.py diff --git a/src/DjangoBlog-master_1/accounts/apps.py b/src/accounts/apps.py similarity index 100% rename from src/DjangoBlog-master_1/accounts/apps.py rename to src/accounts/apps.py diff --git a/src/DjangoBlog-master_1/accounts/forms.py b/src/accounts/forms.py similarity index 100% rename from src/DjangoBlog-master_1/accounts/forms.py rename to src/accounts/forms.py diff --git a/src/DjangoBlog-master_1/accounts/migrations/0001_initial.py b/src/accounts/migrations/0001_initial.py similarity index 100% rename from src/DjangoBlog-master_1/accounts/migrations/0001_initial.py rename to src/accounts/migrations/0001_initial.py diff --git a/src/DjangoBlog-master_1/accounts/migrations/0002_alter_bloguser_options_remove_bloguser_created_time_and_more.py b/src/accounts/migrations/0002_alter_bloguser_options_remove_bloguser_created_time_and_more.py similarity index 100% rename from src/DjangoBlog-master_1/accounts/migrations/0002_alter_bloguser_options_remove_bloguser_created_time_and_more.py rename to src/accounts/migrations/0002_alter_bloguser_options_remove_bloguser_created_time_and_more.py diff --git a/src/DjangoBlog-master_1/accounts/migrations/__init__.py b/src/accounts/migrations/__init__.py similarity index 100% rename from src/DjangoBlog-master_1/accounts/migrations/__init__.py rename to src/accounts/migrations/__init__.py diff --git a/src/DjangoBlog-master_1/accounts/models.py b/src/accounts/models.py similarity index 100% rename from src/DjangoBlog-master_1/accounts/models.py rename to src/accounts/models.py diff --git a/src/DjangoBlog-master_1/accounts/templatetags/__init__.py b/src/accounts/templatetags/__init__.py similarity index 100% rename from src/DjangoBlog-master_1/accounts/templatetags/__init__.py rename to src/accounts/templatetags/__init__.py diff --git a/src/DjangoBlog-master_1/accounts/tests.py b/src/accounts/tests.py similarity index 100% rename from src/DjangoBlog-master_1/accounts/tests.py rename to src/accounts/tests.py diff --git a/src/DjangoBlog-master_1/accounts/urls.py b/src/accounts/urls.py similarity index 100% rename from src/DjangoBlog-master_1/accounts/urls.py rename to src/accounts/urls.py diff --git a/src/DjangoBlog-master_1/accounts/user_login_backend.py b/src/accounts/user_login_backend.py similarity index 100% rename from src/DjangoBlog-master_1/accounts/user_login_backend.py rename to src/accounts/user_login_backend.py diff --git a/src/DjangoBlog-master_1/accounts/utils.py b/src/accounts/utils.py similarity index 100% rename from src/DjangoBlog-master_1/accounts/utils.py rename to src/accounts/utils.py diff --git a/src/DjangoBlog-master_1/accounts/views.py b/src/accounts/views.py similarity index 100% rename from src/DjangoBlog-master_1/accounts/views.py rename to src/accounts/views.py diff --git a/src/DjangoBlog-master_1/blog/__init__.py b/src/blog/__init__.py similarity index 100% rename from src/DjangoBlog-master_1/blog/__init__.py rename to src/blog/__init__.py diff --git a/src/DjangoBlog-master_1/blog/admin.py b/src/blog/admin.py similarity index 100% rename from src/DjangoBlog-master_1/blog/admin.py rename to src/blog/admin.py diff --git a/src/DjangoBlog-master_1/blog/apps.py b/src/blog/apps.py similarity index 100% rename from src/DjangoBlog-master_1/blog/apps.py rename to src/blog/apps.py diff --git a/src/DjangoBlog-master_1/blog/context_processors.py b/src/blog/context_processors.py similarity index 100% rename from src/DjangoBlog-master_1/blog/context_processors.py rename to src/blog/context_processors.py diff --git a/src/DjangoBlog-master_1/blog/documents.py b/src/blog/documents.py similarity index 100% rename from src/DjangoBlog-master_1/blog/documents.py rename to src/blog/documents.py diff --git a/src/DjangoBlog-master_1/blog/forms.py b/src/blog/forms.py similarity index 100% rename from src/DjangoBlog-master_1/blog/forms.py rename to src/blog/forms.py diff --git a/src/DjangoBlog-master_1/blog/management/__init__.py b/src/blog/management/__init__.py similarity index 100% rename from src/DjangoBlog-master_1/blog/management/__init__.py rename to src/blog/management/__init__.py diff --git a/src/DjangoBlog-master_1/blog/management/commands/__init__.py b/src/blog/management/commands/__init__.py similarity index 100% rename from src/DjangoBlog-master_1/blog/management/commands/__init__.py rename to src/blog/management/commands/__init__.py diff --git a/src/DjangoBlog-master_1/blog/management/commands/build_index.py b/src/blog/management/commands/build_index.py similarity index 100% rename from src/DjangoBlog-master_1/blog/management/commands/build_index.py rename to src/blog/management/commands/build_index.py diff --git a/src/DjangoBlog-master_1/blog/management/commands/build_search_words.py b/src/blog/management/commands/build_search_words.py similarity index 100% rename from src/DjangoBlog-master_1/blog/management/commands/build_search_words.py rename to src/blog/management/commands/build_search_words.py diff --git a/src/DjangoBlog-master_1/blog/management/commands/clear_cache.py b/src/blog/management/commands/clear_cache.py similarity index 100% rename from src/DjangoBlog-master_1/blog/management/commands/clear_cache.py rename to src/blog/management/commands/clear_cache.py diff --git a/src/DjangoBlog-master_1/blog/management/commands/create_testdata.py b/src/blog/management/commands/create_testdata.py similarity index 100% rename from src/DjangoBlog-master_1/blog/management/commands/create_testdata.py rename to src/blog/management/commands/create_testdata.py diff --git a/src/DjangoBlog-master_1/blog/management/commands/ping_baidu.py b/src/blog/management/commands/ping_baidu.py similarity index 100% rename from src/DjangoBlog-master_1/blog/management/commands/ping_baidu.py rename to src/blog/management/commands/ping_baidu.py diff --git a/src/DjangoBlog-master_1/blog/management/commands/sync_user_avatar.py b/src/blog/management/commands/sync_user_avatar.py similarity index 100% rename from src/DjangoBlog-master_1/blog/management/commands/sync_user_avatar.py rename to src/blog/management/commands/sync_user_avatar.py diff --git a/src/DjangoBlog-master_1/blog/middleware.py b/src/blog/middleware.py similarity index 100% rename from src/DjangoBlog-master_1/blog/middleware.py rename to src/blog/middleware.py diff --git a/src/DjangoBlog-master_1/blog/migrations/0001_initial.py b/src/blog/migrations/0001_initial.py similarity index 100% rename from src/DjangoBlog-master_1/blog/migrations/0001_initial.py rename to src/blog/migrations/0001_initial.py diff --git a/src/DjangoBlog-master_1/blog/migrations/0002_blogsettings_global_footer_and_more.py b/src/blog/migrations/0002_blogsettings_global_footer_and_more.py similarity index 100% rename from src/DjangoBlog-master_1/blog/migrations/0002_blogsettings_global_footer_and_more.py rename to src/blog/migrations/0002_blogsettings_global_footer_and_more.py diff --git a/src/DjangoBlog-master_1/blog/migrations/0003_blogsettings_comment_need_review.py b/src/blog/migrations/0003_blogsettings_comment_need_review.py similarity index 100% rename from src/DjangoBlog-master_1/blog/migrations/0003_blogsettings_comment_need_review.py rename to src/blog/migrations/0003_blogsettings_comment_need_review.py diff --git a/src/DjangoBlog-master_1/blog/migrations/0004_rename_analyticscode_blogsettings_analytics_code_and_more.py b/src/blog/migrations/0004_rename_analyticscode_blogsettings_analytics_code_and_more.py similarity index 100% rename from src/DjangoBlog-master_1/blog/migrations/0004_rename_analyticscode_blogsettings_analytics_code_and_more.py rename to src/blog/migrations/0004_rename_analyticscode_blogsettings_analytics_code_and_more.py diff --git a/src/DjangoBlog-master_1/blog/migrations/0005_alter_article_options_alter_category_options_and_more.py b/src/blog/migrations/0005_alter_article_options_alter_category_options_and_more.py similarity index 100% rename from src/DjangoBlog-master_1/blog/migrations/0005_alter_article_options_alter_category_options_and_more.py rename to src/blog/migrations/0005_alter_article_options_alter_category_options_and_more.py diff --git a/src/DjangoBlog-master_1/blog/migrations/0006_alter_blogsettings_options.py b/src/blog/migrations/0006_alter_blogsettings_options.py similarity index 100% rename from src/DjangoBlog-master_1/blog/migrations/0006_alter_blogsettings_options.py rename to src/blog/migrations/0006_alter_blogsettings_options.py diff --git a/src/DjangoBlog-master_1/blog/migrations/__init__.py b/src/blog/migrations/__init__.py similarity index 100% rename from src/DjangoBlog-master_1/blog/migrations/__init__.py rename to src/blog/migrations/__init__.py diff --git a/src/DjangoBlog-master_1/blog/models.py b/src/blog/models.py similarity index 100% rename from src/DjangoBlog-master_1/blog/models.py rename to src/blog/models.py diff --git a/src/DjangoBlog-master_1/blog/search_indexes.py b/src/blog/search_indexes.py similarity index 100% rename from src/DjangoBlog-master_1/blog/search_indexes.py rename to src/blog/search_indexes.py diff --git a/src/DjangoBlog-master_1/blog/templatetags/__init__.py b/src/blog/templatetags/__init__.py similarity index 100% rename from src/DjangoBlog-master_1/blog/templatetags/__init__.py rename to src/blog/templatetags/__init__.py diff --git a/src/DjangoBlog-master_1/blog/templatetags/blog_tags.py b/src/blog/templatetags/blog_tags.py similarity index 100% rename from src/DjangoBlog-master_1/blog/templatetags/blog_tags.py rename to src/blog/templatetags/blog_tags.py diff --git a/src/DjangoBlog-master_1/blog/tests.py b/src/blog/tests.py similarity index 100% rename from src/DjangoBlog-master_1/blog/tests.py rename to src/blog/tests.py diff --git a/src/DjangoBlog-master_1/blog/urls.py b/src/blog/urls.py similarity index 100% rename from src/DjangoBlog-master_1/blog/urls.py rename to src/blog/urls.py diff --git a/src/DjangoBlog-master_1/blog/views.py b/src/blog/views.py similarity index 100% rename from src/DjangoBlog-master_1/blog/views.py rename to src/blog/views.py diff --git a/src/DjangoBlog-master_1/comments/__init__.py b/src/comments/__init__.py similarity index 100% rename from src/DjangoBlog-master_1/comments/__init__.py rename to src/comments/__init__.py diff --git a/src/DjangoBlog-master_1/comments/admin.py b/src/comments/admin.py similarity index 100% rename from src/DjangoBlog-master_1/comments/admin.py rename to src/comments/admin.py diff --git a/src/DjangoBlog-master_1/comments/apps.py b/src/comments/apps.py similarity index 100% rename from src/DjangoBlog-master_1/comments/apps.py rename to src/comments/apps.py diff --git a/src/DjangoBlog-master_1/comments/forms.py b/src/comments/forms.py similarity index 100% rename from src/DjangoBlog-master_1/comments/forms.py rename to src/comments/forms.py diff --git a/src/DjangoBlog-master_1/comments/migrations/0001_initial.py b/src/comments/migrations/0001_initial.py similarity index 100% rename from src/DjangoBlog-master_1/comments/migrations/0001_initial.py rename to src/comments/migrations/0001_initial.py diff --git a/src/DjangoBlog-master_1/comments/migrations/0002_alter_comment_is_enable.py b/src/comments/migrations/0002_alter_comment_is_enable.py similarity index 100% rename from src/DjangoBlog-master_1/comments/migrations/0002_alter_comment_is_enable.py rename to src/comments/migrations/0002_alter_comment_is_enable.py diff --git a/src/DjangoBlog-master_1/comments/migrations/0003_alter_comment_options_remove_comment_created_time_and_more.py b/src/comments/migrations/0003_alter_comment_options_remove_comment_created_time_and_more.py similarity index 100% rename from src/DjangoBlog-master_1/comments/migrations/0003_alter_comment_options_remove_comment_created_time_and_more.py rename to src/comments/migrations/0003_alter_comment_options_remove_comment_created_time_and_more.py diff --git a/src/DjangoBlog-master_1/comments/migrations/__init__.py b/src/comments/migrations/__init__.py similarity index 100% rename from src/DjangoBlog-master_1/comments/migrations/__init__.py rename to src/comments/migrations/__init__.py diff --git a/src/DjangoBlog-master_1/comments/models.py b/src/comments/models.py similarity index 100% rename from src/DjangoBlog-master_1/comments/models.py rename to src/comments/models.py diff --git a/src/DjangoBlog-master_1/comments/templatetags/__init__.py b/src/comments/templatetags/__init__.py similarity index 100% rename from src/DjangoBlog-master_1/comments/templatetags/__init__.py rename to src/comments/templatetags/__init__.py diff --git a/src/DjangoBlog-master_1/comments/templatetags/comments_tags.py b/src/comments/templatetags/comments_tags.py similarity index 100% rename from src/DjangoBlog-master_1/comments/templatetags/comments_tags.py rename to src/comments/templatetags/comments_tags.py diff --git a/src/DjangoBlog-master_1/comments/tests.py b/src/comments/tests.py similarity index 100% rename from src/DjangoBlog-master_1/comments/tests.py rename to src/comments/tests.py diff --git a/src/DjangoBlog-master_1/comments/urls.py b/src/comments/urls.py similarity index 100% rename from src/DjangoBlog-master_1/comments/urls.py rename to src/comments/urls.py diff --git a/src/DjangoBlog-master_1/comments/utils.py b/src/comments/utils.py similarity index 100% rename from src/DjangoBlog-master_1/comments/utils.py rename to src/comments/utils.py diff --git a/src/DjangoBlog-master_1/comments/views.py b/src/comments/views.py similarity index 100% rename from src/DjangoBlog-master_1/comments/views.py rename to src/comments/views.py diff --git a/src/DjangoBlog-master_1/deploy/docker-compose/docker-compose.es.yml b/src/deploy/docker-compose/docker-compose.es.yml similarity index 100% rename from src/DjangoBlog-master_1/deploy/docker-compose/docker-compose.es.yml rename to src/deploy/docker-compose/docker-compose.es.yml diff --git a/src/DjangoBlog-master_1/deploy/docker-compose/docker-compose.yml b/src/deploy/docker-compose/docker-compose.yml similarity index 100% rename from src/DjangoBlog-master_1/deploy/docker-compose/docker-compose.yml rename to src/deploy/docker-compose/docker-compose.yml diff --git a/src/DjangoBlog-master_1/deploy/entrypoint.sh b/src/deploy/entrypoint.sh similarity index 100% rename from src/DjangoBlog-master_1/deploy/entrypoint.sh rename to src/deploy/entrypoint.sh diff --git a/src/DjangoBlog-master_1/deploy/k8s/configmap.yaml b/src/deploy/k8s/configmap.yaml similarity index 100% rename from src/DjangoBlog-master_1/deploy/k8s/configmap.yaml rename to src/deploy/k8s/configmap.yaml diff --git a/src/DjangoBlog-master_1/deploy/k8s/deployment.yaml b/src/deploy/k8s/deployment.yaml similarity index 100% rename from src/DjangoBlog-master_1/deploy/k8s/deployment.yaml rename to src/deploy/k8s/deployment.yaml diff --git a/src/DjangoBlog-master_1/deploy/k8s/gateway.yaml b/src/deploy/k8s/gateway.yaml similarity index 100% rename from src/DjangoBlog-master_1/deploy/k8s/gateway.yaml rename to src/deploy/k8s/gateway.yaml diff --git a/src/DjangoBlog-master_1/deploy/k8s/pv.yaml b/src/deploy/k8s/pv.yaml similarity index 100% rename from src/DjangoBlog-master_1/deploy/k8s/pv.yaml rename to src/deploy/k8s/pv.yaml diff --git a/src/DjangoBlog-master_1/deploy/k8s/pvc.yaml b/src/deploy/k8s/pvc.yaml similarity index 100% rename from src/DjangoBlog-master_1/deploy/k8s/pvc.yaml rename to src/deploy/k8s/pvc.yaml diff --git a/src/DjangoBlog-master_1/deploy/k8s/service.yaml b/src/deploy/k8s/service.yaml similarity index 100% rename from src/DjangoBlog-master_1/deploy/k8s/service.yaml rename to src/deploy/k8s/service.yaml diff --git a/src/DjangoBlog-master_1/deploy/k8s/storageclass.yaml b/src/deploy/k8s/storageclass.yaml similarity index 100% rename from src/DjangoBlog-master_1/deploy/k8s/storageclass.yaml rename to src/deploy/k8s/storageclass.yaml diff --git a/src/DjangoBlog-master_1/deploy/nginx.conf b/src/deploy/nginx.conf similarity index 100% rename from src/DjangoBlog-master_1/deploy/nginx.conf rename to src/deploy/nginx.conf diff --git a/src/DjangoBlog-master_1/docs/README-en.md b/src/docs/README-en.md similarity index 100% rename from src/DjangoBlog-master_1/docs/README-en.md rename to src/docs/README-en.md diff --git a/src/DjangoBlog-master_1/docs/config-en.md b/src/docs/config-en.md similarity index 100% rename from src/DjangoBlog-master_1/docs/config-en.md rename to src/docs/config-en.md diff --git a/src/DjangoBlog-master_1/docs/config.md b/src/docs/config.md similarity index 100% rename from src/DjangoBlog-master_1/docs/config.md rename to src/docs/config.md diff --git a/src/DjangoBlog-master_1/docs/docker-en.md b/src/docs/docker-en.md similarity index 100% rename from src/DjangoBlog-master_1/docs/docker-en.md rename to src/docs/docker-en.md diff --git a/src/DjangoBlog-master_1/docs/docker.md b/src/docs/docker.md similarity index 100% rename from src/DjangoBlog-master_1/docs/docker.md rename to src/docs/docker.md diff --git a/src/DjangoBlog-master_1/docs/es.md b/src/docs/es.md similarity index 100% rename from src/DjangoBlog-master_1/docs/es.md rename to src/docs/es.md diff --git a/src/DjangoBlog-master_1/docs/imgs/alipay.jpg b/src/docs/imgs/alipay.jpg similarity index 100% rename from src/DjangoBlog-master_1/docs/imgs/alipay.jpg rename to src/docs/imgs/alipay.jpg diff --git a/src/DjangoBlog-master_1/docs/imgs/pycharm_logo.png b/src/docs/imgs/pycharm_logo.png similarity index 100% rename from src/DjangoBlog-master_1/docs/imgs/pycharm_logo.png rename to src/docs/imgs/pycharm_logo.png diff --git a/src/DjangoBlog-master_1/docs/imgs/wechat.jpg b/src/docs/imgs/wechat.jpg similarity index 100% rename from src/DjangoBlog-master_1/docs/imgs/wechat.jpg rename to src/docs/imgs/wechat.jpg diff --git a/src/DjangoBlog-master_1/docs/k8s-en.md b/src/docs/k8s-en.md similarity index 100% rename from src/DjangoBlog-master_1/docs/k8s-en.md rename to src/docs/k8s-en.md diff --git a/src/DjangoBlog-master_1/docs/k8s.md b/src/docs/k8s.md similarity index 100% rename from src/DjangoBlog-master_1/docs/k8s.md rename to src/docs/k8s.md diff --git a/src/DjangoBlog-master_1/locale/en/LC_MESSAGES/django.mo b/src/locale/en/LC_MESSAGES/django.mo similarity index 100% rename from src/DjangoBlog-master_1/locale/en/LC_MESSAGES/django.mo rename to src/locale/en/LC_MESSAGES/django.mo diff --git a/src/DjangoBlog-master_1/locale/en/LC_MESSAGES/django.po b/src/locale/en/LC_MESSAGES/django.po similarity index 100% rename from src/DjangoBlog-master_1/locale/en/LC_MESSAGES/django.po rename to src/locale/en/LC_MESSAGES/django.po diff --git a/src/DjangoBlog-master_1/locale/zh_Hans/LC_MESSAGES/django.mo b/src/locale/zh_Hans/LC_MESSAGES/django.mo similarity index 100% rename from src/DjangoBlog-master_1/locale/zh_Hans/LC_MESSAGES/django.mo rename to src/locale/zh_Hans/LC_MESSAGES/django.mo diff --git a/src/DjangoBlog-master_1/locale/zh_Hans/LC_MESSAGES/django.po b/src/locale/zh_Hans/LC_MESSAGES/django.po similarity index 100% rename from src/DjangoBlog-master_1/locale/zh_Hans/LC_MESSAGES/django.po rename to src/locale/zh_Hans/LC_MESSAGES/django.po diff --git a/src/DjangoBlog-master_1/locale/zh_Hant/LC_MESSAGES/django.mo b/src/locale/zh_Hant/LC_MESSAGES/django.mo similarity index 100% rename from src/DjangoBlog-master_1/locale/zh_Hant/LC_MESSAGES/django.mo rename to src/locale/zh_Hant/LC_MESSAGES/django.mo diff --git a/src/DjangoBlog-master_1/locale/zh_Hant/LC_MESSAGES/django.po b/src/locale/zh_Hant/LC_MESSAGES/django.po similarity index 100% rename from src/DjangoBlog-master_1/locale/zh_Hant/LC_MESSAGES/django.po rename to src/locale/zh_Hant/LC_MESSAGES/django.po diff --git a/src/DjangoBlog-master_1/manage.py b/src/manage.py similarity index 100% rename from src/DjangoBlog-master_1/manage.py rename to src/manage.py diff --git a/src/DjangoBlog-master_1/oauth/__init__.py b/src/oauth/__init__.py similarity index 100% rename from src/DjangoBlog-master_1/oauth/__init__.py rename to src/oauth/__init__.py diff --git a/src/DjangoBlog-master_1/oauth/admin.py b/src/oauth/admin.py similarity index 100% rename from src/DjangoBlog-master_1/oauth/admin.py rename to src/oauth/admin.py diff --git a/src/DjangoBlog-master_1/oauth/apps.py b/src/oauth/apps.py similarity index 100% rename from src/DjangoBlog-master_1/oauth/apps.py rename to src/oauth/apps.py diff --git a/src/DjangoBlog-master_1/oauth/forms.py b/src/oauth/forms.py similarity index 100% rename from src/DjangoBlog-master_1/oauth/forms.py rename to src/oauth/forms.py diff --git a/src/DjangoBlog-master_1/oauth/migrations/0001_initial.py b/src/oauth/migrations/0001_initial.py similarity index 100% rename from src/DjangoBlog-master_1/oauth/migrations/0001_initial.py rename to src/oauth/migrations/0001_initial.py diff --git a/src/DjangoBlog-master_1/oauth/migrations/0002_alter_oauthconfig_options_alter_oauthuser_options_and_more.py b/src/oauth/migrations/0002_alter_oauthconfig_options_alter_oauthuser_options_and_more.py similarity index 100% rename from src/DjangoBlog-master_1/oauth/migrations/0002_alter_oauthconfig_options_alter_oauthuser_options_and_more.py rename to src/oauth/migrations/0002_alter_oauthconfig_options_alter_oauthuser_options_and_more.py diff --git a/src/DjangoBlog-master_1/oauth/migrations/0003_alter_oauthuser_nickname.py b/src/oauth/migrations/0003_alter_oauthuser_nickname.py similarity index 100% rename from src/DjangoBlog-master_1/oauth/migrations/0003_alter_oauthuser_nickname.py rename to src/oauth/migrations/0003_alter_oauthuser_nickname.py diff --git a/src/DjangoBlog-master_1/oauth/migrations/__init__.py b/src/oauth/migrations/__init__.py similarity index 100% rename from src/DjangoBlog-master_1/oauth/migrations/__init__.py rename to src/oauth/migrations/__init__.py diff --git a/src/DjangoBlog-master_1/oauth/models.py b/src/oauth/models.py similarity index 100% rename from src/DjangoBlog-master_1/oauth/models.py rename to src/oauth/models.py diff --git a/src/DjangoBlog-master_1/oauth/oauthmanager.py b/src/oauth/oauthmanager.py similarity index 100% rename from src/DjangoBlog-master_1/oauth/oauthmanager.py rename to src/oauth/oauthmanager.py diff --git a/src/DjangoBlog-master_1/oauth/templatetags/__init__.py b/src/oauth/templatetags/__init__.py similarity index 100% rename from src/DjangoBlog-master_1/oauth/templatetags/__init__.py rename to src/oauth/templatetags/__init__.py diff --git a/src/DjangoBlog-master_1/oauth/templatetags/oauth_tags.py b/src/oauth/templatetags/oauth_tags.py similarity index 100% rename from src/DjangoBlog-master_1/oauth/templatetags/oauth_tags.py rename to src/oauth/templatetags/oauth_tags.py diff --git a/src/DjangoBlog-master_1/oauth/tests.py b/src/oauth/tests.py similarity index 100% rename from src/DjangoBlog-master_1/oauth/tests.py rename to src/oauth/tests.py diff --git a/src/DjangoBlog-master_1/oauth/urls.py b/src/oauth/urls.py similarity index 100% rename from src/DjangoBlog-master_1/oauth/urls.py rename to src/oauth/urls.py diff --git a/src/DjangoBlog-master_1/oauth/views.py b/src/oauth/views.py similarity index 100% rename from src/DjangoBlog-master_1/oauth/views.py rename to src/oauth/views.py diff --git a/src/DjangoBlog-master_1/owntracks/__init__.py b/src/owntracks/__init__.py similarity index 100% rename from src/DjangoBlog-master_1/owntracks/__init__.py rename to src/owntracks/__init__.py diff --git a/src/DjangoBlog-master_1/owntracks/admin.py b/src/owntracks/admin.py similarity index 100% rename from src/DjangoBlog-master_1/owntracks/admin.py rename to src/owntracks/admin.py diff --git a/src/DjangoBlog-master_1/owntracks/apps.py b/src/owntracks/apps.py similarity index 100% rename from src/DjangoBlog-master_1/owntracks/apps.py rename to src/owntracks/apps.py diff --git a/src/DjangoBlog-master_1/owntracks/migrations/0001_initial.py b/src/owntracks/migrations/0001_initial.py similarity index 100% rename from src/DjangoBlog-master_1/owntracks/migrations/0001_initial.py rename to src/owntracks/migrations/0001_initial.py diff --git a/src/DjangoBlog-master_1/owntracks/migrations/0002_alter_owntracklog_options_and_more.py b/src/owntracks/migrations/0002_alter_owntracklog_options_and_more.py similarity index 100% rename from src/DjangoBlog-master_1/owntracks/migrations/0002_alter_owntracklog_options_and_more.py rename to src/owntracks/migrations/0002_alter_owntracklog_options_and_more.py diff --git a/src/DjangoBlog-master_1/owntracks/migrations/__init__.py b/src/owntracks/migrations/__init__.py similarity index 100% rename from src/DjangoBlog-master_1/owntracks/migrations/__init__.py rename to src/owntracks/migrations/__init__.py diff --git a/src/DjangoBlog-master_1/owntracks/models.py b/src/owntracks/models.py similarity index 100% rename from src/DjangoBlog-master_1/owntracks/models.py rename to src/owntracks/models.py diff --git a/src/DjangoBlog-master_1/owntracks/tests.py b/src/owntracks/tests.py similarity index 100% rename from src/DjangoBlog-master_1/owntracks/tests.py rename to src/owntracks/tests.py diff --git a/src/DjangoBlog-master_1/owntracks/urls.py b/src/owntracks/urls.py similarity index 100% rename from src/DjangoBlog-master_1/owntracks/urls.py rename to src/owntracks/urls.py diff --git a/src/DjangoBlog-master_1/owntracks/views.py b/src/owntracks/views.py similarity index 100% rename from src/DjangoBlog-master_1/owntracks/views.py rename to src/owntracks/views.py diff --git a/src/DjangoBlog-master_1/plugins/__init__.py b/src/plugins/__init__.py similarity index 100% rename from src/DjangoBlog-master_1/plugins/__init__.py rename to src/plugins/__init__.py diff --git a/src/DjangoBlog-master_1/plugins/article_copyright/__init__.py b/src/plugins/article_copyright/__init__.py similarity index 100% rename from src/DjangoBlog-master_1/plugins/article_copyright/__init__.py rename to src/plugins/article_copyright/__init__.py diff --git a/src/DjangoBlog-master_1/plugins/article_copyright/plugin.py b/src/plugins/article_copyright/plugin.py similarity index 100% rename from src/DjangoBlog-master_1/plugins/article_copyright/plugin.py rename to src/plugins/article_copyright/plugin.py diff --git a/src/DjangoBlog-master_1/plugins/external_links/__init__.py b/src/plugins/external_links/__init__.py similarity index 100% rename from src/DjangoBlog-master_1/plugins/external_links/__init__.py rename to src/plugins/external_links/__init__.py diff --git a/src/DjangoBlog-master_1/plugins/external_links/plugin.py b/src/plugins/external_links/plugin.py similarity index 100% rename from src/DjangoBlog-master_1/plugins/external_links/plugin.py rename to src/plugins/external_links/plugin.py diff --git a/src/DjangoBlog-master_1/plugins/reading_time/__init__.py b/src/plugins/reading_time/__init__.py similarity index 100% rename from src/DjangoBlog-master_1/plugins/reading_time/__init__.py rename to src/plugins/reading_time/__init__.py diff --git a/src/DjangoBlog-master_1/plugins/reading_time/plugin.py b/src/plugins/reading_time/plugin.py similarity index 100% rename from src/DjangoBlog-master_1/plugins/reading_time/plugin.py rename to src/plugins/reading_time/plugin.py diff --git a/src/DjangoBlog-master_1/plugins/seo_optimizer/__init__.py b/src/plugins/seo_optimizer/__init__.py similarity index 100% rename from src/DjangoBlog-master_1/plugins/seo_optimizer/__init__.py rename to src/plugins/seo_optimizer/__init__.py diff --git a/src/DjangoBlog-master_1/plugins/seo_optimizer/plugin.py b/src/plugins/seo_optimizer/plugin.py similarity index 100% rename from src/DjangoBlog-master_1/plugins/seo_optimizer/plugin.py rename to src/plugins/seo_optimizer/plugin.py diff --git a/src/DjangoBlog-master_1/plugins/view_count/__init__.py b/src/plugins/view_count/__init__.py similarity index 100% rename from src/DjangoBlog-master_1/plugins/view_count/__init__.py rename to src/plugins/view_count/__init__.py diff --git a/src/DjangoBlog-master_1/plugins/view_count/plugin.py b/src/plugins/view_count/plugin.py similarity index 100% rename from src/DjangoBlog-master_1/plugins/view_count/plugin.py rename to src/plugins/view_count/plugin.py diff --git a/src/DjangoBlog-master_1/requirements.txt b/src/requirements.txt similarity index 100% rename from src/DjangoBlog-master_1/requirements.txt rename to src/requirements.txt diff --git a/src/DjangoBlog-master_1/servermanager/MemcacheStorage.py b/src/servermanager/MemcacheStorage.py similarity index 100% rename from src/DjangoBlog-master_1/servermanager/MemcacheStorage.py rename to src/servermanager/MemcacheStorage.py diff --git a/src/DjangoBlog-master_1/servermanager/__init__.py b/src/servermanager/__init__.py similarity index 100% rename from src/DjangoBlog-master_1/servermanager/__init__.py rename to src/servermanager/__init__.py diff --git a/src/DjangoBlog-master_1/servermanager/admin.py b/src/servermanager/admin.py similarity index 100% rename from src/DjangoBlog-master_1/servermanager/admin.py rename to src/servermanager/admin.py diff --git a/src/DjangoBlog-master_1/servermanager/api/__init__.py b/src/servermanager/api/__init__.py similarity index 100% rename from src/DjangoBlog-master_1/servermanager/api/__init__.py rename to src/servermanager/api/__init__.py diff --git a/src/DjangoBlog-master_1/servermanager/api/blogapi.py b/src/servermanager/api/blogapi.py similarity index 100% rename from src/DjangoBlog-master_1/servermanager/api/blogapi.py rename to src/servermanager/api/blogapi.py diff --git a/src/DjangoBlog-master_1/servermanager/api/commonapi.py b/src/servermanager/api/commonapi.py similarity index 100% rename from src/DjangoBlog-master_1/servermanager/api/commonapi.py rename to src/servermanager/api/commonapi.py diff --git a/src/DjangoBlog-master_1/servermanager/apps.py b/src/servermanager/apps.py similarity index 100% rename from src/DjangoBlog-master_1/servermanager/apps.py rename to src/servermanager/apps.py diff --git a/src/DjangoBlog-master_1/servermanager/migrations/0001_initial.py b/src/servermanager/migrations/0001_initial.py similarity index 100% rename from src/DjangoBlog-master_1/servermanager/migrations/0001_initial.py rename to src/servermanager/migrations/0001_initial.py diff --git a/src/DjangoBlog-master_1/servermanager/migrations/0002_alter_emailsendlog_options_and_more.py b/src/servermanager/migrations/0002_alter_emailsendlog_options_and_more.py similarity index 100% rename from src/DjangoBlog-master_1/servermanager/migrations/0002_alter_emailsendlog_options_and_more.py rename to src/servermanager/migrations/0002_alter_emailsendlog_options_and_more.py diff --git a/src/DjangoBlog-master_1/servermanager/migrations/__init__.py b/src/servermanager/migrations/__init__.py similarity index 100% rename from src/DjangoBlog-master_1/servermanager/migrations/__init__.py rename to src/servermanager/migrations/__init__.py diff --git a/src/DjangoBlog-master_1/servermanager/models.py b/src/servermanager/models.py similarity index 100% rename from src/DjangoBlog-master_1/servermanager/models.py rename to src/servermanager/models.py diff --git a/src/DjangoBlog-master_1/servermanager/robot.py b/src/servermanager/robot.py similarity index 100% rename from src/DjangoBlog-master_1/servermanager/robot.py rename to src/servermanager/robot.py diff --git a/src/DjangoBlog-master_1/servermanager/tests.py b/src/servermanager/tests.py similarity index 100% rename from src/DjangoBlog-master_1/servermanager/tests.py rename to src/servermanager/tests.py diff --git a/src/DjangoBlog-master_1/servermanager/urls.py b/src/servermanager/urls.py similarity index 100% rename from src/DjangoBlog-master_1/servermanager/urls.py rename to src/servermanager/urls.py diff --git a/src/DjangoBlog-master_1/servermanager/views.py b/src/servermanager/views.py similarity index 100% rename from src/DjangoBlog-master_1/servermanager/views.py rename to src/servermanager/views.py diff --git a/src/DjangoBlog-master_1/templates/account/forget_password.html b/src/templates/account/forget_password.html similarity index 100% rename from src/DjangoBlog-master_1/templates/account/forget_password.html rename to src/templates/account/forget_password.html diff --git a/src/DjangoBlog-master_1/templates/account/login.html b/src/templates/account/login.html similarity index 100% rename from src/DjangoBlog-master_1/templates/account/login.html rename to src/templates/account/login.html diff --git a/src/DjangoBlog-master_1/templates/account/registration_form.html b/src/templates/account/registration_form.html similarity index 100% rename from src/DjangoBlog-master_1/templates/account/registration_form.html rename to src/templates/account/registration_form.html diff --git a/src/DjangoBlog-master_1/templates/account/result.html b/src/templates/account/result.html similarity index 100% rename from src/DjangoBlog-master_1/templates/account/result.html rename to src/templates/account/result.html diff --git a/src/DjangoBlog-master_1/templates/blog/article_archives.html b/src/templates/blog/article_archives.html similarity index 100% rename from src/DjangoBlog-master_1/templates/blog/article_archives.html rename to src/templates/blog/article_archives.html diff --git a/src/DjangoBlog-master_1/templates/blog/article_detail.html b/src/templates/blog/article_detail.html similarity index 100% rename from src/DjangoBlog-master_1/templates/blog/article_detail.html rename to src/templates/blog/article_detail.html diff --git a/src/DjangoBlog-master_1/templates/blog/article_index.html b/src/templates/blog/article_index.html similarity index 100% rename from src/DjangoBlog-master_1/templates/blog/article_index.html rename to src/templates/blog/article_index.html diff --git a/src/DjangoBlog-master_1/templates/blog/error_page.html b/src/templates/blog/error_page.html similarity index 100% rename from src/DjangoBlog-master_1/templates/blog/error_page.html rename to src/templates/blog/error_page.html diff --git a/src/DjangoBlog-master_1/templates/blog/links_list.html b/src/templates/blog/links_list.html similarity index 100% rename from src/DjangoBlog-master_1/templates/blog/links_list.html rename to src/templates/blog/links_list.html diff --git a/src/DjangoBlog-master_1/templates/blog/tags/article_info.html b/src/templates/blog/tags/article_info.html similarity index 100% rename from src/DjangoBlog-master_1/templates/blog/tags/article_info.html rename to src/templates/blog/tags/article_info.html diff --git a/src/DjangoBlog-master_1/templates/blog/tags/article_meta_info.html b/src/templates/blog/tags/article_meta_info.html similarity index 100% rename from src/DjangoBlog-master_1/templates/blog/tags/article_meta_info.html rename to src/templates/blog/tags/article_meta_info.html diff --git a/src/DjangoBlog-master_1/templates/blog/tags/article_pagination.html b/src/templates/blog/tags/article_pagination.html similarity index 100% rename from src/DjangoBlog-master_1/templates/blog/tags/article_pagination.html rename to src/templates/blog/tags/article_pagination.html diff --git a/src/DjangoBlog-master_1/templates/blog/tags/article_tag_list.html b/src/templates/blog/tags/article_tag_list.html similarity index 100% rename from src/DjangoBlog-master_1/templates/blog/tags/article_tag_list.html rename to src/templates/blog/tags/article_tag_list.html diff --git a/src/DjangoBlog-master_1/templates/blog/tags/breadcrumb.html b/src/templates/blog/tags/breadcrumb.html similarity index 100% rename from src/DjangoBlog-master_1/templates/blog/tags/breadcrumb.html rename to src/templates/blog/tags/breadcrumb.html diff --git a/src/DjangoBlog-master_1/templates/blog/tags/sidebar.html b/src/templates/blog/tags/sidebar.html similarity index 100% rename from src/DjangoBlog-master_1/templates/blog/tags/sidebar.html rename to src/templates/blog/tags/sidebar.html diff --git a/src/DjangoBlog-master_1/templates/comments/tags/comment_item.html b/src/templates/comments/tags/comment_item.html similarity index 100% rename from src/DjangoBlog-master_1/templates/comments/tags/comment_item.html rename to src/templates/comments/tags/comment_item.html diff --git a/src/DjangoBlog-master_1/templates/comments/tags/comment_item_tree.html b/src/templates/comments/tags/comment_item_tree.html similarity index 100% rename from src/DjangoBlog-master_1/templates/comments/tags/comment_item_tree.html rename to src/templates/comments/tags/comment_item_tree.html diff --git a/src/DjangoBlog-master_1/templates/comments/tags/comment_list.html b/src/templates/comments/tags/comment_list.html similarity index 100% rename from src/DjangoBlog-master_1/templates/comments/tags/comment_list.html rename to src/templates/comments/tags/comment_list.html diff --git a/src/DjangoBlog-master_1/templates/comments/tags/post_comment.html b/src/templates/comments/tags/post_comment.html similarity index 100% rename from src/DjangoBlog-master_1/templates/comments/tags/post_comment.html rename to src/templates/comments/tags/post_comment.html diff --git a/src/DjangoBlog-master_1/templates/oauth/bindsuccess.html b/src/templates/oauth/bindsuccess.html similarity index 100% rename from src/DjangoBlog-master_1/templates/oauth/bindsuccess.html rename to src/templates/oauth/bindsuccess.html diff --git a/src/DjangoBlog-master_1/templates/oauth/oauth_applications.html b/src/templates/oauth/oauth_applications.html similarity index 100% rename from src/DjangoBlog-master_1/templates/oauth/oauth_applications.html rename to src/templates/oauth/oauth_applications.html diff --git a/src/DjangoBlog-master_1/templates/oauth/require_email.html b/src/templates/oauth/require_email.html similarity index 100% rename from src/DjangoBlog-master_1/templates/oauth/require_email.html rename to src/templates/oauth/require_email.html diff --git a/src/DjangoBlog-master_1/templates/owntracks/show_log_dates.html b/src/templates/owntracks/show_log_dates.html similarity index 100% rename from src/DjangoBlog-master_1/templates/owntracks/show_log_dates.html rename to src/templates/owntracks/show_log_dates.html diff --git a/src/DjangoBlog-master_1/templates/owntracks/show_maps.html b/src/templates/owntracks/show_maps.html similarity index 100% rename from src/DjangoBlog-master_1/templates/owntracks/show_maps.html rename to src/templates/owntracks/show_maps.html diff --git a/src/DjangoBlog-master_1/templates/search/indexes/blog/article_text.txt b/src/templates/search/indexes/blog/article_text.txt similarity index 100% rename from src/DjangoBlog-master_1/templates/search/indexes/blog/article_text.txt rename to src/templates/search/indexes/blog/article_text.txt diff --git a/src/DjangoBlog-master_1/templates/search/search.html b/src/templates/search/search.html similarity index 100% rename from src/DjangoBlog-master_1/templates/search/search.html rename to src/templates/search/search.html diff --git a/src/DjangoBlog-master_1/templates/share_layout/adsense.html b/src/templates/share_layout/adsense.html similarity index 100% rename from src/DjangoBlog-master_1/templates/share_layout/adsense.html rename to src/templates/share_layout/adsense.html diff --git a/src/DjangoBlog-master_1/templates/share_layout/base.html b/src/templates/share_layout/base.html similarity index 100% rename from src/DjangoBlog-master_1/templates/share_layout/base.html rename to src/templates/share_layout/base.html diff --git a/src/DjangoBlog-master_1/templates/share_layout/base_account.html b/src/templates/share_layout/base_account.html similarity index 100% rename from src/DjangoBlog-master_1/templates/share_layout/base_account.html rename to src/templates/share_layout/base_account.html diff --git a/src/DjangoBlog-master_1/templates/share_layout/footer.html b/src/templates/share_layout/footer.html similarity index 100% rename from src/DjangoBlog-master_1/templates/share_layout/footer.html rename to src/templates/share_layout/footer.html diff --git a/src/DjangoBlog-master_1/templates/share_layout/nav.html b/src/templates/share_layout/nav.html similarity index 100% rename from src/DjangoBlog-master_1/templates/share_layout/nav.html rename to src/templates/share_layout/nav.html diff --git a/src/DjangoBlog-master_1/templates/share_layout/nav_node.html b/src/templates/share_layout/nav_node.html similarity index 100% rename from src/DjangoBlog-master_1/templates/share_layout/nav_node.html rename to src/templates/share_layout/nav_node.html