aboutsummaryrefslogtreecommitdiffstats
path: root/OpenKeychain
Commit message (Expand)AuthorAgeFilesLines
...
* Merge branch 'development' of github.com:open-keychain/open-keychain into dev...Dominik Schürmann2014-10-263-4/+18
|\
| * Merge branch 'development' of github.com:open-keychain/open-keychain into dev...Vincent Breitmoser2014-10-267-19/+42
| |\
| * | Retry canonicalization with pubkey self certs if first attempt failedVincent Breitmoser2014-10-263-4/+18
* | | Fixes from transifexDominik Schürmann2014-10-261-37/+37
| |/ |/|
* | Move some multi select items in overflow menu, rename importDominik Schürmann2014-10-262-8/+15
* | Fail on unknown key ids on API, Key item design consistency for APIDominik Schürmann2014-10-264-3/+19
* | Fix layout of select key adapterDominik Schürmann2014-10-262-8/+8
|/
* Remove empty layoutDominik Schürmann2014-10-253-73/+1
* Remove PassphraseDialogFragmentDominik Schürmann2014-10-252-435/+2
* Remove old certify activityDominik Schürmann2014-10-254-470/+1
* Use passphrase dialog activity instead of passphrase dialogDominik Schürmann2014-10-253-36/+67
* Remove old exception handling code from loadersDominik Schürmann2014-10-251-35/+3
* Merge branch 'development' of github.com:open-keychain/open-keychain into dev...Dominik Schürmann2014-10-253-8/+20
|\
| * remove unnecessary (and buggy) BufferedInputStream wrappingVincent Breitmoser2014-10-253-8/+20
* | Fix color in import listDominik Schürmann2014-10-251-6/+8
|/
* Remove tabs from import keys activityDominik Schürmann2014-10-255-329/+66
* Merge branch 'development' of github.com:open-keychain/open-keychain into dev...Dominik Schürmann2014-10-252-7/+7
|\
| * shorter certification explanationVincent Breitmoser2014-10-251-1/+1
| * more rewordingVincent Breitmoser2014-10-252-6/+6
* | Fixes and icons for apps list, also add Password StoreDominik Schürmann2014-10-254-12/+25
|/
* Fix result passingDominik Schürmann2014-10-252-2/+1
* Merge branch 'development' of github.com:open-keychain/open-keychain into dev...Dominik Schürmann2014-10-254-4/+17
|\
| * slightly change wording in merge logsVincent Breitmoser2014-10-252-2/+3
| * Merge branch 'development' of github.com:open-keychain/open-keychain into dev...Vincent Breitmoser2014-10-257-152/+353
| |\
| * | change the way merging is loggedVincent Breitmoser2014-10-254-3/+15
* | | Safeslinger fixesÄDominik Schürmann2014-10-251-4/+6
| |/ |/|
* | Fix safe slinger buttonDominik Schürmann2014-10-251-1/+1
* | Fix safe slinger buttonDominik Schürmann2014-10-251-2/+4
* | Use selected number of users in safe slingerDominik Schürmann2014-10-251-0/+1
* | Merge branch 'development' of github.com:open-keychain/open-keychain into dev...Dominik Schürmann2014-10-254-23/+62
|\|
| * change indentation of import logsVincent Breitmoser2014-10-251-10/+10
| * set padding for sublog entriesVincent Breitmoser2014-10-251-0/+2
| * more work on import loggingVincent Breitmoser2014-10-252-6/+7
| * add logging to import and change order of import, keyservers firstVincent Breitmoser2014-10-253-23/+59
* | Safe slinger activity prepsDominik Schürmann2014-10-257-152/+350
|/
* Qr code button textDominik Schürmann2014-10-242-2/+2
* remove space in on large devices in layouts where no drawer nav is shownDominik Schürmann2014-10-243-142/+0
* Fix import from cloudDominik Schürmann2014-10-241-1/+1
* Merge pull request #973 from timbray/developmentDominik Schürmann2014-10-244-72/+32
|\
| * reword sync messageTim Bray2014-10-221-1/+1
| * Make the Certify screen a little more self-explanatoryTim Bray2014-10-214-72/+32
* | Merge branch 'development' of github.com:open-keychain/open-keychain into dev...Dominik Schürmann2014-10-239-128/+167
|\ \
| * \ Merge branch 'development' of github.com:open-keychain/open-keychain into dev...Vincent Breitmoser2014-10-2313-61/+93
| |\ \
| * | | integrate download from keyserver into key import operationVincent Breitmoser2014-10-239-126/+165
* | | | Start safe slinger activityDominik Schürmann2014-10-232-0/+69
* | | | Externalize QR Code scanning and import into its own activity for better code...Dominik Schürmann2014-10-236-121/+251
| |/ / |/| |
* | | Fix crash on Android 5Dominik Schürmann2014-10-221-11/+16
| |/ |/|
* | consistency for import UIDominik Schürmann2014-10-161-5/+27
* | Silently fail on import on key import with ArrayIndexOutOfBoundsExceptionDominik Schürmann2014-10-162-8/+14
* | Merge branch 'development' of github.com:open-keychain/open-keychain into dev...Dominik Schürmann2014-10-156-8/+60
|\|
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-09 13:39:56 +0000