aboutsummaryrefslogtreecommitdiffstats
path: root/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/ViewKeyActivity.java
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'master' into certsVincent Breitmoser2014-03-151-4/+4
|\
| * final ui code style changesuberspot2014-03-131-1/+1
| * More code style fixes for /uiuberspot2014-03-131-1/+2
| * First code style changes in uiuberspot2014-03-131-2/+1
* | Merge branch 'master' into certsVincent Breitmoser2014-03-121-5/+5
|\|
| * Merge branch 'unified-keylist'Vincent Breitmoser2014-03-121-2/+9
| |\
| * | Add export... button and functionality in multi-selectuberspot2014-03-111-2/+1
| * | Make export work with rowIds instead of MasterKeyIdsuberspot2014-03-111-1/+2
| * | use parameter in updateFromKeyserverDominik Schürmann2014-03-081-1/+1
| * | removed useless semicolons, fixed some parameters in documenation, simplified...uberspot2014-03-071-2/+2
* | | experimental cert list, properVincent Breitmoser2014-03-111-8/+6
| |/ |/|
* | move some placeholders into resourcesVincent Breitmoser2014-03-081-1/+1
* | Normalize public key uri in KeyListFragmentVincent Breitmoser2014-03-081-1/+8
|/
* rework key view into fragments to later add certificationsDominik Schürmann2014-02-091-287/+45
* language fixesDominik Schürmann2014-02-081-1/+3
* do not delete pub keys where secret key existsDominik Schürmann2014-02-061-12/+24
* keyserver instead of key serverDominik Schürmann2014-02-051-1/+1
* work on lookup key, fix some illegal state exceptions with hackDominik Schürmann2014-02-041-2/+4
* Certify not sign a key, added as button, does not belong to menuDominik Schürmann2014-02-041-18/+27
* expose key server APIDominik Schürmann2014-02-021-1/+1
* Switch from ActionBarSherlock to ActionBarCompatDominik Schürmann2014-02-021-5/+5
* Fix QR Code URIDominik Schürmann2014-02-011-1/+1
* Reworking import, testing needed...Dominik Schürmann2014-02-011-3/+3
* rename KeyServerUploadActivity to UploadKeyActivityDominik Schürmann2014-02-011-1/+1
* Started working on integration of keyserver query into import activityDominik Schürmann2014-02-011-2/+2
* No bouncy castle objects in key viewDominik Schürmann2014-02-011-26/+15
* Fix and simplify user id parsingDominik Schürmann2014-01-311-1/+1
* language fixDominik Schürmann2014-01-291-3/+2
* show unknown in ViewKey if user id is not setDominik Schürmann2014-01-291-2/+7
* Give expiry dates to PgpKeyOperationDominik Schürmann2014-01-291-3/+3
* Use intent data instead of IDs for upload and sign, fixes #205Dominik Schürmann2014-01-291-16/+2
* save keyring in-place, fixes #228, #203Dominik Schürmann2014-01-291-155/+160
* New Gradle project structureDominik Schürmann2014-01-271-0/+484