Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

refactoring to make it work with latest version of django. #95

Open
wants to merge 6 commits into
base: develop
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from 1 commit
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
:heavy_plus-sign: still need a lot to be figured on this config ➕ :/
  • Loading branch information
jagadeeswara_reddy committed Dec 1, 2020
commit 2dac0b2c52e2232b31db688fe5ff7599aa6f228c
2 changes: 1 addition & 1 deletion .bumpversion.cfg
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[bumpversion]
commit = True
current_version = 0.8.4
current_version = 2.0.0
files = django_markdown/__init__.py
tag = True
tag_name = {new_version}
Expand Down
11 changes: 3 additions & 8 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,14 +2,9 @@ language: python

python:
- "3.6"

env:
- TOXENV=py27-d16
- TOXENV=py27-d17
- TOXENV=py34-d17
- TOXENV=py36-d17
- TOXENV=py38-d17
- TOXENV=cov
- "3.7"
- "3.8"
- "3.9"

branches:
only:
Expand Down
18 changes: 1 addition & 17 deletions CONTRIBUTORS
Original file line number Diff line number Diff line change
@@ -1,19 +1,3 @@
Contributors:

* Kirill Klenov (https://github.com/klen)

* Alexey Kalinin (https://github.com/Alkalit)
* Alexey Sveshnikov (https://github.com/alexey-sveshnikov)
* Aliaksei Harabchuk (https://github.com/harabchuk)
* Andrew Grigorev (https://github.com/ei-grad)
* Ashley Wilson (https://github.com/CptLemming)
* Caroline Nadel (https://github.com/cazgp)
* Chris Davis (https://github.com/defbyte)
* F. Gabriel Gosselin (https://github.com/evidens)
* Flávio Caetano (https://github.com/fjcaetano)
* Pavel Puchkin (https://github.com/neoascetic)
* Rolf Håvard Blindheim (https://github.com/rhblind)
* Sergii Iavorskyi (https://github.com/yavorskiy)
* Tom O'onnor' (https://github.com/tomoconnor)
* Wellington Cordeiro (https://github.com/wldcordeiro)
* dfeinzeig (https://github.com/dfeinzeig)
* Deesh Reddy (https://github.com/been-there-done-that)
73 changes: 4 additions & 69 deletions Changelog
Original file line number Diff line number Diff line change
@@ -1,69 +1,4 @@
2014-12-08 wldcordeiro
* Fixing the static loading issue properly.
* version 0.8.2

2014-12-04 wldcordeiro

* Removed static_url setting from package settings due to collision with user setting.
* Modified the ModelAdmins to only override MarkdownFields since some users want normal Textfields to display normall.
* Version 0.8.1

2014-09-25 horneds

* Remove python2.6, Django 1.4 support
* Add Django 1.7 support
* Version 0.7.0

2014-06-04 horneds

* Fix markdown_css template tag (c) Ashley Wilson

2014-05-18 horneds

* Add MARKDOWN_PROTECT_PREVIEW option

2014-02-27 horneds

* Support extension configurations
* Fix markdown extra set
* Added 'MARKDOWN_PREVIEW_TEMPALTE' option
* Use jQuery selectors except element ID

2014-02-26 horneds

* Support custom extensions set in filters
* Add template tags: 'markdown_editor', 'markdown_media', 'markdown_media_js', 'markdown_media_css'

2014-02-25 horneds dfeinzeig

* WARNING: `DJANGO_MARKDOWN_STYLE` settings renamed to `MARKDOWN_STYLE`
* Fix compress with yui compressor

2014-02-22 dfeinzeig

* Support markdown extensions

2014-02-21 F. Gabriel Gosselin

* Patching use of deprecated django.utils.simplejson

2014-02-15 horneds

* Added example project

2014-02-15 Aliaksei Harabchuk

* Added MarkdownInlineAdmin

2014-02-09 alexey-sveshnikov

* Django 1.6 support (c) alexey-sveshnikov

2012-12-14 horneds

* Side-by-side widget, custom CSS for preview (fjcaetano)
* Update to support Django 1.5 (SortwareMaven)
* Client-side improvements (Sergii Iavorskyi)
* MARKDOWN_EDITOR_SETTINGS holds the extra parameters (Sergii Iavorskyi)
* Add docs to pypi
* Add MARKDOWN_SKIN option (Sergii Iavorskyi)
2020-12-02 Deesh_Reddy
* Migrated all the code base to work with the latest version of django.
* As well checking to work with latest version of python
* Version - 2.0.0
40 changes: 18 additions & 22 deletions README.rst
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
Django-Markdown v. 0.8.4
Django-Markdown v. 2.0.0
########################

.. _description:
Expand All @@ -9,23 +9,23 @@ Documentaton available at pypi_ or github_.
.. _badges:

.. image:: http://img.shields.io/travis/klen/django_markdown.svg?style=flat-square
:target: http://travis-ci.org/klen/django_markdown
:target: https://travis-ci.org/github/been-there-done-that
:alt: Build Status

.. image:: http://img.shields.io/coveralls/klen/django_markdown.svg?style=flat-square
:target: https://coveralls.io/r/klen/django_markdown
:alt: Coverals

.. image:: http://img.shields.io/pypi/v/django_markdown.svg?style=flat-square
:target: https://pypi.python.org/pypi/django_markdown
:target: https://pypi.python.org/pypi/django_markdown-2
:alt: Version

.. image:: http://img.shields.io/pypi/dm/django_markdown.svg?style=flat-square
:target: https://pypi.python.org/pypi/django_markdown
:target: https://pypi.python.org/pypi/django_markdown-2
:alt: Downloads

.. image:: http://img.shields.io/pypi/l/django_markdown.svg?style=flat-square
:target: https://pypi.python.org/pypi/django_markdown
:target: https://pypi.python.org/pypi/django_markdown-2
:alt: License

.. image:: http://img.shields.io/gratipay/klen.svg?style=flat-square
Expand Down Expand Up @@ -103,10 +103,12 @@ Use django_markdown
# in your project main urls
from django_markdown import flatpages
...

# Django admin
admin.autodiscover()
flatpages.register()
urlpatterns += [ url(r'^admin/', include(admin.site.urls)), ]

urlpatterns += [ re_path(r'^admin/', include(admin.site.urls)), ]

#) Template tags: ::

Expand Down Expand Up @@ -157,33 +159,28 @@ Changes

Make sure you`ve read the following document if you are upgrading from previous versions:

http://packages.python.org/django-markdown/changes.html
http://packages.python.org/django-markdown-2/changes.html


Bug tracker
===========

If you have any suggestions, bug reports or
annoyances please report them to the issue tracker
at https://github.com/klen/django_markdown/issues
at https://github.com/been-there-done-that/django_markdown-2/issues


Contributing
============

Development of django-markdown happens at github: https://github.com/klen/django_markdown
Development of django-markdown happens at github: https://github.com/been-there-done-that/django_markdown-2


Contributors
=============

* klen_ (Kirill Klenov)

* yavorskiy_ (Sergii Iavorskyi)

* Deesh_ (Jagadeeswara_Reddy_p)


License
=======

Expand All @@ -193,16 +190,15 @@ Licensed under a `GNU lesser general public license`_.
Copyright
=========

Copyright (c) 2011 Kirill Klenov (horneds@gmail.com)
Copyright (c) 2021 Deesh Reddy (internetwasmyidea@gmail.com)

Markitup_:
(c) 2008 Jay Salvat
http://markitup.jaysalvat.com/
http://markitup.jaysalvat.com/


.. _GNU lesser general public license: http://www.gnu.org/copyleft/lesser.html
.. _pypi: http://packages.python.org/django-markdown/
.. _Markitup: http://markitup.jaysalvat.com/
.. _github: https://github.com/klen/django_markdown
.. _klen: https://github.com/klen
.. _yavorskiy: https://github.com/yavorskiy
.. _pypi: http://packages.python.org/django-markdown-2/
.. _Markitup: http://markitup.jaysalvat.com/
.. _github: https://github.com/been-there-done-that/django_markdown
.. _Deesh: https://github.com/been-there-done-that
Loading