Piotr Maliński
054fdfb591
Bump version.
2015-08-04 12:18:04 +02:00
Piotr Maliński
05ded0dba8
Merge pull request #203 from stkrp/patch-1
...
Update views.py
2015-07-28 18:13:56 +02:00
Stanislav Karpov
96b89effe3
Update views.py
2015-07-28 19:07:41 +03:00
Piotr Maliński
a2f4ca5f7d
Bump version.
2015-07-07 20:56:49 +02:00
Piotr Maliński
7283aeb12d
Update ckeditor to 4.5.1.
2015-07-07 20:45:06 +02:00
Piotr Maliński
cc46c6b1d3
Use correct default value for argument.
2015-07-07 20:37:35 +02:00
Piotr Maliński
372f2aeba2
Refactor imports.
2015-07-07 20:35:43 +02:00
Piotr Maliński
c3af8c0088
Set current repo url in setup.py.
2015-07-07 20:33:50 +02:00
Piotr Maliński
08b543d79d
[ #192 ] Add example configuration for using cache file storage in demo application.
2015-07-07 20:28:08 +02:00
Piotr Maliński
5e559d180f
[ close #198 ] Add a note about setting MEDIA_URL.
2015-07-07 20:06:08 +02:00
Piotr Maliński
12c726dd75
Don't use deprecated selenium methods.
2015-07-07 20:00:34 +02:00
Piotr Maliński
a56a3aad7e
Use StaticLiveServerTestCase for selenium tests under Django 1.7+.
2015-07-07 19:54:53 +02:00
Piotr Maliński
f9400510ab
Fix missing display for Firefox run from tox.
2015-07-07 19:54:08 +02:00
Piotr Maliński
ffcc25f16e
Run tox tests against Django 1.8/1.7 and Python 3.4/2.7.
2015-07-07 19:53:31 +02:00
Piotr Maliński
9d1630697e
Merge pull request #153 from Openscop/master
...
Allow non-image files to be uploaded
2015-07-07 08:02:01 +02:00
Piotr Maliński
84798109a7
Revert "STATIC_URL changed "
...
This reverts commit 23b8a2ec14
.
2015-06-07 19:25:06 +02:00
Piotr Maliński
bb3588312a
Merge pull request #196 from Visgean/patch-2
...
Loading form media section
2015-06-06 09:40:41 +02:00
Visgean Skeloru
c14353a0a2
Loading form media section
2015-06-06 03:10:42 +02:00
Piotr Maliński
6c295e6cb7
Merge pull request #195 from Visgean/patch-1
...
missing dot in ./manage.py
2015-06-06 00:54:34 +02:00
Visgean Skeloru
41d9458daf
missing dot in ./manage.py
2015-06-06 00:42:15 +02:00
Piotr Maliński
12f3d995c3
Bump version.
2015-05-19 00:23:44 +02:00
Piotr Maliński
fe6549dbc1
Merge pull request #188 from jdcaballerov/master
...
STATIC_URL changed
2015-05-12 01:07:40 +02:00
jdcaballerov
23b8a2ec14
STATIC_URL changed
...
STATIC_URL changed for static function
2015-05-11 17:50:38 -05:00
Piotr Maliński
c5f531d31f
Merge pull request #185 from vstoykov/fix_145
...
Fixes #145 - Syntax Error on Python 3.2
2015-04-22 22:31:43 +02:00
Venelin Stoykov
6e8a0cc4d1
Fixes #145 - Syntax Error on Python 3.2
...
This correctly reimplement pull #168
2015-04-22 22:56:40 +03:00
Piotr Maliński
e8b9df963f
Merge pull request #164 from ikresoft/master
...
Custom filebrowser url
2015-04-22 00:25:23 +02:00
Piotr Maliński
370adc123e
Merge pull request #174 from machinist/master
...
README update for toolbar configuration
2015-04-22 00:24:30 +02:00
Piotr Maliński
d15090bd92
Merge pull request #176 from bikeshedder/patch-1
...
Fix deprecation warning introduced in Django 1.7
2015-04-16 16:02:38 +02:00
Michael P. Jung
dab485f40f
Fix deprecation warning introduced in Django 1.7
...
Django 1.7 renamed django.forms.util to django.forms.utils. In order to silence the Deprecation warning a try-except block is needed.
2015-04-02 14:33:40 +02:00
Christian Thieme
ba6166f562
indentation fix
2015-03-18 13:25:22 +01:00
Christian Thieme
b5d1878ba6
readme update on toolbar configuration
2015-03-18 13:24:15 +01:00
Piotr Maliński
6480f33679
Merge pull request #172 from ironhouzi/patch-2
...
Fix formatting for information about S3
2015-03-01 19:09:17 +01:00
Robin Skahjem-Eriksen
342b66bdb9
Fix formatting for information about S3
2015-03-01 18:32:51 +01:00
Piotr Maliński
e658856046
Merge pull request #171 from ironhouzi/patch-1
...
Add vital information for S3 section
2015-03-01 18:26:14 +01:00
Robin Skahjem-Eriksen
0dd13cecf4
Add vital information for S3 section
2015-03-01 17:42:12 +01:00
riklaunim
7c57801abd
Merge pull request #168 from karec/master
...
fix a bug for unicode string in utils.py for python3.2 support (current ...
2015-02-07 11:44:34 +01:00
karec
089d42d62d
fix a bug for unicode string in utils.py for python3.2 support (current debian stable version) + add missing spaces arround operator for PEP8
2015-02-06 23:55:52 +01:00
riklaunim
6a2b7f7480
Merge pull request #165 from stelzzz/patch-1
...
Links buttons not worked
2015-01-28 18:15:19 +01:00
Pavel Zaytsev
63b5a653d4
Links buttons not worked
...
Fix for show Links buttons in Full template config,
2015-01-27 15:23:01 +05:00
Enver Bisevac
ec90263c82
remove print
2015-01-25 19:47:40 +01:00
riklaunim
35831794c1
Merge pull request #163 from nreilly/patch-1
...
Update README.rst
2015-01-25 15:45:33 +01:00
nreilly
7927fdb754
Update README.rst
...
Syncing with earlier comment about the -updated being merged into the normal module
2015-01-25 22:22:53 +08:00
Enver Bisevac
b8ebd249c6
support for custom browser
2015-01-25 13:59:06 +01:00
riklaunim
fc9b65ebed
Merge pull request #159 from christianglodt/master
...
Restore external-plugin-resources handling.
2015-01-24 19:38:08 +01:00
Simon Panay
7298ac8584
Merge remote-tracking branch 'upstream/master'
2014-12-17 15:38:52 +01:00
helicopetr
978788fd17
Restore external-plugin-resources handling.
...
This change re-adds functionality for adding external plugin resources.
The resources, defined in the field, are passed to the widget, which
renders them into the data-external-plugin-resources attribute.
In ckeditor-init.js, this data attribute is read and the resources
are added to the CKEditor, using CKEditor.plugins.addExternal().
2014-12-12 11:18:27 +01:00
Piotr Maliński
4d8faa3728
[ close #156 ] Update Readme.
2014-12-07 21:31:56 +01:00
riklaunim
71303c8932
Merge pull request #149 from b2550/patch-1
...
Update README.rst
2014-12-07 21:28:42 +01:00
Piotr Maliński
f091058e2e
Bump version.
2014-12-07 21:28:15 +01:00
Piotr Maliński
3bd57103a2
Fix tests for newer ckeditor version.
2014-12-07 21:18:22 +01:00