Browse files

Merge branch 'develop' into patch-1

  • Loading branch information...
2 parents c23d9f8 + 53f0661 commit 5523e867e7099aea319d902db55cecff7767d376 @jakemac53 committed Jun 12, 2012
Showing with 1 addition and 0 deletions.
  1. +1 −0 user_guide_src/source/changelog.rst
1 user_guide_src/source/changelog.rst
@@ -117,6 +117,7 @@ Release Date: Not Released
- Class properties wm_font_color, wm_shadow_color and wm_use_drop_shadow are now protected, to avoid breaking the text_watermark() method
if they are set manually after initialization.
- If property maintain_ratio is set to TRUE, image_reproportion() now doesn't need both width and height to be specified.
+ - Added support for maintaining transparency of images when adding a text watermark
- Minor speed optimizations and method & property visibility declarations in the Calendar Library.
- Removed SHA1 function in the :doc:`Encryption Library <libraries/encryption>`.
- Added $config['csrf_regeneration'] to the CSRF protection in the :doc:`Security library <libraries/security>`, which makes token regeneration optional.

0 comments on commit 5523e86

Please sign in to comment.