summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2014-02-17Merge remote-tracking branch ↵Tomás Touceda
'refs/remotes/drebs/feature/5120_update-keymanager-to-webapp-v2' into develop
2014-02-17Update keymanager auth to interact with webapp v2 (Closes #5120).drebs
2014-02-17Merge remote-tracking branch 'refs/remotes/kali/profiling_goodies' into developTomás Touceda
2014-02-17Merge remote-tracking branch 'ivan-github/feature/preserve-uuid-on-logout' ↵Kali Kaneko
into develop
2014-02-17silence decoratorKali Kaneko
2014-02-17profiling target to makefileKali Kaneko
2014-02-13Preserve settings' uuid on logout.Ivan Alejandro
2014-02-12Merge remote-tracking branch ↵Tomás Touceda
'refs/remotes/ivan/bug/cancel-login-does-not-work' into develop
2014-02-12Merge remote-tracking branch 'refs/remotes/ivan/bug/handle-closed-soledad' ↵Tomás Touceda
into develop
2014-02-12Handle closed db exception during sync.Ivan Alejandro
[Closes #5130]
2014-02-11Properly handle defer cancelling.Ivan Alejandro
- Fix issues related to "Cancel login does not work". - Move srpauth errback to mainwindow. - Add signal for provider setup cancel. - Add support to cancel the soledad defer. [Closes #4869] [Closes #4973]
2014-02-07Merge remote-tracking branch 'refs/remotes/ivan/bug/cosmetic-fixes' into developTomás Touceda
2014-02-07Pep8 fixes, remove commented ipdb, group imports.Ivan Alejandro
2014-02-07Merge remote-tracking branch 'refs/remotes/kali/feature/memstore-support' ↵Tomás Touceda
into develop
2014-02-07Merge remote-tracking branch ↵Ivan Alejandro
'drebs/feature/5095_add-semaphore-for-safe-exit' into develop
2014-02-07Ensure IMAP flushes data to disk before quitting. Closes #5095.drebs
2014-02-07Merge remote-tracking branch 'kali/bug/help_typos' into developIvan Alejandro
2014-02-07Merge remote-tracking branch ↵Tomás Touceda
'refs/remotes/ivan/bug/4995_error-on-every-logout' into develop
2014-02-06Take care of None value for the uuid.Ivan Alejandro
Receiving a None value was raising an exception that didn't show up since was trapped inside the srpauth:logout method. [Closes #4995] [Closes #5071]
2014-02-05fix typosKali Kaneko
2014-02-04Merge remote-tracking branch ↵Tomás Touceda
'refs/remotes/ivan/bug/4984_update-menu-name-in-wizard' into develop
2014-02-04Update menu name in wizard.Ivan Alejandro
[Closes 4984]
2014-02-04Merge remote-tracking branch 'refs/remotes/ivan/feature/update-log-format' ↵Tomás Touceda
into develop
2014-02-03Use the new log format in the GUI too.Ivan Alejandro
- Unify location for log format.
2014-02-01Merge remote-tracking branch 'ivan-github/feature/more-readable-logs' into ↵Kali Kaneko
develop
2014-01-31Improve logs readabilityIvan Alejandro
- levelname: after time, fixed width, left aligned - Line number before name and with fixed width - function with ()
2014-01-31Merge remote-tracking branch ↵Kali Kaneko
'chiiph/feature/5083_sync_soledad_only_on_account_create' into develop
2014-01-31Only sync soledad at account creation, otherwise defer to threadTomás Touceda
2014-01-27make plumber use memory storeKali Kaneko
2014-01-27Merge remote-tracking branch 'refs/remotes/kali/ignore-profiler-reports' ↵Tomás Touceda
into develop
2014-01-27ignore line_profiler reportsKali Kaneko
2014-01-24Merge remote-tracking branch ↵Tomás Touceda
'refs/remotes/ivan/bug/4986_error-joining-string' into develop
2014-01-24Add changes file for #4986.Ivan Alejandro
2014-01-24Handle wizard close correctly. Closes #4986.Ivan Alejandro
- Refactor connection and disconnection from backend.
2014-01-23Replace provider hardcoded path with helper.Ivan Alejandro
Also reorder some imports and remove unused ones.
2014-01-22Merge remote-tracking branch ↵Tomás Touceda
'refs/remotes/ivan/feature/4488_use-existing-provider-by-default' into develop
2014-01-22Select by default the use of an existing provider.Ivan Alejandro
[Closes #4488]
2014-01-22Merge remote-tracking branch ↵Tomás Touceda
'refs/remotes/ivan/bug/4985_config-help-menu-non-empty-password' into develop
2014-01-22Don't use an empty password to configure email.Ivan Alejandro
- Also add translation support for the help message. [Closes #4985]
2014-01-20Merge remote-tracking branch 'refs/remotes/ivan/feature/disable-akm-import' ↵Tomás Touceda
into develop
2014-01-20Disable Advanced Key Manager import. Closes #4877.Ivan Alejandro
2014-01-17Merge remote-tracking branch 'refs/remotes/kali/bug/capture-keyring-errors' ↵Tomás Touceda
into develop
2014-01-17defend against keyring errorsKali Kaneko
on certain settings, like a virtualenv with symlinks, I'm getting errors after a suspend, related to a error to connect to the dbus socket. wrapping all of it in a conditional we avoid that kind of error.
2014-01-16Merge remote-tracking branch 'refs/remotes/kali/move-slipped-off-changefile' ↵Tomás Touceda
into develop
2014-01-15move file to where it belongs...Kali Kaneko
2014-01-14Merge remote-tracking branch 'refs/remotes/elijah/feature/bootstrap' into ↵Tomás Touceda
develop
2014-01-14bootstrap script -- make run passthrough args work, allow init to be re-run.elijah
2014-01-14Merge remote-tracking branch ↵Tomás Touceda
'refs/remotes/ivan/feature/4530_add-in-app-help-for-mail' into develop
2014-01-14Add dialog with instructions to configure mail.Ivan Alejandro
[Closes #4530]
2014-01-14Merge remote-tracking branch ↵Tomás Touceda
'refs/remotes/ivan/bug/4952_fix-unread-email-wording' into develop