aboutsummaryrefslogtreecommitdiffstats
path: root/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/ViewKeyMainFragment.java
Commit message (Expand)AuthorAgeFilesLines
* Adjust import orderThialfihar2014-04-021-1/+0
* Simplify can encrypt checkDominik Schürmann2014-03-261-19/+24
* Merge pull request #471 from sreeram-boyapati/encryptionDominik Schürmann2014-03-261-1/+11
|\
| * Added can_encrypt checkSreeram Boyapati2014-03-231-1/+11
* | Fix fingerprint handlingDominik Schürmann2014-03-201-1/+1
* | put colorize method into key helperDominik Schürmann2014-03-201-1/+1
|/
* revert ca_necrypt patchDominik Schürmann2014-03-181-4/+0
* Merge pull request #434 from honnel/revocation-statusDominik Schürmann2014-03-181-5/+6
|\
| * Show revocation status in SelectPublicKeyFragment #375Daniel Hammann2014-03-181-5/+6
* | Merge pull request #437 from sreeram-boyapati/encryptDominik Schürmann2014-03-181-1/+4
|\ \
| * | Code Style fixSreeram Boyapati2014-03-181-2/+2
| * | Can_Encrypt Check added to hide ButtonSreeram Boyapati2014-03-181-1/+4
| |/
* | certify: viewkeyuseridsadapter cosmetics and checkbox capabilityVincent Breitmoser2014-03-151-6/+7
* | certify: add certify action button to viewkeymainfragmentVincent Breitmoser2014-03-151-0/+21
* | move fingerprint coloring into helperVincent Breitmoser2014-03-151-61/+1
|/
* More code style fixes for /uiuberspot2014-03-131-13/+24
* First code style changes in uiuberspot2014-03-131-10/+5
* Merge pull request #407 from uberspot/masterDominik Schürmann2014-03-131-15/+31
|\
| * add apg's change to colorizing, no more background changes neededuberspot2014-03-131-15/+31
* | Merge remote-tracking branch 'origin/master'Vincent Breitmoser2014-03-131-12/+38
|\|
| * change colorizing of fingerprint to use SHA1 based on apg's commit 67ffc24526uberspot2014-03-121-12/+38
* | Merge branch 'unified-keylist'Vincent Breitmoser2014-03-121-0/+29
|\ \ | |/ |/|
| * add edit button and secret key info to public key viewVincent Breitmoser2014-03-081-0/+30
* | minor clean up in colorize methoduberspot2014-03-111-2/+3
* | remove unneeded replace for newline on fingerprintDominik Schürmann2014-03-091-2/+1
* | Colorize fingerprintuberspot2014-03-091-3/+25
* | Fix key id and fingerprint handling, use full key idsDominik Schürmann2014-03-091-1/+1
|/
* rework key view into fragments to later add certificationsDominik Schürmann2014-02-091-0/+313