fix conflicts during merge of Arun's tree

[phpfspot.git] / CHANGELOG

diff --git a/CHANGELOG b/CHANGELOG
index 8de2e0b4b322a2303de82fd15e0fb39f897fc556..a96c36163970f61e6cd402ff1f404185ab883e3f 100644 (file)
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,3 +1,15 @@
+phpfspot (1.5)
+
+  * feature, user-friendly URL's (with Apache's mod_rewrite).
+  * feature, display tag-selection with preview-icons in photo index.
+  * feature, support for Nikon's NEF RAW photo format (via dcraw and ImageMagick).
+  * feature, auto-scroll in photo index if thumbnails are out of sight.
+  * bug, if tag added to hide-tags, don't show up in photo-details box (single-photo).
+  * bug, if tag added to hide-tags, don't allow adding to selected-tags list.
+  * bug, if tag added to hide-tags, random-photo needs to take care of it.
+
+ -- Andreas Unterkircher <unki@netshadow.at>  Sat, 13 Apr 2008 11:00:00 +0100
+
 phpfspot (1.4)
 
   * feature, support PNG image format.