aboutsummaryrefslogtreecommitdiffstats
path: root/OpenPGP-Keychain/src/main
Commit message (Expand)AuthorAgeFilesLines
...
| * | | Merge branch 'master' of github.com:openpgp-keychain/openpgp-keychainDominik Schürmann2014-03-036-11/+17
| |\ \ \
| | * | | Fix NewApi Lint ErrorsEmantor2014-03-033-3/+8
| | * | | Fix DefaultLocale Lint WarningsEmantor2014-03-031-3/+4
| | * | | Fix ScrollViewSize Lint WarningsEmantor2014-03-033-6/+6
| * | | | change ordering in Intent descriptions for better readability in small dialogsDominik Schürmann2014-03-031-4/+4
| |/ / /
| * | | version code 23101 for beta testingDominik Schürmann2014-03-021-1/+1
| * | | version code 23101 for beta testingDominik Schürmann2014-03-021-1/+1
| * | | Update from transifexDominik Schürmann2014-03-0239-276/+626
| * | | API changesDominik Schürmann2014-03-023-160/+132
| |/ /
| * | Merge pull request #306 from danielhass/keyserver-conerrorDominik Schürmann2014-02-285-27/+102
| |\ \
| | * | Some clean upDaniel Haß2014-02-281-4/+2
| | * | Added different notifys for different exceptionsDaniel Haß2014-02-271-6/+17
| | * | Added error strings for key import from keyserverDaniel Haß2014-02-271-0/+3
| | * | Added StackOverflow link to documentationDaniel Haß2014-02-271-0/+2
| | * | Added documentation to the AsyncTaskResultWrapperDaniel Haß2014-02-271-0/+5
| | * | Adapted the ImportKeysLoader to work with the new AsyncWrapperDaniel Haß2014-02-263-9/+13
| | * | Reworked ImportKeysListFragment to handel exceptions, ImportKeyListLoader is ...Daniel Haß2014-02-262-20/+34
| | * | Added the AsyncTaskResultWrapperDaniel Haß2014-02-261-0/+38
| * | | cleanupDominik Schürmann2014-02-274-40/+22
| * | | Added GPL headersNikhil Peter Raj2014-02-272-11/+31
| * | | Complete fix for #304Nikhil Peter Raj2014-02-272-94/+170
| * | | Partial fix for #304Nikhil Peter Raj2014-02-262-32/+82
| |/ /
| * | Final fix for #266Nikhil Peter Raj2014-02-262-2/+2
| * | Removed Thumbs.db,added to gitignoreNikhil Peter Raj2014-02-254-0/+0
| * | Fix for #266Nikhil Peter Raj2014-02-2510-2/+3
| |/
| * Replaced Toast with AppMsg in DecryptActivityDaniel Haß2014-02-241-16/+17
| * cleanupDominik Schürmann2014-02-241-57/+7
| * fix signature passing and verify in demoDominik Schürmann2014-02-241-5/+6
| * remove debug stuffDaniel Haß2014-02-231-2/+1
| * Revert "Replaced Toast with AppMsg in EncryptActivity"Daniel Haß2014-02-231-13/+15
| * Replaced Toast with AppMsg in EncryptActivityDaniel Haß2014-02-231-15/+13
| * Replaced Toast with AppMsg in EncryptActivityDaniel Haß2014-02-231-13/+15
| * Update help_start.htmlDominik Schürmann2014-02-231-1/+1
* | use parcel to save keys, but saving existing keys is disabled, pending a rewr...Ashley Hughes2014-03-064-78/+49
* | fix saving new key (tmp)Ashley Hughes2014-03-063-3/+13
* | a method, if not the best one, for each propertyAshley Hughes2014-03-061-2/+6
* | begin adding parcel for save intentAshley Hughes2014-03-022-3/+97
* | pass through which keys are newAshley Hughes2014-02-225-3/+29
* | remove deleted keysAshley Hughes2014-02-221-0/+4
* | first go at saving IDs correctlyAshley Hughes2014-02-221-14/+64
* | change how primary id changing is passed throughAshley Hughes2014-02-225-5/+28
* | master mergeAshley Hughes2014-02-22159-4828/+5427
|\|
| * AndroidManfiest code for later...Dominik Schürmann2014-02-212-3/+23
| * import key from email app directlyDominik Schürmann2014-02-211-25/+37
| * precompile user id patternDominik Schürmann2014-02-211-2/+3
| * renameDominik Schürmann2014-02-212-7/+7
| * internal renaming, cleanupDominik Schürmann2014-02-215-36/+50
| * verification of cleartext signatures worksDominik Schürmann2014-02-215-49/+106
| * rename to OpenKeychainDominik Schürmann2014-02-212-8/+8
| * Merge pull request #282 from danielhass/masterDominik Schürmann2014-02-202-6/+7
| |\