summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2013-08-30Merge branch 'develop' of ssh://leap.se/leap_client into developKali Kaneko
2013-08-30Merge remote-tracking branch 'chiiph/feature/doc_contribution' into developKali Kaneko
2013-08-30Merge remote-tracking branch 'kali/bug/fix-naming-in-resolv-update' into developTomás Touceda
2013-08-30fix naming in resolv-updateKali Kaneko
2013-08-30Merge remote-tracking branch 'kali/bug/fix-namespace-in-req-checker' into ↵Tomás Touceda
develop
2013-08-30s/bitmask/leap.bitmask in package nameKali Kaneko
...And this should be fixed forever and ever now. or until we change namespaces/package names again :)
2013-08-30Merge remote-tracking branch 'ivan/bug/3610_change-password-disabled' into ↵Tomás Touceda
develop
2013-08-29add leap-keymanager to pydist-overridesMicah Anderson
2013-08-29Merge remote-tracking branch 'kali/bug/minor-fixes-packaging' into debianMicah Anderson
2013-08-29Enable password change when soledad is ready.Ivan Alejandro
Closes #3610.
2013-08-29Add hacking doc for contributorsTomás Touceda
2013-08-29Merge remote-tracking branch 'chiiph/feature/bundle_build_script' into developIvan Alejandro
2013-08-29Merge remote-tracking branch 'chiiph/feature/document_release' into developIvan Alejandro
2013-08-28Merge remote-tracking branch 'ivan/bug/hotfix' into developTomás Touceda
2013-08-28Replace old path_prefix with new method.Ivan Alejandro
2013-08-28Merge remote-tracking branch 'ivan/feature/3574_use-dirspec-instead-of-xdg' ↵Tomás Touceda
into develop Conflicts: src/leap/bitmask/config/leapsettings.py
2013-08-28Use dirspec instead of plain xdg. Closes #3574.Ivan Alejandro
2013-08-28Update release checklistTomás Touceda
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