Commit Graph

31 Commits

Author SHA1 Message Date
Piotr Maliński 054fdfb591 Bump version. 2015-08-04 12:18:04 +02:00
Piotr Maliński a2f4ca5f7d Bump version. 2015-07-07 20:56:49 +02:00
Piotr Maliński 12f3d995c3 Bump version. 2015-05-19 00:23:44 +02:00
Piotr Maliński f091058e2e Bump version. 2014-12-07 21:28:15 +01:00
Piotr Maliński 930423721a Update changelog. 2014-09-23 01:46:32 +02:00
Piotr Maliński d48139fd0b Update CHANGELOG. 2014-09-13 01:25:11 +02:00
Piotr Maliński e4fc26a912 Update project files. 2014-06-01 01:01:20 +02:00
Piotr Maliński d0dcff65ad Fix changes from upstream merge. 2014-04-12 20:42:23 +02:00
Piotr Maliński e33561c9b5 Merge remote-tracking branch 'upstream/master' 2014-04-12 20:36:29 +02:00
Piotr Maliński c1d42a504a Bump version to 4.2.8. 2014-03-13 20:37:21 +01:00
Rogério Carrasqueira 43c3f595b2 Merge branch 'master' of git://github.com/shaunsephton/django-ckeditor into shaunsephton-master
Conflicts:
	CHANGELOG.rst
	ckeditor/image/dummy_backend.py
	ckeditor/image/pillow_backend.py
	ckeditor/static/ckeditor/ckeditor/skins/moono/dialog.css
	ckeditor/templates/browse.html
	ckeditor/utils.py
	ckeditor/views.py
	ckeditor/widgets.py
	ckeditor_demo/settings.py
	ckeditor_demo_requirements.txt
	setup.py
	tox.ini
2014-02-27 21:48:51 -03:00
Piotr Maliński 9830d9764d Pull changes from riklaunim/django-ckeditor. 2014-02-26 01:11:04 +01:00
Piotr Maliński 06ab64ef78 Bump to 2.6.7. 2014-02-24 00:23:03 +01:00
Piotr Maliński 2864723f8e Bump to 4.2.6. 2013-12-12 22:43:35 +01:00
Piotr Maliński 3faa9aaec8 Bump version to 4.2.5. 2013-12-12 20:41:45 +01:00
Piotr Maliński 76f5b1e65f Update docs. 2013-12-07 20:00:44 +01:00
Piotr Maliński de73950f1a Update CHANGELOG. 2013-12-07 03:15:25 +01:00
Piotr Maliński ccd07eb6fa [close #2] Update CHANGELOG. 2013-11-16 00:02:54 +01:00
Paulo R 4b92f7975e Updates CHANGELOG and README 2013-11-14 15:38:45 -02:00
Shaun Sephton 0c1b44bbe0 4.0.2 2013-04-04 09:25:16 +02:00
Shaun Sephton 160603594f 3.6.2.1 2012-06-20 08:52:35 +02:00
hedleyroos 52105d23fd Use Pillow instead of PIL 2012-06-19 20:28:07 +02:00
shaunsephton de12dc8cac note on move to static 2012-04-22 14:59:45 +02:00
Shaun Sephton 12d05bf8fc added 3point2's additions 2012-04-22 13:31:13 +02:00
Shaun Sephton b00276fd74 v3.6.2 updates 2012-04-21 18:58:44 +02:00
shaunsephton 21a1ee5db9 version 0.0.9 2010-12-09 15:06:58 +02:00
shaunsephton c59fa3e342 removed buggy url include check 2010-10-13 15:23:37 +02:00
shaunsephton aa13bdbd28 corrected 0.0.6 egg package erronious admin and models inclusion 2010-10-12 08:53:38 +02:00
shaunsephton 763ab749c6 0.0.6 restrictions 2010-10-10 17:00:11 +02:00
shaunsephton 6b99d55279 0.0.6 additions 2010-10-10 12:49:58 +02:00
shaunsephton 02105da8a3 added CHANGELOG.rst 2010-10-10 10:36:50 +02:00