aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* 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
* | | fix Encrypt* with RequiredInputParcelVincent Breitmoser2015-03-3021-560/+185
* | | pass CryptoInputParcel independently for SignEncryptOperationVincent Breitmoser2015-03-3010-90/+35
|/ /
* | Add TokenAutoComplete and StickyListHeaders as maven dependencies instead of ...Dominik Schürmann2015-03-304-12/+4
* | Merge branch 'development' into v/crypto-input-parcelDominik Schürmann2015-03-307-405/+423
|\|
| * rewrite EncryptKeyCompletionView with generalized KeyAdapterVincent Breitmoser2015-03-307-405/+423
* | Fix strings with email addressDominik Schürmann2015-03-291-2/+2
* | Merge branch 'development' into v/crypto-input-parcelDominik Schürmann2015-03-293-14/+42
|\|
| * Merge pull request #1188 from adithyaphilip/import-message-errorDominik Schürmann2015-03-281-2/+5
| |\
| | * changed style to WARN, corrected error messageAdithya Abraham Philip2015-03-281-2/+5
| * | Merge pull request #1187 from Hiperzone/developmentDominik Schürmann2015-03-282-12/+37
| |\ \ | | |/ | |/|
| | * -Fixed a situation where additional emails could be duplicated when creating ...Daniel Ramos2015-03-272-12/+37
| |/
* | Fixing crashes with new encrypt uiDominik Schürmann2015-03-298-43/+70