From be236a90af97c3b0f09f415e8d364b9e72f543f2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tom=C3=A1s=20Touceda?= Date: Fri, 26 Sep 2014 10:06:36 -0300 Subject: Update relnotes --- relnotes.txt | 24 +++++++++++------------- 1 file changed, 11 insertions(+), 13 deletions(-) diff --git a/relnotes.txt b/relnotes.txt index f2d28413..02e53ee6 100644 --- a/relnotes.txt +++ b/relnotes.txt @@ -1,8 +1,8 @@ -ANNOUNCING Bitmask, the Internet Encryption Toolkit, release 0.6.1 +ANNOUNCING Bitmask, the Internet Encryption Toolkit, release 0.7.0 The LEAP team is pleased to announce the immediate availability of version 0.6.1 of Bitmask, the Internet Encryption Toolkit, codename -"knock knock knocking on beta's door". +"one time download, all time updates". https://downloads.leap.se/client/ @@ -34,16 +34,14 @@ NOT trust your life to it. WHAT CAN THIS VERSION OF BITMASK DO FOR ME? -Bitmask 0.6.1 is the new stable version of the client after the big -refactor, with a little face lift of the UI while we were at -it. Encrypted Email is still not stable though, so don't use it for -high security. Encrypted Internet is the first service we are calling -stable, although its security level is just a bit higher than plain -OpenVPN, so use accordingly. You can refer to the CHANGELOG for the -meat. +Bitmask 0.7.0 brings with tremendous joy automatic and secure updates +through The Update Framework. Right beside TUF there are some bug +fixes and a new settings panel. -Encrypted Internet on Linux now avoids leaking traffic outside of -the secure connection it establishes. This will be added to other +You can read more about TUF in http://theupdateframework.com/ + +Encrypted Internet on Linux avoids leaking traffic outside of the +secure connection it establishes. This will be added to other platforms in the future. The Encrypted Mail services will run local SMTP and IMAP proxies that, @@ -90,7 +88,7 @@ You can send the bugs our way by pointing your telnet session to port our intensive bug-reeducation program. -LINUX ONLY: If you ever run into the situation where you cannot +LINUX ONLY: If you ever run into the situation where you cannot access internet, open the terminal and run the following command: $ pkexec /usr/local/sbin/bitmask-root firewall stop @@ -109,6 +107,6 @@ beyond any border. The LEAP team, -August 15, 2014 +Setptember 26, 2014 Somewhere in the middle of the intertubes. EOF -- cgit v1.2.3 From 5767efd10a2f794fe9367722bfb1ca114e63733a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tom=C3=A1s=20Touceda?= Date: Fri, 26 Sep 2014 10:13:22 -0300 Subject: Fold in changes --- CHANGELOG.rst | 28 ++++++++++++++++++++++ changes/bug-5815_eip-preferences-issues | 2 -- changes/bug-5866_bitmask-lock-not-removed | 1 - changes/bug-5945_not-adding-helper-files | 1 - changes/bug-5995_save-provider-on-change | 1 - changes/bug-5996_update-eip-status-on-change | 1 - changes/bug-5997_get-ready-provider-on-change | 1 - changes/bug-6048_python2-bitmask-root | 1 - changes/bug-remove-dict-comprenhension | 1 - .../bug_5994_do-not-wait-for-eip-if-cannot-start | 1 - changes/bug_python2-compat | 1 - changes/bug_use_token_for_eip | 1 - changes/code-and-logging-cleanup | 1 - changes/feature-6040-email-firewall | 1 - changes/feature-6087_remove-AKM-menu | 2 -- changes/feature-combined-preferences-window | 1 - 16 files changed, 28 insertions(+), 17 deletions(-) delete mode 100644 changes/bug-5815_eip-preferences-issues delete mode 100644 changes/bug-5866_bitmask-lock-not-removed delete mode 100644 changes/bug-5945_not-adding-helper-files delete mode 100644 changes/bug-5995_save-provider-on-change delete mode 100644 changes/bug-5996_update-eip-status-on-change delete mode 100644 changes/bug-5997_get-ready-provider-on-change delete mode 100644 changes/bug-6048_python2-bitmask-root delete mode 100644 changes/bug-remove-dict-comprenhension delete mode 100644 changes/bug_5994_do-not-wait-for-eip-if-cannot-start delete mode 100644 changes/bug_python2-compat delete mode 100644 changes/bug_use_token_for_eip delete mode 100644 changes/code-and-logging-cleanup delete mode 100644 changes/feature-6040-email-firewall delete mode 100644 changes/feature-6087_remove-AKM-menu delete mode 100644 changes/feature-combined-preferences-window diff --git a/CHANGELOG.rst b/CHANGELOG.rst index c47e531a..3c863657 100644 --- a/CHANGELOG.rst +++ b/CHANGELOG.rst @@ -6,6 +6,34 @@ History 2014 ==== +0.7.0 September 26 -- the "one time download, all time updates" release: +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ + +- Select current provider on EIP preferences. Closes #5815. +- Handle logout correctly when we stop_services to launch the + wizard. Related to #5815. +- Properly remove /tmp/bitmask.lock. Closes #5866. +- Hide EIP Start button and display correct warning on missing helpers + files. Closes #5945. +- Save default provider if changed on the combo box. Closes #5995. +- Update the EIP status on provider change. Closes #5996. +- Update and get ready to start a provider on change. Closes #5997. +- Use python2 to run bitmask-root to work fine on systems with python3 + as default. Closes #6048. +- Use python2.7 in bitmask-root shebang since is the common name for + python 2 in Ubuntu, Debian, Arch. Related to #6048. +- Remove dict comprenension in util, for 2.6 compat. +- Login shall not wait for eip to finish if eip is not able to + start. Closes #5994 +- Properly send the token for querying the EIP certificate. Fixes + #6060. +- Code cleanup and logging improvements. +- Add email firewall blocking other users to access bitmask imap & + smtp. Closes #6040 +- Remove the Advanced Key Management since we don't support stable + mail yet. Closes #6087. +- Single combined preferences window. Closes #4704, #4119, #5885. + 0.6.1 August 15 -- the "knock knock knocking on beta's door" release: +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ diff --git a/changes/bug-5815_eip-preferences-issues b/changes/bug-5815_eip-preferences-issues deleted file mode 100644 index 013fe03d..00000000 --- a/changes/bug-5815_eip-preferences-issues +++ /dev/null @@ -1,2 +0,0 @@ -- Select current provider on EIP preferences. Closes #5815. -- Handle logout correctly when we stop_services to launch the wizard. Related to #5815. diff --git a/changes/bug-5866_bitmask-lock-not-removed b/changes/bug-5866_bitmask-lock-not-removed deleted file mode 100644 index d68c1122..00000000 --- a/changes/bug-5866_bitmask-lock-not-removed +++ /dev/null @@ -1 +0,0 @@ -- /tmp/bitmask.lock not removed. Closes #5866. diff --git a/changes/bug-5945_not-adding-helper-files b/changes/bug-5945_not-adding-helper-files deleted file mode 100644 index 94e41c25..00000000 --- a/changes/bug-5945_not-adding-helper-files +++ /dev/null @@ -1 +0,0 @@ -- Hide button and display correct warning on missing helpers files. Closes #5945. diff --git a/changes/bug-5995_save-provider-on-change b/changes/bug-5995_save-provider-on-change deleted file mode 100644 index e0f86d75..00000000 --- a/changes/bug-5995_save-provider-on-change +++ /dev/null @@ -1 +0,0 @@ -- Save default provider if changed on the combo box. Closes #5995. diff --git a/changes/bug-5996_update-eip-status-on-change b/changes/bug-5996_update-eip-status-on-change deleted file mode 100644 index 665092f0..00000000 --- a/changes/bug-5996_update-eip-status-on-change +++ /dev/null @@ -1 +0,0 @@ -- Update the EIP status on provider change. Closes #5996. diff --git a/changes/bug-5997_get-ready-provider-on-change b/changes/bug-5997_get-ready-provider-on-change deleted file mode 100644 index e6b3f7f1..00000000 --- a/changes/bug-5997_get-ready-provider-on-change +++ /dev/null @@ -1 +0,0 @@ -- Update and get ready to start a provider on change. Closes #5997. diff --git a/changes/bug-6048_python2-bitmask-root b/changes/bug-6048_python2-bitmask-root deleted file mode 100644 index 038196b0..00000000 --- a/changes/bug-6048_python2-bitmask-root +++ /dev/null @@ -1 +0,0 @@ -- Use python2 to run bitmask-root to work fine on systems with python3 as default. Closes #6048. diff --git a/changes/bug-remove-dict-comprenhension b/changes/bug-remove-dict-comprenhension deleted file mode 100644 index 4e9468d8..00000000 --- a/changes/bug-remove-dict-comprenhension +++ /dev/null @@ -1 +0,0 @@ -- Remove dict comprenension in util, for 2.6 compat. diff --git a/changes/bug_5994_do-not-wait-for-eip-if-cannot-start b/changes/bug_5994_do-not-wait-for-eip-if-cannot-start deleted file mode 100644 index 7ada612a..00000000 --- a/changes/bug_5994_do-not-wait-for-eip-if-cannot-start +++ /dev/null @@ -1 +0,0 @@ -- Login shall not wait for eip to finish if eip is not able to start. Closes: #5994 diff --git a/changes/bug_python2-compat b/changes/bug_python2-compat deleted file mode 100644 index 35331a36..00000000 --- a/changes/bug_python2-compat +++ /dev/null @@ -1 +0,0 @@ -- Use python2.7 since is the common name for python 2 in Ubuntu, Debian, Arch. Related to #6048. diff --git a/changes/bug_use_token_for_eip b/changes/bug_use_token_for_eip deleted file mode 100644 index b10368ad..00000000 --- a/changes/bug_use_token_for_eip +++ /dev/null @@ -1 +0,0 @@ -- Properly send the token for querying the EIP certificate. Fixes #6060. \ No newline at end of file diff --git a/changes/code-and-logging-cleanup b/changes/code-and-logging-cleanup deleted file mode 100644 index 3a381e68..00000000 --- a/changes/code-and-logging-cleanup +++ /dev/null @@ -1 +0,0 @@ -- Code cleanup and logging improvements. diff --git a/changes/feature-6040-email-firewall b/changes/feature-6040-email-firewall deleted file mode 100644 index 5ef70d28..00000000 --- a/changes/feature-6040-email-firewall +++ /dev/null @@ -1 +0,0 @@ -- Add email firewall blocking other users to access bitmask imap & smtp. Closes #6040 diff --git a/changes/feature-6087_remove-AKM-menu b/changes/feature-6087_remove-AKM-menu deleted file mode 100644 index 9326ca47..00000000 --- a/changes/feature-6087_remove-AKM-menu +++ /dev/null @@ -1,2 +0,0 @@ -- Remove the Advanced Key Management since we don't support stable mail yet. - Closes #6087. diff --git a/changes/feature-combined-preferences-window b/changes/feature-combined-preferences-window deleted file mode 100644 index 146ac923..00000000 --- a/changes/feature-combined-preferences-window +++ /dev/null @@ -1 +0,0 @@ -- single combined preferences window (closes #4704, #4119, #5885) \ No newline at end of file -- cgit v1.2.3 From 0db3d5a4aecc0a3c271b92c6187922c50d46df0a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tom=C3=A1s=20Touceda?= Date: Fri, 26 Sep 2014 10:13:44 -0300 Subject: Revert "Fix soledad imports (#5989)." This reverts commit 7fcc4f40eaa8214de8ae20cd71d173337ad64290. --- changes/bug_5989_fix-soledad-imports | 1 - src/leap/bitmask/backend/components.py | 2 +- src/leap/bitmask/services/soledad/soledadbootstrapper.py | 3 +-- 3 files changed, 2 insertions(+), 4 deletions(-) delete mode 100644 changes/bug_5989_fix-soledad-imports diff --git a/changes/bug_5989_fix-soledad-imports b/changes/bug_5989_fix-soledad-imports deleted file mode 100644 index 3b425287..00000000 --- a/changes/bug_5989_fix-soledad-imports +++ /dev/null @@ -1 +0,0 @@ -- Fix soledad imports (#5989). diff --git a/src/leap/bitmask/backend/components.py b/src/leap/bitmask/backend/components.py index d4f6d176..5ef6befd 100644 --- a/src/leap/bitmask/backend/components.py +++ b/src/leap/bitmask/backend/components.py @@ -60,7 +60,7 @@ from leap.common import certs as leap_certs from leap.keymanager import openpgp from leap.keymanager.errors import KeyAddressMismatch, KeyFingerprintMismatch -from leap.soledad.client.secrets import NoStorageSecret, PassphraseTooShort +from leap.soledad.client import NoStorageSecret, PassphraseTooShort logger = logging.getLogger(__name__) diff --git a/src/leap/bitmask/services/soledad/soledadbootstrapper.py b/src/leap/bitmask/services/soledad/soledadbootstrapper.py index 745645f3..c4e43bfe 100644 --- a/src/leap/bitmask/services/soledad/soledadbootstrapper.py +++ b/src/leap/bitmask/services/soledad/soledadbootstrapper.py @@ -45,8 +45,7 @@ from leap.common.files import which from leap.keymanager import KeyManager, openpgp from leap.keymanager.errors import KeyNotFound from leap.soledad.common.errors import InvalidAuthTokenError -from leap.soledad.client import Soledad -from leap.soledad.client.secrets import BootstrapSequenceError +from leap.soledad.client import Soledad, BootstrapSequenceError logger = logging.getLogger(__name__) -- cgit v1.2.3 From 8dfb508965f4c321ac5d511ced8dcbd0df9f515b Mon Sep 17 00:00:00 2001 From: Ivan Alejandro Date: Fri, 3 Oct 2014 16:45:13 -0300 Subject: Update i18n strings. Exclude pinned providers and tests from the bitmask.pro generator since there is no strings to translate in there. --- data/make_project_file.py | 3 +- data/ts/en_US.ts | 414 ++++++++++++++++++++++++++-------------------- 2 files changed, 234 insertions(+), 183 deletions(-) diff --git a/data/make_project_file.py b/data/make_project_file.py index d1567837..5519e128 100755 --- a/data/make_project_file.py +++ b/data/make_project_file.py @@ -52,7 +52,8 @@ if __name__ == '__main__': # Source files includes = ["*.py"] - excludes = ['__init__.py', '_version.py', 'ui_*.py', '*_rc.py'] + excludes = ['__init__.py', '_version.py', 'ui_*.py', '*_rc.py', + 'pinned*.py', 'tests'] sources = list_files(includes, excludes, SOURCE_ROOT) sources = " \\\n".join(["../{0}".format(f) for f in sources]) diff --git a/data/ts/en_US.ts b/data/ts/en_US.ts index 041cdc44..7ab39646 100644 --- a/data/ts/en_US.ts +++ b/data/ts/en_US.ts @@ -170,53 +170,23 @@ Export canceled. - ComplainDialog - - - Ok, thanks - - - - - EIPPreferences - - - Select gateway for provider - - - - - <Select provider> - - - - - < Providers Gateway Status > - - + App - - Automatic - - - - - Encrypted Internet Preferences - - - - - Select &provider: + + Application error - - &Save this provider settings + + There is a problem contacting the backend, please restart Bitmask. + + + ComplainDialog - - Select &gateway: + + Ok, thanks @@ -774,53 +744,53 @@ Export canceled. - + Help - + &Quit - + &Help - + &Wizard - + The following components will be updated: %s - + Updates available - + Show Main Window - + Starting... - + Not supported - + Disabled @@ -830,47 +800,47 @@ Export canceled. - + About &Bitmask - + Mail is OFF - + The Bitmask app is ready to update, please restart the application. - + About Bitmask - %s - + Unable to login: Problem with provider - + Log in cancelled by the user. - + There was a problem with the provider - + Something went wrong with the logout. - + Unable to connect: Problem with provider @@ -880,319 +850,399 @@ Export canceled. - + Show &Log - + Create a new account... - + File - - Account Preferences... - - - - - Internet Preferences... - - - - + Advanced Key Management - + OFF - + Version: <b>%s</b> (%s)<br><br>%sBitmask is the Desktop client application for the LEAP platform, supporting encrypted internet proxy, secure email, and secure chat (coming soon).<br><br>LEAP is a non-profit dedicated to giving all internet users access to secure communication. Our focus is on adapting encryption technology to make it easy to use and widely available. <br><br><a href='https://leap.se'>More about LEAP</a> - + Bitmask Help - + The current client version is not supported by this provider.<br>Please update to latest version.<br><br>You can get the latest version from <a href='{0}'>{1}</a> - + Update Needed - + This provider is not compatible with the client.<br><br>Error: API version incompatible. - + Incompatible Provider - + Application error - + You are trying to do an operation that requires logging in first. - + Unknown error. - + There was a server problem with authentication. - + Could not establish a connection. - + Invalid username or password. - + Hello! - + Bitmask has started in the tray. - + Succeeded - + The server at {0} can't be found, because the DNS lookup failed. DNS is the network service that translates a website's name to its Internet address. Either your computer is having trouble connecting to the network, or you are missing some helper files that are needed to securely use DNS while {1} is active. To install these helper files, quit this application and start it again. - + Connection Error - + Quitting... - + Bitmask is quitting, please wait. - - There is a problem contacting the backend, please restart Bitmask. - - - - + bitmask.net/help - + Email quick reference - + For Thunderbird, you can use the Bitmask extension. Search for "Bitmask" in the add-on manager or download it from <a href='{0}'>addons.mozilla.org</a>. - + Alternately, you can manually configure your mail client to use Bitmask Email with these options: - + IMAP: localhost, port {0} - + SMTP: localhost, port {0} - + Username: your full email address - + Password: any non-empty text - + <p><strong>{0}</strong></p><p>{1}</p><p>{2}<ul><li>&nbsp;{3}</li><li>&nbsp;{4}</li><li>&nbsp;{5}</li><li>&nbsp;{6}</li></ul></p> - + Stop services - + Do you want to stop all services? - + In order to change the provider, the running services needs to be stopped. - + Disabled: missing helper files + + + Pr&eferences... + + - Preferences + PasswordChange - - Preferences + + Change Password + + + + + Username: + + + + + New password: + + + + + Re-enter new password: + + + + + Current password: + + + + + <flash_label> - - Password Change + + Close - - &Current password: + + OK + + + + + PasswordWindow + + + Please log in to change your password. + + + + + Please wait for data storage to be ready. + + + + + Changing password... + + + + + Password changed successfully. - - &New password: + + Password is empty. - - &Re-enter new password: + + There was a problem changing the password. + + + + + You did not enter a correct current password. + + + Preferences - - Change + + Preferences - - <Password change status> + + user@example.org - - Enabled services + + Close + + + PreferencesAccountPage - - Save this provider settings + + Form - + Services - - <Select provider> + + <provider_services_label> + + + + + Password - - Select provider: + + Change Password - - < Providers Services Status > + + <change_password_label> + + + + + You must be logged in to change your password. - PreferencesWindow + PreferencesEmailPage - - Automatic + + Form - - Changing password... + + PushButton + + + + + PreferencesVpnPage + + + Form - - Password changed successfully. + + <flash_label> - - There was a problem changing the password. + + Default VPN Gateway: - - You did not enter a correct current password. + + You must reconnect for changes to take effect. - - Services settings for provider '{0}' saved. + + Automatic + + + + + Error loading configuration file. + + + + + This is an uninitialized provider, please log in first. + + + PreferencesWindow - - You need to enable {0} in order to change the password. + + Account - - You need to wait until {0} is ready in order to change the password. + + VPN - - In order to change your password you need to be logged in. + + Email @@ -1335,47 +1385,47 @@ Export canceled. - + &Next > - + Connect - + Starting registration... - + User %s successfully registered. - + <font color='red'><b>Non-existent provider</b></font> - + <font color='red'><b>%s</b></font> - + Unable to load provider configuration - + <font color='red'><b>Not a valid provider</b></font> - + Something went wrong while trying to load service %s @@ -1405,22 +1455,22 @@ Export canceled. - + Something has gone wrong. Please try again. - + The requested username is taken, choose another. - + Services by {0} - + Register a new user with {0} @@ -1473,37 +1523,37 @@ Export canceled. msg - + TAP Driver - + Encrypted Internet uses VPN, which needs a TAP device installed and none has been found. This will ask for administrative privileges. - + TUN Driver - + Encrypted Internet uses VPN, which needs a kernel extension for a TUN device installed, and none has been found. This will ask for administrative privileges. - + Problem installing files - + Some of the files could not be copied. - + Bitmask needs to install the necessary drivers for Encrypted Internet to work. Would you like to proceed? @@ -1513,7 +1563,7 @@ Export canceled. - + Missing Bitmask helpers @@ -1521,12 +1571,12 @@ Export canceled. msgstr - + Some essential helper files are missing in your system. - + Reinstall your debian packages, or make sure you place them by hand. @@ -1534,17 +1584,17 @@ Export canceled. self._eip_status - + {0} is restarting - + {0} could not be launched because you did not authenticate properly. - + {0} finished in an unexpected manner! -- cgit v1.2.3 From 7cb332c84eaef651cb614b2e2b9a49d6ff05ac42 Mon Sep 17 00:00:00 2001 From: Ivan Alejandro Date: Mon, 6 Oct 2014 11:52:56 -0300 Subject: Replace triple dot character with 3 dots. The string was unicode and the conversion was troublesome, was displayed badly on transifex. --- data/ts/en_US.ts | 5 ----- src/leap/bitmask/gui/mail_status.py | 2 +- 2 files changed, 1 insertion(+), 6 deletions(-) diff --git a/data/ts/en_US.ts b/data/ts/en_US.ts index 7ab39646..87aaf0e3 100644 --- a/data/ts/en_US.ts +++ b/data/ts/en_US.ts @@ -720,11 +720,6 @@ Export canceled. Invalid auth token, try logging in again. - - - Starting… - - Initial sync in progress, please wait... diff --git a/src/leap/bitmask/gui/mail_status.py b/src/leap/bitmask/gui/mail_status.py index d523f449..92e1e4c4 100644 --- a/src/leap/bitmask/gui/mail_status.py +++ b/src/leap/bitmask/gui/mail_status.py @@ -228,7 +228,7 @@ class MailStatusWidget(QtGui.QWidget): self._service_name)) elif ready == 1: icon = self.CONNECTING_ICON - self._mx_status = self.tr('Starting…') + self._mx_status = self.tr('Starting...') tray_status = self.tr('Mail is starting') elif ready >= 2: icon = self.CONNECTED_ICON -- cgit v1.2.3 From 5d3e34a1d71c52a62bc8ce386d93d5dd3221d57c Mon Sep 17 00:00:00 2001 From: Ruben Pollan Date: Thu, 2 Oct 2014 18:22:30 -0500 Subject: Handle removals on the updater repo --- changes/bug_6146_handle_removals_release | 1 + pkg/tuf/release.py | 23 ++++++++++++++++++++++- 2 files changed, 23 insertions(+), 1 deletion(-) create mode 100644 changes/bug_6146_handle_removals_release diff --git a/changes/bug_6146_handle_removals_release b/changes/bug_6146_handle_removals_release new file mode 100644 index 00000000..6fe67d62 --- /dev/null +++ b/changes/bug_6146_handle_removals_release @@ -0,0 +1 @@ +- Make pkg/tuf/release.py handle removals in the repo diff --git a/pkg/tuf/release.py b/pkg/tuf/release.py index c4abcd0d..0e1c989c 100755 --- a/pkg/tuf/release.py +++ b/pkg/tuf/release.py @@ -29,7 +29,6 @@ import sys from tuf.repository_tool import load_repository from tuf.repository_tool import import_rsa_privatekey_from_file -from tuf.repository_tool import import_rsa_publickey_from_file """ Days until the expiration of targets.json and snapshot.json. After this ammount @@ -102,6 +101,8 @@ class Targets(object): recursive_walk=True, followlinks=True) + self._remove_obsolete_targets(target_list) + for target in target_list: octal_file_permissions = oct(os.stat(target).st_mode)[3:] custom_file_permissions = { @@ -109,6 +110,26 @@ class Targets(object): } self._repo.targets.add_target(target, custom_file_permissions) + def _remove_obsolete_targets(self, target_list): + """ + Remove obsolete targets from TUF targets + + :param target_list: list of targets on full path comming from TUF + get_filepaths_in_directory + :type target_list: list(str) + """ + targets_path = os.path.join(self._repo_path, 'targets') + relative_path_list = map(lambda t: t.split("/targets")[1], target_list) + removed_targets = (set(self._repo.targets.target_files.keys()) + - set(relative_path_list)) + + for target in removed_targets: + target_rel_path = target + if target[0] == '/': + target_rel_path = target[1:] + target_path = os.path.join(targets_path, target_rel_path) + self._repo.targets.remove_target(target_path) + if __name__ == "__main__": main() -- cgit v1.2.3 From 45b6bbb1e3b710fe975d1627a9dbb4e89369bb50 Mon Sep 17 00:00:00 2001 From: Ivan Alejandro Date: Tue, 7 Oct 2014 17:01:14 -0300 Subject: Fix typos on strings and remove unused button. This was reported by the user 'strel' on transifex. --- data/ts/en_US.ts | 25 +++++++++-------------- src/leap/bitmask/gui/advanced_key_management.py | 2 +- src/leap/bitmask/gui/eip_status.py | 4 ++-- src/leap/bitmask/gui/ui/preferences_email_page.ui | 13 ------------ 4 files changed, 13 insertions(+), 31 deletions(-) diff --git a/data/ts/en_US.ts b/data/ts/en_US.ts index 87aaf0e3..8b457988 100644 --- a/data/ts/en_US.ts +++ b/data/ts/en_US.ts @@ -116,11 +116,6 @@ Import canceled. Import canceled. - - - Are you sure that you want to replace the current key pair whith the imported? - - Import Successful @@ -168,6 +163,11 @@ Export canceled. <span style='color:#0000FF;'>NOTE</span>: + + + Are you sure that you want to replace the current key pair with the imported? + + App @@ -378,11 +378,6 @@ Export canceled. We could not find openvpn binary. - - - We could not find any authentication agent in your system.<br/>Make sure you have<b>polkit-gnome-authentication-agent-1</b> running andtry again. - - We could not find <b>pkexec</b> in your system. @@ -413,6 +408,11 @@ Export canceled. Encrypted Internet failed to start + + + We could not find any authentication agent in your system.<br/>Make sure you have <b>polkit-gnome-authentication-agent-1</b> running and try again. + + Form @@ -1179,11 +1179,6 @@ Export canceled. Form - - - PushButton - - PreferencesVpnPage diff --git a/src/leap/bitmask/gui/advanced_key_management.py b/src/leap/bitmask/gui/advanced_key_management.py index b3a4ed8e..48a1db93 100644 --- a/src/leap/bitmask/gui/advanced_key_management.py +++ b/src/leap/bitmask/gui/advanced_key_management.py @@ -121,7 +121,7 @@ class AdvancedKeyManagement(QtGui.QDialog): if file_name: question = self.tr("Are you sure that you want to replace " - "the current key pair whith the imported?") + "the current key pair with the imported?") res = QtGui.QMessageBox.question( None, "Change key pair", question, QtGui.QMessageBox.Yes | QtGui.QMessageBox.No, diff --git a/src/leap/bitmask/gui/eip_status.py b/src/leap/bitmask/gui/eip_status.py index a5cd03d3..14ff5972 100644 --- a/src/leap/bitmask/gui/eip_status.py +++ b/src/leap/bitmask/gui/eip_status.py @@ -741,8 +741,8 @@ class EIPStatusWidget(QtGui.QWidget): # XXX this should change to polkit-kde where # applicable. self.tr("We could not find any authentication agent in your " - "system.
Make sure you have" - "polkit-gnome-authentication-agent-1 running and" + "system.
Make sure you have " + "polkit-gnome-authentication-agent-1 running and " "try again."), error=True) self.set_eipstatus_off() diff --git a/src/leap/bitmask/gui/ui/preferences_email_page.ui b/src/leap/bitmask/gui/ui/preferences_email_page.ui index 41b3c28d..7cc5bb3c 100644 --- a/src/leap/bitmask/gui/ui/preferences_email_page.ui +++ b/src/leap/bitmask/gui/ui/preferences_email_page.ui @@ -13,19 +13,6 @@ Form - - - - 250 - 210 - 98 - 27 - - - - PushButton - - -- cgit v1.2.3 From 10b5b00e5282b0b8e6184eaaf173f6a8b436bbce Mon Sep 17 00:00:00 2001 From: Ivan Alejandro Date: Fri, 10 Oct 2014 13:39:24 -0300 Subject: Set version to 0.7.0 and date to the rc1 date. --- relnotes.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/relnotes.txt b/relnotes.txt index 02e53ee6..85d4ecbf 100644 --- a/relnotes.txt +++ b/relnotes.txt @@ -1,7 +1,7 @@ ANNOUNCING Bitmask, the Internet Encryption Toolkit, release 0.7.0 The LEAP team is pleased to announce the immediate availability of -version 0.6.1 of Bitmask, the Internet Encryption Toolkit, codename +version 0.7.0 of Bitmask, the Internet Encryption Toolkit, codename "one time download, all time updates". https://downloads.leap.se/client/ @@ -107,6 +107,6 @@ beyond any border. The LEAP team, -Setptember 26, 2014 +October 09, 2014 Somewhere in the middle of the intertubes. EOF -- cgit v1.2.3 From 98af9c20e0582a113133613b673552236e920be9 Mon Sep 17 00:00:00 2001 From: Ivan Alejandro Date: Tue, 21 Oct 2014 15:56:39 -0300 Subject: Better error message for PostLimitError. Suggested by user 'kingu' on transifex. --- src/leap/bitmask/gui/loggerwindow.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/leap/bitmask/gui/loggerwindow.py b/src/leap/bitmask/gui/loggerwindow.py index 360dd5f0..463d2412 100644 --- a/src/leap/bitmask/gui/loggerwindow.py +++ b/src/leap/bitmask/gui/loggerwindow.py @@ -225,7 +225,7 @@ class LoggerWindow(QtGui.QDialog): msg = self.tr("Sending logs to Pastebin failed!") if isinstance(failure, pastebin.PostLimitError): - msg = self.tr('Maximum posts per day reached') + msg = self.tr('Maximum amount of submissions reached for today.') # We save the dialog in an instance member to avoid dialog being # deleted right after we exit this method -- cgit v1.2.3 From 29ab0bf0a9c8b0b564548a275cc789ecf77f40c8 Mon Sep 17 00:00:00 2001 From: Ivan Alejandro Date: Tue, 28 Oct 2014 12:22:46 -0300 Subject: Fold in changes Update release date and version name. --- CHANGELOG.rst | 7 +++++-- changes/bug_6146_handle_removals_release | 1 - 2 files changed, 5 insertions(+), 3 deletions(-) delete mode 100644 changes/bug_6146_handle_removals_release diff --git a/CHANGELOG.rst b/CHANGELOG.rst index 3c863657..0a5b6229 100644 --- a/CHANGELOG.rst +++ b/CHANGELOG.rst @@ -6,8 +6,8 @@ History 2014 ==== -0.7.0 September 26 -- the "one time download, all time updates" release: -++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ +0.7.0rc3 October 28 -- the "One window to rule them all, and in the darkness bind them." release: ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ - Select current provider on EIP preferences. Closes #5815. - Handle logout correctly when we stop_services to launch the @@ -33,6 +33,9 @@ History - Remove the Advanced Key Management since we don't support stable mail yet. Closes #6087. - Single combined preferences window. Closes #4704, #4119, #5885. +- Fix soledad imports (#5989). +- Make pkg/tuf/release.py handle removals in the repo + 0.6.1 August 15 -- the "knock knock knocking on beta's door" release: +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ diff --git a/changes/bug_6146_handle_removals_release b/changes/bug_6146_handle_removals_release deleted file mode 100644 index 6fe67d62..00000000 --- a/changes/bug_6146_handle_removals_release +++ /dev/null @@ -1 +0,0 @@ -- Make pkg/tuf/release.py handle removals in the repo -- cgit v1.2.3 From 17eac41c5884e39bc2196379eb694c8e04a1caa2 Mon Sep 17 00:00:00 2001 From: Ivan Alejandro Date: Tue, 28 Oct 2014 12:26:53 -0300 Subject: Update requirements to use newer Soledad. --- pkg/requirements.pip | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkg/requirements.pip b/pkg/requirements.pip index 9f49bf03..8ce1793e 100644 --- a/pkg/requirements.pip +++ b/pkg/requirements.pip @@ -27,7 +27,7 @@ zope.proxy pyzmq leap.common>=0.3.7 -leap.soledad.client>=0.5.0 +leap.soledad.client>=0.6.0 leap.keymanager>=0.3.8 leap.mail>=0.3.9 -- cgit v1.2.3 From 7b0dda2fde310fff5ea6ee57a5f18a554b8e665f Mon Sep 17 00:00:00 2001 From: Ivan Alejandro Date: Tue, 28 Oct 2014 12:27:14 -0300 Subject: Update release date and version number. --- relnotes.txt | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/relnotes.txt b/relnotes.txt index 85d4ecbf..eab0f64a 100644 --- a/relnotes.txt +++ b/relnotes.txt @@ -1,8 +1,8 @@ -ANNOUNCING Bitmask, the Internet Encryption Toolkit, release 0.7.0 +ANNOUNCING Bitmask, the Internet Encryption Toolkit, release 0.7.0rc3 The LEAP team is pleased to announce the immediate availability of -version 0.7.0 of Bitmask, the Internet Encryption Toolkit, codename -"one time download, all time updates". +version 0.7.0rc3 of Bitmask, the Internet Encryption Toolkit, codename +"One window to rule them all, and in the darkness bind them." https://downloads.leap.se/client/ @@ -107,6 +107,6 @@ beyond any border. The LEAP team, -October 09, 2014 +October 28, 2014 Somewhere in the middle of the intertubes. EOF -- cgit v1.2.3