Mark bug 3 as fixed.

diff --git a/BUGS b/BUGS
index 71c0d81a05c48aaf8ccb727bb93d54472ae9409a..4241a85afef58220c0476686fc9951e8331da4f5 100644 (file)
--- a/BUGS
+++ b/BUGS
@@ -13,7 +13,7 @@ Status: Fixed.
 BugID 3
 Title: Pressing enter on search tab should search.
 Severity: minor
-Status:
+Status: Fixed.
 -------------------------------------------------------------------
 BugID 4
 Title: Make links in event detail view clickable.

diff --git a/ChangeLog b/ChangeLog
index 580cd97d6ef091899b5261797bfde51091337c9a..7a86d4be348d5d7e954e3f974c1e9313ef3c7189 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,25 @@
+2011-06-24  philipp
+
+       * src/gui/searchhead.cpp: Enter or return triggers the search now
+         when the focus is at the searchEdit or at one of the checkboxes.
+       * BUGS: Filed bug 7: Error message when searching without having
+         conferences
+
+2011-06-24  gregoa
+
+       * BUGS: Add another wishlist (more: design discussion) bug
+
+2011-06-24  philipp
+
+       * src/gui/tabcontainer.h, src/mvc/eventmodel.cpp: Removed
+         unnecessary debug output and code.
+       * BUGS, src/mvc/event.cpp: Fixed bug reported by gregor: Too many
+         authors are shown (form other conferences as well).
+
+2011-06-24  gregoa
+
+       * ChangeLog, TODO, confclerk.pro: Improve release target in .pro
+
 2011-06-24  philipp
 
        * src/gui/daynavigatorwidget.cpp, src/mvc/treeview.cpp: Removed two