Merge pull request #145 from agusmakmun/development

agusmakmun · web-flow · commit 41526b1a6e0f · 2020-12-11T07:44:50.000+07:00
added issue template, fix martor z-index
diff --git a/.etc/images/bootstrap/martor-preview.png b/.etc/images/bootstrap/martor-preview.png
diff --git a/.github/ISSUE_TEMPLATE/bug_report.md b/.github/ISSUE_TEMPLATE/bug_report.md
@@ -0,0 +1,17 @@
+---
+name: Bug report
+about: Create a bug report
+---
+
+<!-- ⚠️ Please search existing issues to avoid creating duplicates. ⚠️ -->
+<!-- Describe the bug here. -->
+
+## Details
+- Browser and browser version:
+- OS version:
+- Martor version:
+
+### Steps to reproduce
+
+1.
+2.
diff --git a/.github/ISSUE_TEMPLATE/config.yml b/.github/ISSUE_TEMPLATE/config.yml
@@ -0,0 +1,5 @@
+blank_issues_enabled: false
+contact_links:
+  - name: Question
+    url:  https://stackoverflow.com/questions/tagged/martor
+    about: Please ask and answer questions here.
diff --git a/.github/ISSUE_TEMPLATE/feature_request.md b/.github/ISSUE_TEMPLATE/feature_request.md
@@ -0,0 +1,7 @@
+---
+name: Feature request
+about: Suggest a feature or enhancement
+---
+
+<!-- ⚠️ Please search existing issues to avoid creating duplicates. ⚠️ -->
+<!-- Describe the enhancement here. -->
diff --git a/.travis.yml b/.travis.yml
@@ -3,15 +3,6 @@ sudo: false
 
 matrix:
   include:
-    - python: 3.4
-      env: DJANGO="==1.8.*"
-    - python: 3.4
-      env: DJANGO="==1.9.*"
-    - python: 3.4
-      env: DJANGO="==1.10.*"
-    - python: 3.4
-      env: DJANGO="==1.11.*"
-
     - python: 3.5
       env: DJANGO="==1.8.*"
     - python: 3.5
@@ -57,6 +48,17 @@ matrix:
     - python: 3.7
       env: DJANGO="==3.1.*"
 
+    - python: 3.8
+      env: DJANGO="==2.0.*"
+    - python: 3.8
+      env: DJANGO="==2.1.*"
+    - python: 3.8
+      env: DJANGO="==2.2.*"
+    - python: 3.8
+      env: DJANGO="==3.0.*"
+    - python: 3.8
+      env: DJANGO="==3.1.*"
+
     - os: osx
       language: generic
       env: DJANGO="==3.1.*"
diff --git a/martor/locale/en/LC_MESSAGES/django.po b/martor/locale/en/LC_MESSAGES/django.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-09-16 11:53+0700\n"
+"POT-Creation-Date: 2020-11-01 13:57+0700\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -175,15 +175,15 @@ msgstr ""
 msgid "Markdown Guide (Help)"
 msgstr ""
 
-#: views.py:22 views.py:36 views.py:37
+#: views.py:21 views.py:35 views.py:36
 msgid "Invalid request!"
 msgstr ""
 
-#: views.py:77
+#: views.py:74
 #, python-format
 msgid "No users registered as `%(username)s` or user is unactived."
 msgstr ""
 
-#: views.py:81
+#: views.py:79
 msgid "Validation Failed for field `username`"
 msgstr ""
diff --git a/martor/locale/id/LC_MESSAGES/django.po b/martor/locale/id/LC_MESSAGES/django.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-09-16 11:53+0700\n"
+"POT-Creation-Date: 2020-11-01 13:57+0700\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -177,17 +177,17 @@ msgstr "Layar Penuh"
 msgid "Markdown Guide (Help)"
 msgstr "Bantuan Penggunaan Markdown"
 
-#: views.py:22 views.py:36 views.py:37
+#: views.py:21 views.py:35 views.py:36
 msgid "Invalid request!"
 msgstr "Permintaan tidak valid"
 
-#: views.py:77
+#: views.py:74
 #, python-format
 msgid "No users registered as `%(username)s` or user is unactived."
 msgstr ""
 "Tidak ada pengguna terdaftar sebagai `%(username)s` atau pengguna telah "
 "nonaktif."
 
-#: views.py:81
+#: views.py:79
 msgid "Validation Failed for field `username`"
 msgstr "Validasi Gagal untuk field `username`"
diff --git a/martor/locale/tr/LC_MESSAGES/django.po b/martor/locale/tr/LC_MESSAGES/django.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-09-16 11:55+0700\n"
+"POT-Creation-Date: 2020-11-01 13:57+0700\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: Ozcan Yarimdunya <ozcanyd@gmail.com>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -66,8 +66,8 @@ msgid ""
 "This editor is powered by Markdown. For full documentation, <a href="
 "\"%(doc_url)s\" target=\"_blank\">click here</a>."
 msgstr ""
-"Bu editör Markdown tarafından desteklenmektedir. Bütün dokümantasyon için, <a "
-"href=\"%(doc_url)s\" target=\"_blank\">buraya tıkla</a>."
+"Bu editör Markdown tarafından desteklenmektedir. Bütün dokümantasyon için, "
+"<a href=\"%(doc_url)s\" target=\"_blank\">buraya tıkla</a>."
 
 #: templates/martor/bootstrap/guide.html:28
 #: templates/martor/bootstrap/toolbar.html:54
@@ -178,15 +178,15 @@ msgstr "Tam ekran"
 msgid "Markdown Guide (Help)"
 msgstr "Markdown Kılavuzu (Yardım)"
 
-#: views.py:22 views.py:36 views.py:37
+#: views.py:21 views.py:35 views.py:36
 msgid "Invalid request!"
 msgstr "Geçersiz istek!"
 
-#: views.py:77
+#: views.py:74
 #, python-format
 msgid "No users registered as `%(username)s` or user is unactived."
 msgstr "`%(username)s` kullanıcı kayıtlı değil veya aktif değil"
 
-#: views.py:81
+#: views.py:79
 msgid "Validation Failed for field `username`"
 msgstr "`kullanıcı adı` alanı için doğrulama başarısız"
diff --git a/martor/static/martor/css/martor.bootstrap.css b/martor/static/martor/css/martor.bootstrap.css
@@ -162,7 +162,7 @@ div.enable-living .tab-martor-menu a.nav-link {
 .main-martor-fullscreen {
   background: #fff;
   position: fixed;
-  z-index: 999;
+  z-index: 9999;
   max-height: 100%;
   height: 100%;
   width: 100%;
diff --git a/martor/static/martor/css/martor.bootstrap.min.css b/martor/static/martor/css/martor.bootstrap.min.css
diff --git a/martor/static/martor/css/martor.semantic.css b/martor/static/martor/css/martor.semantic.css
@@ -60,7 +60,7 @@ body.overflow {
 .main-martor-fullscreen {
   background: #fff;
   position: fixed;
-  z-index: 999;
+  z-index: 9999;
   max-height: 100%;
   height: 100%;
   width: 100%;
diff --git a/martor/static/martor/css/martor.semantic.min.css b/martor/static/martor/css/martor.semantic.min.css
diff --git a/martor/views.py b/martor/views.py
@@ -9,7 +9,6 @@
 
 from .api import imgur_uploader
 from .settings import MARTOR_MARKDOWNIFY_FUNCTION
-from .utils import LazyEncoder
 
 User = get_user_model()
 
@@ -68,15 +67,16 @@ def markdown_search_user(request):
         queries = {'%s__icontains' % User.USERNAME_FIELD: username}
         users = User.objects.filter(**queries).filter(is_active=True)
         if users.exists():
-            response_data.update({'status': 200,
-                                  'data': [{'username': u.username} for u in users]})
+            users_name = users.values_list('username', flat=True)
+            response_data.update({'status': 200, 'data': users_name})
             return JsonResponse(response_data)
 
-        response_data.update({'status': 204,
-                              'error': _('No users registered as `%(username)s` '
-                                         'or user is unactived.') % {'username': username}})
+        error_message = _('No users registered as `%(username)s` '
+                          'or user is unactived.')
+        error_message = error_message % {'username': username}
+        response_data.update({'status': 204, 'error': error_message})
     else:
-        response_data.update({'status': 204,
-                              'error': _('Validation Failed for field `username`')})
+        error_message = _('Validation Failed for field `username`')
+        response_data.update({'status': 204, 'error': error_message})
 
     return JsonResponse(response_data)
diff --git a/push.sh b/push.sh
@@ -1,11 +1,27 @@
 #!/bin/bash
 
 echo '';
+echo " a. development";
+echo " b. master";
+echo -n "[+] branch [a/B] ➜ ";
+read branch;
+
 echo -n "[+] commit ➜ ";
 read commit;
 
-if [ "$commit" ]; then
-    git add .;
-    git commit -m "$commit";
-    git push -u origin master;
+if [ "$commit" ] && [ "$branch" ]; then
+  git add .;
+  git commit -m "$commit";
+
+  if [ "$branch" == 'b' ] || [ "$branch" == 'B' ]; then
+    git checkout master;
+    git push origin master;
+  else
+    git checkout development;
+    git push origin development;
+  fi
+
+  echo "[i] successfully pushed at" $(date);
+else
+  echo "[!] not pushed!";
 fi
diff --git a/setup.py b/setup.py
@@ -33,14 +33,15 @@ def get_requirements():
         'Framework :: Django :: 2.1',
         'Framework :: Django :: 2.2',
         'Framework :: Django :: 3.0',
+        'Framework :: Django :: 3.1',
         'Intended Audience :: Developers',
         'Operating System :: OS Independent',
         'Programming Language :: JavaScript',
         'Programming Language :: Python',
-        'Programming Language :: Python :: 3.4',
         'Programming Language :: Python :: 3.5',
         'Programming Language :: Python :: 3.6',
         'Programming Language :: Python :: 3.7',
+        'Programming Language :: Python :: 3.8',
         'Topic :: Software Development :: Libraries :: Python Modules',
         'License :: OSI Approved :: GNU General Public License v3 (GPLv3)',
     ],
