aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* full fingerprint in README exampleDominik Schürmann2014-02-021-1/+1
* expose key server APIDominik Schürmann2014-02-026-11/+10
* Update version code for betaDominik Schürmann2014-02-021-1/+1
* changelogDominik Schürmann2014-02-021-1/+5
* change when passphrase is requested in edit activityAshley Hughes2014-02-021-22/+29
* Use buttons for encrypt decrypt instead of actionbarDominik Schürmann2014-02-026-187/+157
* Update libs in READMEDominik Schürmann2014-02-022-3/+7
* Hacks to make dialogs on Android 2.3 black on white, and not black on blackDominik Schürmann2014-02-028-23/+57
* Update libs in aboutDominik Schürmann2014-02-021-1/+2
* Resolve crashes on Android 2.3 due to ActionBarCompat conversionDominik Schürmann2014-02-0211-226/+218
* Switch from ActionBarSherlock to ActionBarCompatDominik Schürmann2014-02-02481-38230/+155
* update hasPassphrase for subkey only keyringsAshley Hughes2014-02-021-2/+16
* allow passphrases to be removedAshley Hughes2014-02-021-2/+4
* Merge branch 'edit-fixes'Ashley Hughes2014-02-022-0/+8
|\
| * fix select key-signing keysAshley Hughes2014-02-022-0/+8
* | importing progress dialog language fixedDominik Schürmann2014-02-011-5/+6
* | importing progress dialog language fixedDominik Schürmann2014-02-012-2/+1
* | CleanupDominik Schürmann2014-02-013-6/+1
* | Update NFC helpDominik Schürmann2014-02-012-3/+3
* | Fix scanning of fingerprint qr code, whole qr code scanning still brokenDominik Schürmann2014-02-013-28/+34
|/
* Fix QR Code URIDominik Schürmann2014-02-012-7/+4
* Update from transifexDominik Schürmann2014-02-011-1/+1
* Reworking import, testing needed...Dominik Schürmann2014-02-0117-932/+431
* Fix loader initDominik Schürmann2014-02-012-25/+42
* Merge branch 'master' of github.com:openpgp-keychain/openpgp-keychainDominik Schürmann2014-02-011-1/+1
|\
| * fix disable editing for subkey keysAshley Hughes2014-02-011-1/+1
* | search worksDominik Schürmann2014-02-0112-96/+206
|/
* Merge branch 'master' of github.com:openpgp-keychain/openpgp-keychainDominik Schürmann2014-02-018-90/+89
|\
| * Merge branch 'master' of https://github.com/openpgp-keychain/openpgp-keychainAshley Hughes2014-02-0111-210/+324
| |\
| * | make sure method is publicAshley Hughes2014-02-011-1/+1
| * | create new keys without lots of extra certificationAshley Hughes2014-02-018-90/+89
| |\ \
| | * | wrong types being createdAshley Hughes2014-02-011-2/+2
| | * | create keys with minimal keyrings being constructed in betweenAshley Hughes2014-01-313-8/+25
| | * | more probable changes for spongycastle2Ashley Hughes2014-01-312-0/+28
| | * | default keys genAshley Hughes2014-01-311-12/+8
| | * | generate single keyAshley Hughes2014-01-312-21/+9
| | * | builds, but intents are not called or handled correctlyAshley Hughes2014-01-301-6/+9
| | * | needs to be public...Ashley Hughes2014-01-301-1/+1
| | * | save workAshley Hughes2014-01-302-44/+12
* | | | rename KeyServerUploadActivity to UploadKeyActivityDominik Schürmann2014-02-013-4/+4
| |_|/ |/| |
* | | Started working on integration of keyserver query into import activityDominik Schürmann2014-02-0111-210/+324
|/ /
* | save fingerprint on saveDominik Schürmann2014-02-011-0/+2
* | No bouncy castle objects in key viewDominik Schürmann2014-02-017-36/+25
* | Fix layout, add API notes to README, register fingerprint URIs, some reformat...Dominik Schürmann2014-02-0119-680/+656
* | Remove eclipse info from READMEDominik Schürmann2014-01-311-5/+0
* | Fix display of long user ids in key viewDominik Schürmann2014-01-311-10/+10
* | Allow state loss on dismissal of progress dialogs, fixes #217Dominik Schürmann2014-01-312-24/+28
* | Fix and simplify user id parsingDominik Schürmann2014-01-316-55/+51
* | Change gradle build for spongy castle, now Android Studio properly finds the ...Dominik Schürmann2014-01-316-69/+53
* | update from transifexDominik Schürmann2014-01-3119-54/+141
|/