From 7ac4e97c34a21a6c9eed480dd742b4230774bad6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tom=C3=A1s=20Touceda?= <chiiph@leap.se>
Date: Fri, 12 Jul 2013 15:15:12 -0300
Subject: [PATCH] Fold in changes

---
 CHANGELOG                                     | 36 +++++++++++++++++++
 changes/bug-2853-use-latest-soledad-api       |  1 -
 changes/bug-2954_fix-mainwindow-show          |  1 -
 changes/bug-2955_fix_remember_me              |  1 -
 ...ug-3067_faulty-multiple-provider-selection |  1 -
 changes/bug-3152_logger-window-toggle         |  1 -
 changes/bug2878-unreachable_provider          |  2 --
 changes/bug_3039-registration-error-message   |  1 -
 ...ug_3047_wizard_hangs_client_on_termination |  1 -
 changes/bug_3113_cocoasudo_install            |  1 -
 changes/bug_3125-systray-turn-on-problem      |  1 -
 .../bug_3147-wrong-systray-icon-on-startup    |  1 -
 changes/bug_3151-parse-return-in-logger       |  1 -
 changes/bug_donnot_log_userdata               |  1 -
 changes/bug_openvpn_log_windows               |  2 --
 changes/bug_osx_bundle                        |  2 --
 changes/bug_osx_fix_icon                      |  1 -
 changes/bug_osx_raise_window                  |  1 -
 changes/bugfix_eip-status-button-moved        |  1 -
 changes/feature-2921_check-for-no-gateways    |  1 -
 changes/feature_2919-reorder-tray-icons       |  1 -
 .../feature_3134-redirect-output-to-logger    |  1 -
 changes/feature_improve-loggerwindow-colors   |  1 -
 .../feature_move-keymanager-to-its-own-repo   |  1 -
 24 files changed, 36 insertions(+), 26 deletions(-)
 delete mode 100644 changes/bug-2853-use-latest-soledad-api
 delete mode 100644 changes/bug-2954_fix-mainwindow-show
 delete mode 100644 changes/bug-2955_fix_remember_me
 delete mode 100644 changes/bug-3067_faulty-multiple-provider-selection
 delete mode 100644 changes/bug-3152_logger-window-toggle
 delete mode 100644 changes/bug2878-unreachable_provider
 delete mode 100644 changes/bug_3039-registration-error-message
 delete mode 100644 changes/bug_3047_wizard_hangs_client_on_termination
 delete mode 100644 changes/bug_3113_cocoasudo_install
 delete mode 100644 changes/bug_3125-systray-turn-on-problem
 delete mode 100644 changes/bug_3147-wrong-systray-icon-on-startup
 delete mode 100644 changes/bug_3151-parse-return-in-logger
 delete mode 100644 changes/bug_donnot_log_userdata
 delete mode 100644 changes/bug_openvpn_log_windows
 delete mode 100644 changes/bug_osx_bundle
 delete mode 100644 changes/bug_osx_fix_icon
 delete mode 100644 changes/bug_osx_raise_window
 delete mode 100644 changes/bugfix_eip-status-button-moved
 delete mode 100644 changes/feature-2921_check-for-no-gateways
 delete mode 100644 changes/feature_2919-reorder-tray-icons
 delete mode 100644 changes/feature_3134-redirect-output-to-logger
 delete mode 100644 changes/feature_improve-loggerwindow-colors
 delete mode 100644 changes/feature_move-keymanager-to-its-own-repo

diff --git a/CHANGELOG b/CHANGELOG
index c3809d2ba..9a078ff78 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,3 +1,39 @@
+0.2.3 Jul 12:
+  o Adapt code to Soledad 0.2.1 api.
+  o Fix Main Window briefly display before the wizard on first
+    start. Closes Bug #2954.
+  o Bugfix: Remember should not be automatically set to
+    checked. Closes #2955.
+  o Bugfix: reload config if switching to a different provider. Closes
+    #3067.
+  o Bugfix: logger window's toggle button reflects window
+    state. Closes #3152.
+  o Set timeout for requests to 10 seconds globally, configurable from
+    leap.util.constants. Fixes #2878.
+  o Bugfix: display error message on registration problem. Closes
+    #3039.
+  o Make wizard use the main event loop, ensuring clean termination.
+  o Use cocoasudo for installing missing updown scripts.
+  o Bugfix: Systray Turn ON action fails because is not correctly
+    enabled/disabled. Closes #3125.
+  o Bugfix: wrong systray icon on startup. Closes #3147.
+  o Bugfix: parse line return in the logger window. Closes #3151.
+  o Do not log user data on registration. Fixes #3168.
+  o Add --log-append eip.log to windows EIP launcher options to save
+    the logs in case of any problems. Fixes #2054.
+  o OSX: Make the install_path relative to the launcher path instead
+    of absolute.
+  o OSX: Fix icon display in cocoasudo.
+  o OSX: Raise window when showing if running on OSX.
+  o Bugfix: EIP status button moved to status panel.
+  o Check if there is no gateway to use and display correct
+    message. Close #2921.
+  o Reorder tray icons according new design. Closes #2919.
+  o Redirect stdout/stderr and twisted log to the logger. Closes
+    #3134.
+  o Improve LoggerWindow colors for easier debugging.
+  o Move the key manager to its own repository/package.
+
 0.2.2 Jun 28:
   o Add support for the kde polkit daemon
   o Handle 'Incorrect Password' exception (keyring)
diff --git a/changes/bug-2853-use-latest-soledad-api b/changes/bug-2853-use-latest-soledad-api
deleted file mode 100644
index b27e38aa7..000000000
--- a/changes/bug-2853-use-latest-soledad-api
+++ /dev/null
@@ -1 +0,0 @@
-  o Adapt code to Soledad 0.2.1 api.
diff --git a/changes/bug-2954_fix-mainwindow-show b/changes/bug-2954_fix-mainwindow-show
deleted file mode 100644
index 28a3b2cd1..000000000
--- a/changes/bug-2954_fix-mainwindow-show
+++ /dev/null
@@ -1 +0,0 @@
-  o Fix Main Window briefly display before the wizard on first start. Closes Bug #2954.
diff --git a/changes/bug-2955_fix_remember_me b/changes/bug-2955_fix_remember_me
deleted file mode 100644
index bfbb6a791..000000000
--- a/changes/bug-2955_fix_remember_me
+++ /dev/null
@@ -1 +0,0 @@
-  o Bugfix: Remember should not be automatically set to checked. Closes #2955.
diff --git a/changes/bug-3067_faulty-multiple-provider-selection b/changes/bug-3067_faulty-multiple-provider-selection
deleted file mode 100644
index fef95a6e3..000000000
--- a/changes/bug-3067_faulty-multiple-provider-selection
+++ /dev/null
@@ -1 +0,0 @@
-  o Bugfix: reload config if switching to a different provider. Closes #3067.
diff --git a/changes/bug-3152_logger-window-toggle b/changes/bug-3152_logger-window-toggle
deleted file mode 100644
index b282e1e55..000000000
--- a/changes/bug-3152_logger-window-toggle
+++ /dev/null
@@ -1 +0,0 @@
-  o Bugfix: logger window's toggle button reflects window state. Closes #3152.
diff --git a/changes/bug2878-unreachable_provider b/changes/bug2878-unreachable_provider
deleted file mode 100644
index d23e4f8a3..000000000
--- a/changes/bug2878-unreachable_provider
+++ /dev/null
@@ -1,2 +0,0 @@
-  o Set timeout for requests to 10 seconds globally, configurable from
-    leap.util.constants. Fixes #2878.
\ No newline at end of file
diff --git a/changes/bug_3039-registration-error-message b/changes/bug_3039-registration-error-message
deleted file mode 100644
index ef964d636..000000000
--- a/changes/bug_3039-registration-error-message
+++ /dev/null
@@ -1 +0,0 @@
-  o Bugfix: display error message on registration problem. Closes #3039.
diff --git a/changes/bug_3047_wizard_hangs_client_on_termination b/changes/bug_3047_wizard_hangs_client_on_termination
deleted file mode 100644
index 00af47388..000000000
--- a/changes/bug_3047_wizard_hangs_client_on_termination
+++ /dev/null
@@ -1 +0,0 @@
-  o Make wizard use the main event loop, ensuring clean termination.
diff --git a/changes/bug_3113_cocoasudo_install b/changes/bug_3113_cocoasudo_install
deleted file mode 100644
index c4521e809..000000000
--- a/changes/bug_3113_cocoasudo_install
+++ /dev/null
@@ -1 +0,0 @@
-  o Use cocoasudo for installing missing updown scripts.
diff --git a/changes/bug_3125-systray-turn-on-problem b/changes/bug_3125-systray-turn-on-problem
deleted file mode 100644
index 6abe0038a..000000000
--- a/changes/bug_3125-systray-turn-on-problem
+++ /dev/null
@@ -1 +0,0 @@
-  o Bugfix: Systray Turn ON action fails because is not correctly enabled/disabled. Closes #3125.
diff --git a/changes/bug_3147-wrong-systray-icon-on-startup b/changes/bug_3147-wrong-systray-icon-on-startup
deleted file mode 100644
index 8f9d6f26b..000000000
--- a/changes/bug_3147-wrong-systray-icon-on-startup
+++ /dev/null
@@ -1 +0,0 @@
-  o Bugfix: wrong systray icon on startup. Closes #3147.
diff --git a/changes/bug_3151-parse-return-in-logger b/changes/bug_3151-parse-return-in-logger
deleted file mode 100644
index 734588aa4..000000000
--- a/changes/bug_3151-parse-return-in-logger
+++ /dev/null
@@ -1 +0,0 @@
-  o Bugfix: parse line return in the logger window. Closes #3151.
diff --git a/changes/bug_donnot_log_userdata b/changes/bug_donnot_log_userdata
deleted file mode 100644
index 855115b95..000000000
--- a/changes/bug_donnot_log_userdata
+++ /dev/null
@@ -1 +0,0 @@
-  o Do not log user data on registration. Fixes #3168.
\ No newline at end of file
diff --git a/changes/bug_openvpn_log_windows b/changes/bug_openvpn_log_windows
deleted file mode 100644
index 9c5cf4e09..000000000
--- a/changes/bug_openvpn_log_windows
+++ /dev/null
@@ -1,2 +0,0 @@
-  o Add --log-append eip.log to windows EIP launcher options to save
-    the logs in case of any problems. Fixes #2054.
\ No newline at end of file
diff --git a/changes/bug_osx_bundle b/changes/bug_osx_bundle
deleted file mode 100644
index d059468d2..000000000
--- a/changes/bug_osx_bundle
+++ /dev/null
@@ -1,2 +0,0 @@
-  o OSX: Make the install_path relative to the launcher path instead
-    of absolute.
\ No newline at end of file
diff --git a/changes/bug_osx_fix_icon b/changes/bug_osx_fix_icon
deleted file mode 100644
index 7f8cfea6d..000000000
--- a/changes/bug_osx_fix_icon
+++ /dev/null
@@ -1 +0,0 @@
-  o OSX: Fix icon display in cocoasudo.
\ No newline at end of file
diff --git a/changes/bug_osx_raise_window b/changes/bug_osx_raise_window
deleted file mode 100644
index ee81fd2b0..000000000
--- a/changes/bug_osx_raise_window
+++ /dev/null
@@ -1 +0,0 @@
-  o OSX: Raise window when showing if running on OSX.
\ No newline at end of file
diff --git a/changes/bugfix_eip-status-button-moved b/changes/bugfix_eip-status-button-moved
deleted file mode 100644
index 292984206..000000000
--- a/changes/bugfix_eip-status-button-moved
+++ /dev/null
@@ -1 +0,0 @@
-  o Bugfix: EIP status button moved to status panel.
diff --git a/changes/feature-2921_check-for-no-gateways b/changes/feature-2921_check-for-no-gateways
deleted file mode 100644
index dfd9d2bde..000000000
--- a/changes/feature-2921_check-for-no-gateways
+++ /dev/null
@@ -1 +0,0 @@
-  o Check if there is no gateway to use and display correct message. Close #2921.
diff --git a/changes/feature_2919-reorder-tray-icons b/changes/feature_2919-reorder-tray-icons
deleted file mode 100644
index d81c7f245..000000000
--- a/changes/feature_2919-reorder-tray-icons
+++ /dev/null
@@ -1 +0,0 @@
-  o Reorder tray icons according new design. Closes #2919.
diff --git a/changes/feature_3134-redirect-output-to-logger b/changes/feature_3134-redirect-output-to-logger
deleted file mode 100644
index b397c5bc9..000000000
--- a/changes/feature_3134-redirect-output-to-logger
+++ /dev/null
@@ -1 +0,0 @@
-  o Redirect stdout/stderr and twisted log to the logger. Closes #3134.
diff --git a/changes/feature_improve-loggerwindow-colors b/changes/feature_improve-loggerwindow-colors
deleted file mode 100644
index fe03e8777..000000000
--- a/changes/feature_improve-loggerwindow-colors
+++ /dev/null
@@ -1 +0,0 @@
-  o Improve LoggerWindow colors for easier debugging.
diff --git a/changes/feature_move-keymanager-to-its-own-repo b/changes/feature_move-keymanager-to-its-own-repo
deleted file mode 100644
index ea34cbd88..000000000
--- a/changes/feature_move-keymanager-to-its-own-repo
+++ /dev/null
@@ -1 +0,0 @@
-  o Move the key manager to its own repository/package.
-- 
GitLab