Permalink
Commits on Jan 23, 2017
  1. Back to development: 2.7.0

    Natim committed Jan 23, 2017
  2. Preparing release 2.6.0

    Natim committed Jan 23, 2017
  3. Merge pull request #201 from ataylor32/extra-media

    Added the "TINYMCE_EXTRA_MEDIA" setting
    Natim committed on GitHub Jan 23, 2017
  4. Merge pull request #205 from claudep/runtests

    Removed conditional as minimal Django is now 1.7
    Natim committed on GitHub Jan 23, 2017
  5. Merge pull request #206 from claudep/lang_none

    Prevented crash when no language are activated
    Natim committed on GitHub Jan 23, 2017
  6. Removed conditional as minimal Django is now 1.7

    claudep committed Jan 23, 2017
  7. Prevented crash when no language are activated

    Fixes #175.
    claudep committed Jan 23, 2017
  8. Merge pull request #204 from claudep/issue187

    Fixed client-side browser validation with required form fields
    Natim committed on GitHub Jan 23, 2017
  9. Fixed client-side browser validation with required form fields

    Fixes #187.
    claudep committed Jan 23, 2017
  10. Merge pull request #200 from ataylor32/js-functions

    Add support for JavaScript functions
    Natim committed on GitHub Jan 23, 2017
  11. Merge branch 'master' into js-functions

    Natim committed on GitHub Jan 23, 2017
  12. Merge pull request #189 from tidenhub/patch-1

    Fixed paste_preprocess & paste_postprocess if set in TINYMCE_DEFAULT_CONFIG
    Natim committed on GitHub Jan 23, 2017
  13. Update Changelog.

    Natim committed Jan 23, 2017
  14. Merge pull request #188 from claudep/reverse_deprecation

    Avoid deprecation warning with django.core.urlresolvers
    Natim committed on GitHub Jan 23, 2017
  15. Merge pull request #191 from claudep/doc_index

    Updated documentation index page
    Natim committed on GitHub Jan 23, 2017
  16. Updated documentation index page

    claudep committed Sep 21, 2016
  17. Avoid deprecation warning with django.core.urlresolvers

    claudep committed Sep 5, 2016
  18. Back to development: 2.5.0

    Natim committed Jan 23, 2017
  19. Preparing release 2.5.0

    Natim committed Jan 23, 2017
  20. Merge pull request #203 from claudep/django111

    Add compatibility with Django 1.11
    Natim committed on GitHub Jan 23, 2017
  21. Add compatibility with Django 1.11

    claudep committed Jan 23, 2017
Commits on Jan 12, 2017
  1. Added the "TINYMCE_EXTRA_MEDIA" setting

    ataylor32 committed Jan 12, 2017
Commits on Jan 11, 2017
  1. Add support for JavaScript functions

    ataylor32 committed Jan 11, 2017
Commits on Sep 13, 2016
  1. Fixed paste_preprocess & paste_postprocess if set in TINYMCE_DEFAULT_…

    …CONFIG
    
    Fixed a JSON parsing error because of the missing quoting if paste_preprocess or paste_postprocess was set in TINYMCE_DEFAULT_CONFIG
    tidenhub committed on GitHub Sep 13, 2016
Commits on Aug 31, 2016
  1. Back to development: 2.5.0

    Natim committed Aug 31, 2016
  2. Preparing release 2.4.0

    Natim committed Aug 31, 2016
Commits on Aug 22, 2016
  1. Merge pull request #186 from fizista/fix_mime_type

    FIX: Refused to execute script
    Natim committed on GitHub Aug 22, 2016
Commits on Aug 19, 2016
  1. FIX: Refused to execute script

    Refused to execute script from 'http://<domain>/tinymce/filebrowser/'
    because its MIME type ('text/html') is not executable, and strict MIME
    type checking is enabled. Browser Chrome
    fizista committed Aug 19, 2016
Commits on Aug 11, 2016
  1. Merge pull request #185 from jessamynsmith/jessamyn_contributors

    Add myself to contributors.
    Natim committed on GitHub Aug 11, 2016
Commits on Aug 10, 2016
  1. Add myself to contributors.

    jessamynsmith committed Aug 10, 2016
Commits on Aug 9, 2016
  1. Merge pull request #103 from yychen/master

    Fix jquery problem when not using with grappelli
    Natim committed on GitHub Aug 9, 2016
  2. Merge pull request #174 from rddimon/master

    Fix tinymce widget  for modeltranslation tabs
    Natim committed on GitHub Aug 9, 2016
  3. Merge remote-tracking branch 'origin/master'

    # Conflicts:
    #	tinymce/widgets.py
    rddimon committed Aug 9, 2016
  4. Update CONTRIBUTORS.rst

    rddimon committed Aug 9, 2016
  5. add test

    drevutskyj committed with rddimon May 6, 2016