Code

Updated version of watermark.py#316

Code

Open

edgartaor wants to merge 10 commits intomatthewwithanm:developmatthewwithanm/django-imagekit:developfrom mmv:developmmv/django-imagekit:developCopy head branch name to clipboard

+348-18

Commits

Commits on Jul 27, 2012

• Adding ability to add text and image watermarks

  

  miguel

  committed
  437a94b

Commits on Jul 28, 2012

• Refactored common code into base class

  Show description for bcd8681
  

  miguel

  committed
  bcd8681

• Bugfixing, code and documentation cleanup.

  Show description for 4848203
  

  miguel

  committed
  4848203

• watermark caching mustn't be used with ReverseWatermark

  

  miguel

  committed
  f60dbce

Commits on Oct 8, 2012

• fix API documentation

  

  cyberdelia

  authored and

  mmv

  committed
  0be825f

• Fix docs typo; closes matthewwithanm#147

  

  matthewwithanm

  authored and

  mmv

  committed
  fbb3369

• Test correct versions of Django

  Show description for a1543bf
  

  matthewwithanm

  authored and

  mmv

  committed
  a1543bf

• Change assertRaises for Python 2.6 compatibility

  

  matthewwithanm

  authored and

  mmv

  committed
  132319b

• Bumping the version number.

  

  bryanveloso

  authored and

  mmv

  committed
  2cea74b

• Changelog for 2.0.2.

  

  bryanveloso

  authored and

  mmv

  committed
  58a5d3d