aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
...
* | Merge branch 'development' into linked-identitiesVincent Breitmoser2015-04-24257-5089/+7145
|\|
| * Graphic stuffDominik Schürmann2015-04-173-213/+134
| * Use https for zxing libDominik Schürmann2015-04-171-1/+1
| * Use portrait mode for qr code scanningDominik Schürmann2015-04-151-10/+8
| * More cleanupDominik Schürmann2015-04-159-324/+28
| * Fix YubiKey naming, cleanupDominik Schürmann2015-04-1511-67/+59
| * Clean up NfcOperationActivityDominik Schürmann2015-04-151-8/+6
| * Reformat nfcVerifyPINDominik Schürmann2015-04-151-6/+6
| * Merge pull request #1200 from josecastillo/developmentDominik Schürmann2015-04-151-19/+29
| |\
| | * Consolidate PIN verify operation in nfcVerifyPIN method.Joey Castillo2015-04-141-44/+28
| | * Move PIN verify inside sign/decrypt operation and set correct mode.Joey Castillo2015-04-141-19/+45
| * | Contribution infoDominik Schürmann2015-04-141-1/+1
| * | Contribution infoDominik Schürmann2015-04-141-1/+1
| * | Remove unused includes in settings.gradleDominik Schürmann2015-04-141-2/+0
| |/
| * Update libsDominik Schürmann2015-04-141-6/+6
| * Pull from transifexDominik Schürmann2015-04-14110-1110/+1555
| * Update html-textview, fix buildDominik Schürmann2015-04-141-2/+2
| * Reformat comment in PassphraseCacheServiceDominik Schürmann2015-04-131-4/+5
| * Buffer ascii armored encryption/signaturesDominik Schürmann2015-04-132-3/+4
| * Merge pull request #1193 from adithyaphilip/auto-refresh-contactsDominik Schürmann2015-04-133-39/+119
| |\
| | * hide linked system contact card if no contact presentAdithya Abraham Philip2015-04-083-12/+25
| | * linked system contact auto-refresh added, fixed contact image issueAdithya Abraham Philip2015-04-082-38/+105
| * | IMplement CryptoInputParcelCacheServiceDominik Schürmann2015-04-137-100/+325
| * | Clearer var namingDominik Schürmann2015-04-121-8/+8
| * | More simplifications to PassphraseCacheServiceDominik Schürmann2015-04-121-27/+21
| * | Simplify PassphraseCacheServiceDominik Schürmann2015-04-121-16/+12
| * | Remove html-textview reference from settings.gradleDominik Schürmann2015-04-121-1/+0
| * | Switch to html-textview from JCenterDominik Schürmann2015-04-123-6/+2
| * | Update api libDominik Schürmann2015-04-101-0/+0
| * | Cache CryptoInputParcel in OpenPgpServiceDominik Schürmann2015-04-104-24/+69
| * | Remove unused AlgorithmNamesDominik Schürmann2015-04-101-93/+0
| * | Add license headersDominik Schürmann2015-04-103-0/+51
| * | Externalize Parcelable cachingDominik Schürmann2015-04-102-59/+106
| * | Fix signing subkey selection in remote serviceDominik Schürmann2015-04-072-20/+52
| * | Fix nullpointer with Intent API, fix clearing of encrypt file list, notify wh...Dominik Schürmann2015-04-042-6/+7
| * | fix PgpEncryptDecryptTest for CryptoInputParcelVincent Breitmoser2015-04-011-26/+22
| * | fix Decrypt*Fragment for RequiredInputParcel (except decryptOriginalFilename)Vincent Breitmoser2015-04-0115-276/+150
| * | Prepare decrypt UI for input parcelDominik Schürmann2015-03-313-129/+79
| * | Rename advanced to extendedDominik Schürmann2015-03-311-7/+7
| * | Better check if file is already addedDominik Schürmann2015-03-311-19/+42
| * | Merge branch 'v/crypto-input-parcel' of github.com:open-keychain/open-keychai...Dominik Schürmann2015-03-314-12/+50
| |\ \
| | * | work on passphrase data flowVincent Breitmoser2015-03-314-12/+50
| * | | From passphrase to passwordDominik Schürmann2015-03-311-47/+47
| * | | Simplify passphrase dialog designDominik Schürmann2015-03-313-4/+4
| |/ /
| * | update OpenPgpApi, re-add EXTRA_PASSPHRASEVincent Breitmoser2015-03-302-0/+13
| * | Merge branch 'v/crypto-input-parcel' of github.com:open-keychain/open-keychai...Vincent Breitmoser2015-03-309-183/+392
| |\ \
| | * | Dont show slinger button in spinnerDominik Schürmann2015-03-301-0/+2
| | * | Fix scrollbarDominik Schürmann2015-03-301-0/+1
| | * | Use RecyclerView in EncryptFilesFragmentDominik Schürmann2015-03-308-184/+390
| * | | remove unused NfcActivityVincent Breitmoser2015-03-303-580/+5