summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2014-03-10Merge remote-tracking branch 'refs/remotes/kali/feature/graph-cpu-and-mem' ↵Tomás Touceda
into develop
2014-03-10comment workaround for systems w/o pgrepKali Kaneko
2014-03-10changes fileKali Kaneko
2014-03-10Merge remote-tracking branch 'chiiph/feature/remove_qtreactor' into developKali Kaneko
2014-03-07Merge remote-tracking branch ↵Tomás Touceda
'refs/remotes/ivan/feature/centralized-defer-cancel' into develop
2014-03-07Merge remote-tracking branch 'refs/remotes/ivan/bug/better-soledad-retry' ↵Tomás Touceda
into develop
2014-03-07Merge remote-tracking branch ↵Tomás Touceda
'refs/remotes/ivan/bug/select-domain-in-eip-preferences' into develop
2014-03-07Remove qtreactor dependencyTomás Touceda
2014-03-07Move all the defer cancelling to a method.Ivan Alejandro
Also add X_defer = None for the defers after being cancelled.
2014-03-07Run all the soledad bootstrap on error.Ivan Alejandro
Before this fix, if the soledad bootstrapping failed during the first download process, we retried since after that point which caused a failure.
2014-03-07add ability to set nice order via env varKali Kaneko
2014-03-06Select current provider as default in eip settingsIvan Alejandro
Set as selected default for the eip preferences window the item selented in the bitmask main window. [Closes #5153]
2014-03-05Merge remote-tracking branch 'kwadronaut/develop' into developIvan Alejandro
2014-03-05script to graph cpu/mem usage. Related: #5259Kali Kaneko
Use as: RESOURCE_TIME=5 make resource_graph where RESOURCE_TIME are the minutes to run for.
2014-03-04double dot → ellipsisKwadroNaut
2014-02-27Merge remote-tracking branch 'ivan-github/feature/update-strings' into developKali Kaneko
2014-02-27Update app strings for Transifex.Ivan Alejandro
2014-02-27Merge remote-tracking branch ↵Tomás Touceda
'refs/remotes/kali/fix/unread-notification-phrasing' into develop
2014-02-26Merge remote-tracking branch 'ivan-github/bug/fix-qmessagebox-error-call' ↵Kali Kaneko
into develop
2014-02-26Add changes file for #5163.Ivan Alejandro
2014-02-26Fix wrong method name for pastebin error.Ivan Alejandro
2014-02-26Merge remote-tracking branch 'ivan-github/feature/add-pastebin-support' into ↵Kali Kaneko
develop
2014-02-26Show sending status in button and return raw link.Ivan Alejandro
2014-02-26Add pastebin support for upload logs.Ivan Alejandro
2014-02-26Add Pastebin button to logger window.Ivan Alejandro
Also add png image for the button and license information.
2014-02-26Add pastebin api wrapper file.Ivan Alejandro
Currently installation through PyPI isn't working so I embedded here. Add reference in license file.
2014-02-25fix phrasing of unread mail notificationKali Kaneko
2014-02-24Merge remote-tracking branch ↵Tomás Touceda
'refs/remotes/ivan/bug/fix-soledad_failed-signal' into develop
2014-02-24Connect with correct soledad_failed signal.Ivan Alejandro
2014-02-20Merge remote-tracking branch ↵Tomás Touceda
'refs/remotes/ivan/bug/5131_mail-starts-after-logout' into develop
2014-02-20Improve logout action and fix typo.Ivan Alejandro
Related to #5131. [Closes #4815]
2014-02-19Merge remote-tracking branch 'kali/feature/add_line_profiler_target' into ↵Ivan Alejandro
develop
2014-02-19Merge remote-tracking branch 'ivan-github/bug/programming-error-bis' into ↵Kali Kaneko
develop
2014-02-19Catch ProgrammingError from pysqlcipher too.Ivan Alejandro
Related to #5130.
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-17add line_profiler targets to MakefileKali Kaneko
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