summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2013-08-28Merge remote-tracking branch 'ivan/feature/preferences-select-services' into ↵Tomás Touceda
develop Conflicts: src/leap/bitmask/gui/mainwindow.py src/leap/bitmask/gui/preferenceswindow.py
2013-08-28Add changelog. Closes #3534.Ivan Alejandro
2013-08-28Refactor services display names out. Closes #3578.Ivan Alejandro
2013-08-28Preferences: select enabled services for providersIvan Alejandro
2013-08-28Remove key for a provider with no enabled servicesIvan Alejandro
2013-08-28Move configured providers getter to LeapSettings.Ivan Alejandro
2013-08-28Add build scripts for Linux bundleTomás Touceda
2013-08-27Add build scripts for OSX bundlesTomás Touceda
2013-08-27Merge remote-tracking branch 'ivan/feature/preferences-select-services' into ↵Tomás Touceda
develop
2013-08-27Merge remote-tracking branch 'leapcode/debian' into debianMicah Anderson
Conflicts: MANIFEST.in debian/changelog debian/copyright
2013-08-27reformat debian/control extended descriptionMicah Anderson
2013-08-27change name in debian/copyright to bitmaskMicah Anderson
2013-08-27Merge pull request #276 from kalikaneko/debian-0.3.1micah
Debian 0.3.1
2013-08-27update bitmask icon to latest logoKali Kaneko
2013-08-27Merge remote-tracking branch 'kali/bug/minor-fixes-packaging' into developTomás Touceda
2013-08-27more naming changesKali Kaneko
2013-08-27update manpageKali Kaneko
2013-08-27add license, changelog, readme to manifestKali Kaneko
2013-08-27update manpageKali Kaneko
2013-08-27Add changelog. Closes #3534.Ivan Alejandro
2013-08-27Preferences: select enabled services for providersIvan Alejandro
2013-08-27Remove key for a provider with no enabled servicesIvan Alejandro
2013-08-27Move configured providers getter to LeapSettings.Ivan Alejandro
2013-08-27Merge remote-tracking branch 'kali/bug/add-data-files' into developTomás Touceda
2013-08-27update changelogKali Kaneko
2013-08-27add PEP386 flagKali Kaneko
2013-08-27more renaming fixesKali Kaneko
2013-08-27install our CHANGELOGKali Kaneko
2013-08-27add license, changelog, readme to manifestKali Kaneko
2013-08-27make pre a suffix preceding currentKali Kaneko
2013-08-27Add data_files under linuxKali Kaneko
* polkit file * /etc/leap/resolv-update
2013-08-27Add data_files under linuxKali Kaneko
* polkit file * /etc/leap/resolv-update
2013-08-26add leap.mail requirementKali Kaneko
2013-08-26add leap.mail as depKali Kaneko
2013-08-26Merge remote-tracking branch 'kali/bug/add-mail-dep' into developTomás Touceda
2013-08-26add leap.mail requirementKali Kaneko
2013-08-26fix up script in linuxKali Kaneko
2013-08-26update deps: explicit deps for leap.common and soledad-clientKali Kaneko
2013-08-26add pydist-overrides for leap.common and leap.soledad.clientKali Kaneko
2013-08-26Merge remote-tracking branch 'kali/bug/crate_badge' into developTomás Touceda
2013-08-26Merge remote-tracking branch ↵Tomás Touceda
'ivan/feature/3552_refactor-basic-password-checks' into develop
2013-08-26Merge remote-tracking branch 'kali/add-to-gitignore' into developTomás Touceda
2013-08-26Merge remote-tracking branch 'kali/bug/3450_fix-up-script' into developTomás Touceda
2013-08-26update icon and project pathKali Kaneko
2013-08-26add debian related files to gitignoreKali Kaneko
2013-08-26bump version to 0.3.1Kali Kaneko
2013-08-26Merge branch 'master' into debian-0.3.1Kali Kaneko
2013-08-23Refactor basic password checks. Closes #3552.Ivan Alejandro
2013-08-23fix up script in linuxKali Kaneko
2013-08-23unignore .gitattributesKali Kaneko