From 10cc9d4b411f906eb5053efdab8d2745e79568c2 Mon Sep 17 00:00:00 2001 From: Denis Kildishev Date: Fri, 5 Jan 2018 19:39:05 +0300 Subject: [PATCH 1/7] Update .travis.yml (#282) --- .travis.yml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.travis.yml b/.travis.yml index 5aa64be7..1b7fdcd3 100644 --- a/.travis.yml +++ b/.travis.yml @@ -72,3 +72,6 @@ matrix: env: DJANGO="<1.7" - python: 3.6 env: DJANGO="<1.8" + + - python: pypy + env: DJANGO="<2.1" From 36f642886fda74bc21ef9e668b9ae33f52d1aadc Mon Sep 17 00:00:00 2001 From: Denis Kildishev Date: Thu, 18 Oct 2018 00:45:16 +0300 Subject: [PATCH 2/7] Update master (#368) * Update .travis.yml * Fix google analytics widget (#301) * Make _lock attribute available * Allow server-side token refresh * Update README.rst * Update README.rst --- README.rst | 14 +++++++++++++- .../dashboard_modules/google_analytics.py | 4 +++- 2 files changed, 16 insertions(+), 2 deletions(-) diff --git a/README.rst b/README.rst index 3df0f8da..fb4b7c01 100644 --- a/README.rst +++ b/README.rst @@ -7,6 +7,17 @@ Django JET **Modern template for Django admin interface with improved functionality** ++-----------------------------------------------------------------------------------------------------------------------------------+ +| Attention! **NEW JET** | ++===================================================================================================================================+ +| **We are proud to announce completely new Jet. Please check out Live Demo.** | +| | +| Developing of new features for Django Jet will be frozen, only critical bugs will be fixed. | ++-----------------------------------------------------------------------------------------------------------------------------------+ +| `Live Demo `_ | ++-----------------------------------------------------------------------------------------------------------------------------------+ + + Django JET has two kinds of licenses: open-source (AGPLv3) and commercial. Please note that using AGPLv3 code in your programs make them AGPL compatible too. So if you don't want to comply with that we can provide you a commercial license (visit Home page). The commercial license is designed for using Django JET in commercial products @@ -20,7 +31,8 @@ and applications without the provisions of the AGPLv3. :align: center * Home page: http://jet.geex-arts.com/ -* **Live Demo**: http://demo.jet.geex-arts.com/admin/ +* **New Jet**: `Live Demo `_ +* Live Demo: http://demo.jet.geex-arts.com/admin/ * Documentation: http://jet.readthedocs.org/ * libi.io http://libi.io/library/1683/django-jet * PyPI: https://pypi.python.org/pypi/django-jet diff --git a/jet/dashboard/dashboard_modules/google_analytics.py b/jet/dashboard/dashboard_modules/google_analytics.py index d71ea8d7..31a91056 100644 --- a/jet/dashboard/dashboard_modules/google_analytics.py +++ b/jet/dashboard/dashboard_modules/google_analytics.py @@ -39,6 +39,7 @@ class ModuleCredentialStorage(Storage): def __init__(self, module): + super(ModuleCredentialStorage, self).__init__() self.module = module def locked_get(self): @@ -73,7 +74,8 @@ def __init__(self, storage=None, redirect_uri=None): self.FLOW = flow_from_clientsecrets( JET_MODULE_GOOGLE_ANALYTICS_CLIENT_SECRETS_FILE, scope='https://www.googleapis.com/auth/analytics.readonly', - redirect_uri=redirect_uri + redirect_uri=redirect_uri, + prompt='consent' ) if storage is not None: From c6f67fcb5ab719d6304c232e76548704e6a9b930 Mon Sep 17 00:00:00 2001 From: Lau Bech Lauritzen Date: Thu, 18 Oct 2018 08:27:05 +0200 Subject: [PATCH 3/7] Fixed typo (#327) https://github.com/geex-arts/django-jet/issues/313 --- jet/dashboard/templates/jet.dashboard/module.html | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/jet/dashboard/templates/jet.dashboard/module.html b/jet/dashboard/templates/jet.dashboard/module.html index 8946c351..c02689d8 100644 --- a/jet/dashboard/templates/jet.dashboard/module.html +++ b/jet/dashboard/templates/jet.dashboard/module.html @@ -28,7 +28,7 @@
- {{ module.pre_contenta|default_if_none:"" }} + {{ module.pre_content|default_if_none:"" }} {% if module.ajax_load %}
@@ -38,4 +38,4 @@ {% endif %} {{ module.post_content|default_if_none:"" }}
-
\ No newline at end of file + From f76db3d14fc49b9769941de4c861844df5dcc3b5 Mon Sep 17 00:00:00 2001 From: Daniel Quinn Date: Thu, 18 Oct 2018 07:29:27 +0100 Subject: [PATCH 4/7] Add grammar fixes. (#312) --- docs/dashboard_custom.rst | 20 +++++++++++--------- 1 file changed, 11 insertions(+), 9 deletions(-) diff --git a/docs/dashboard_custom.rst b/docs/dashboard_custom.rst index 4f63fbf3..669f3cc3 100644 --- a/docs/dashboard_custom.rst +++ b/docs/dashboard_custom.rst @@ -4,15 +4,15 @@ Custom Dashboard .. note:: Django JET Dashboard tries to be as compatible as possible with django-admin-tools dashboard so that - django-admin-tools modules could be easily ported to Django JET. In most cases in will be enough to + django-admin-tools modules could be easily ported to Django JET. In most cases it will be enough to change python imports and remove extending in modules templates. -Dashboard represents ``Dashboard`` class instance with ``DashboardModule`` class instances as its children. -Any custom **Dashboard** class should inherit ``jet.dashboard.dashboard.Dashboard`` +Dashboard represents ``Dashboard`` class instances with ``DashboardModule`` class instances as its children. +Any custom **Dashboard** class should inherit from ``jet.dashboard.dashboard.Dashboard`` and use ``init_with_context`` to fill it with widgets. You should add your widgets -to ``children`` and ``available_children`` attributes. +to the ``children`` and ``available_children`` attributes. -Before continue make sure you have completed :doc:`install_dashboard`. +Before you continue, make sure you have completed the :doc:`install_dashboard`. Set Up Custom Dashboard ----------------------- @@ -55,12 +55,14 @@ Set Up Custom Dashboard )) -* Add to your settings.py path to created ``dashboard.py`` (example for ``dashboard.py`` in project root): +* Add the path to your ``dashboard.py`` in your ``settings.py`` file. For example, if your + ``dashboard.py`` is in the project root: .. code:: python JET_INDEX_DASHBOARD = 'dashboard.CustomIndexDashboard' -That's all, now you have dashboard with only one widget - ``LinkList``. Dashboard reset may be needed -if your had another dashboard already rendered for any user. Visit :doc:`dashboard_modules` to learn -other widgets you can add to your custom dashboard or :doc:`dashboard_custom_module` to create your own. \ No newline at end of file +That's all, now you have a dashboard with only one widget - ``LinkList``. Dashboard reset may be needed +if you had another dashboard already rendered for any user. Visit :doc:`dashboard_modules` to learn +about other widgets you can add to your custom dashboard or :doc:`dashboard_custom_module` or to create +your own. From e6e8026253b55197ac6de90235b3051db5cb5f88 Mon Sep 17 00:00:00 2001 From: Denis K Date: Thu, 18 Oct 2018 09:34:34 +0300 Subject: [PATCH 5/7] Update version --- jet/__init__.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/jet/__init__.py b/jet/__init__.py index 0e917f69..f1f2991b 100644 --- a/jet/__init__.py +++ b/jet/__init__.py @@ -1 +1 @@ -VERSION = '1.0.7' +VERSION = '1.0.8' From 8d2ca6fa76e12cf011378d0c17d1f28ffc7ba82b Mon Sep 17 00:00:00 2001 From: Denis Kildishev Date: Tue, 21 May 2019 13:57:01 +0300 Subject: [PATCH 6/7] Update README.rst --- README.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.rst b/README.rst index fb4b7c01..752d1d99 100644 --- a/README.rst +++ b/README.rst @@ -14,7 +14,7 @@ Django JET | | | Developing of new features for Django Jet will be frozen, only critical bugs will be fixed. | +-----------------------------------------------------------------------------------------------------------------------------------+ -| `Live Demo `_ | +| `Live Demo `_ | +-----------------------------------------------------------------------------------------------------------------------------------+ From 30dd52e1c38933c567ceb0e1033b2c0a15134509 Mon Sep 17 00:00:00 2001 From: Denis Kildishev Date: Tue, 21 May 2019 14:05:09 +0300 Subject: [PATCH 7/7] Update README.rst --- README.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.rst b/README.rst index 752d1d99..0d332e47 100644 --- a/README.rst +++ b/README.rst @@ -14,7 +14,7 @@ Django JET | | | Developing of new features for Django Jet will be frozen, only critical bugs will be fixed. | +-----------------------------------------------------------------------------------------------------------------------------------+ -| `Live Demo `_ | +| `Live Demo `_ | +-----------------------------------------------------------------------------------------------------------------------------------+