merge many pull requests

agusmakmun · Jan 21, 2020 · 20a7434 · 20a7434
1 parent 6717f33
commit 20a7434
Show file tree

Hide file tree

Showing 5 changed files with 26 additions and 19 deletions.
diff --git a/README.rst b/README.rst
@@ -113,10 +113,13 @@ to get ``IMGUR_CLIENT_ID`` and ``IMGUR_API_KEY``.
     # Global martor settings
     # Input: string boolean, `true/false`
     MARTOR_ENABLE_CONFIGS = {
-        'imgur': 'true',     # to enable/disable imgur/custom uploader.
-        'mention': 'false',  # to enable/disable mention
-        'jquery': 'true',    # to include/revoke jquery (require for admin default django)
-        'living': 'false',   # to enable/disable live updates in preview
+        'emoji': 'true',       # to enable/disable emoji icons.
+        'imgur': 'true',       # to enable/disable imgur/custom uploader.
+        'mention': 'false',    # to enable/disable mention
+        'jquery': 'true',      # to include/revoke jquery (require for admin default django)
+        'living': 'false',     # to enable/disable live updates in preview
+        'spellcheck': 'true',  # to enable/disable spellcheck in form textareas
+        'hljs': 'true',        # to enable/disable hljs highlighting in preview
     }
 
     # To setup the martor editor with label or not (default is False)

diff --git a/martor_demo/app/templates/base.html b/martor_demo/app/templates/base.html
@@ -52,6 +52,8 @@
   <script type="text/javascript" src="{% static 'plugins/js/mode-markdown.js' %}"></script>
   <script type="text/javascript" src="{% static 'plugins/js/ext-language_tools.js' %}"></script>
   <script type="text/javascript" src="{% static 'plugins/js/theme-github.js' %}"></script>
+  <script type="text/javascript" src="{% static 'plugins/js/typo.js' %}"></script>
+  <script type="text/javascript" src="{% static 'plugins/js/spellcheck.js' %}"></script>
   <script type="text/javascript" src="{% static 'plugins/js/highlight.min.js' %}"></script>
   <script type="text/javascript" src="{% static 'plugins/js/resizable.min.js' %}"></script>
   <script type="text/javascript" src="{% static 'plugins/js/emojis.min.js' %}"></script>

diff --git a/martor_demo/martor_demo/settings.py b/martor_demo/martor_demo/settings.py
@@ -1,13 +1,13 @@
 """
 Django settings for martor_demo project.
 
-Generated by 'django-admin startproject' using Django 2.2.2.
+Generated by 'django-admin startproject' using Django 3.0.2.
 
 For more information on this file, see
-https://docs.djangoproject.com/en/2.2/topics/settings/
+https://docs.djangoproject.com/en/3.0/topics/settings/
 
 For the full list of settings and their values, see
-https://docs.djangoproject.com/en/2.2/ref/settings/
+https://docs.djangoproject.com/en/3.0/ref/settings/
 """
 
 import os
@@ -18,7 +18,7 @@
 
 
 # Quick-start development settings - unsuitable for production
-# See https://docs.djangoproject.com/en/2.2/howto/deployment/checklist/
+# See https://docs.djangoproject.com/en/3.0/howto/deployment/checklist/
 
 # SECURITY WARNING: keep the secret key used in production secret!
 SECRET_KEY = '93fs*#h77*vj&2#2f+!y=kifg0s&63768398a(kx126itq(*6r'
@@ -27,11 +27,13 @@
 DEBUG = True
 ALLOWED_HOSTS = ['*']
 MARTOR_ENABLE_CONFIGS = {
-    'imgur': 'true',         # to enable/disable imgur/custom uploader.
-    'mention': 'true',       # to enable/disable mention
-    'jquery': 'true',        # to include/revoke jquery (require for admin default django)
-    'living': 'false',       # to enable/disable live updates in preview
-    'spellcheck': 'true',    # to enable/disable spellcheck in the editor.
+    'emoji': 'true',       # to enable/disable emoji icons.
+    'imgur': 'true',       # to enable/disable imgur/custom uploader.
+    'mention': 'true',     # to enable/disable mention
+    'jquery': 'true',      # to include/revoke jquery (require for admin default django)
+    'living': 'false',     # to enable/disable live updates in preview
+    'spellcheck': 'true',  # to enable/disable spellcheck in form textareas
+    'hljs': 'true',        # to enable/disable hljs highlighting in preview
 }
 
 # Application definition
@@ -79,7 +81,7 @@
 
 
 # Database
-# https://docs.djangoproject.com/en/2.2/ref/settings/#databases
+# https://docs.djangoproject.com/en/3.0/ref/settings/#databases
 
 DATABASES = {
     'default': {
@@ -90,7 +92,7 @@
 
 
 # Password validation
-# https://docs.djangoproject.com/en/2.2/ref/settings/#auth-password-validators
+# https://docs.djangoproject.com/en/3.0/ref/settings/#auth-password-validators
 
 AUTH_PASSWORD_VALIDATORS = [
     {
@@ -109,7 +111,7 @@
 
 
 # Internationalization
-# https://docs.djangoproject.com/en/2.2/topics/i18n/
+# https://docs.djangoproject.com/en/3.0/topics/i18n/
 
 LANGUAGE_CODE = 'en-us'
 
@@ -123,7 +125,7 @@
 
 
 # Static files (CSS, JavaScript, Images)
-# https://docs.djangoproject.com/en/2.2/howto/static-files/
+# https://docs.djangoproject.com/en/3.0/howto/static-files/
 
 STATIC_URL = '/static/'
 MEDIA_URL = '/media/'

diff --git a/martor_demo/martor_demo/urls.py b/martor_demo/martor_demo/urls.py
@@ -1,7 +1,7 @@
 """martor_demo URL Configuration
 
 The `urlpatterns` list routes URLs to views. For more information please see:
-    https://docs.djangoproject.com/en/2.2/topics/http/urls/
+    https://docs.djangoproject.com/en/3.0/topics/http/urls/
 Examples:
 Function views
     1. Add an import:  from my_app import views

diff --git a/martor_demo/martor_demo/wsgi.py b/martor_demo/martor_demo/wsgi.py
@@ -4,7 +4,7 @@
 It exposes the WSGI callable as a module-level variable named ``application``.
 
 For more information on this file, see
-https://docs.djangoproject.com/en/2.2/howto/deployment/wsgi/
+https://docs.djangoproject.com/en/3.0/howto/deployment/wsgi/
 """
 
 import os