aboutsummaryrefslogtreecommitdiffstats
path: root/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui
Commit message (Expand)AuthorAgeFilesLines
* Fix GPL HeadersNikhil Peter Raj2014-03-212-2/+2
* Fix for #410Nikhil Peter Raj2014-03-214-133/+129
* put colorize method into key helperDominik Schürmann2014-03-203-3/+3
* colorize fingerprint in importDominik Schürmann2014-03-201-1/+3
* Use getter and setterDominik Schürmann2014-03-202-28/+94
* Dont try to parse key/fingerprint result from keyserver queryDominik Schürmann2014-03-202-23/+26
* Fix key list views in main key viewThialfihar2014-03-201-1/+11
* add apg's fix for Key id displayuberspot2014-03-194-4/+4
* Merge branch 'master' of github.com:openpgp-keychain/openpgp-keychainDominik Schürmann2014-03-191-16/+23
|\
| * Merge pull request #445 from gogowitczak/rwrsa-branchDominik Schürmann2014-03-191-16/+23
| |\
| | * Blocked ok button for generating weak (<1024) RSA key.gogowitczak2014-03-181-16/+23
* | | CleanupDominik Schürmann2014-03-191-2/+1
|/ /
* | Cleanup SelectSecretKeyActivity and also return UriDominik Schürmann2014-03-182-75/+26
* | CertifyKeyActivity sets error if no key is selecteduberspot2014-03-181-2/+2
* | revert ca_necrypt patchDominik Schürmann2014-03-181-4/+0
|/
* Merge pull request #434 from honnel/revocation-statusDominik Schürmann2014-03-182-6/+18
|\
| * Show revocation status in SelectPublicKeyFragment #375Daniel Hammann2014-03-182-6/+18
* | 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
| |/
* | Merge pull request #435 from sreeram-boyapati/change_passphraseDominik Schürmann2014-03-181-3/+5
|\ \
| * | Button Text changes to Change Passphrase if Passphrase is setSreeram Boyapati2014-03-181-3/+5
| |/
* | Merge pull request #424 from gogowitczak/mro-branchDominik Schürmann2014-03-181-15/+27
|\ \
| * | Fixed coding style.gogowitczak2014-03-181-26/+23
| * | Keyserver query now uses machine readable output for search and get. Added se...gogowitczak2014-03-151-15/+30
| |/
* | Merge pull request #430 from Valodim/certifyDominik Schürmann2014-03-184-79/+220
|\ \
| * | certify: sign individual UIDsVincent Breitmoser2014-03-151-6/+13
| * | certify: revamp certifykeyactivityVincent Breitmoser2014-03-151-1/+96
| * | certify: viewkeyuseridsadapter cosmetics and checkbox capabilityVincent Breitmoser2014-03-152-12/+82
| * | certify: selectsecretkeyfragment cosmeticsVincent Breitmoser2014-03-151-3/+10
| * | certify: add certify action button to viewkeymainfragmentVincent Breitmoser2014-03-151-0/+21
| * | move fingerprint coloring into helperVincent Breitmoser2014-03-152-61/+2
| |/
* | make loading of drawer items a bit more dynamicuberspot2014-03-172-19/+14
* | Lock drawer as open in tabletsuberspot2014-03-162-25/+64
* | Fix export for new unified key list #409uberspot2014-03-154-11/+25
|/
* Fix two bugs in ImportKeys screen (issue #416)uberspot2014-03-142-0/+2
* Make email address less restrictive and add icon to show when it's correctuberspot2014-03-142-11/+28
* final ui code style changesuberspot2014-03-137-23/+23
* more code style changes in /ui and /utiluberspot2014-03-1313-99/+121
* more UI code style fixesuberspot2014-03-139-70/+77
* More code style fixes for /uiuberspot2014-03-1316-53/+91
* First code style changes in uiuberspot2014-03-1356-634/+486
* 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
* | Add FAQ tab to helpDominik Schürmann2014-03-131-8/+11
* | Readd create key menu itemsDominik Schürmann2014-03-131-12/+38
* | Cleanup and simplificationDominik Schürmann2014-03-131-60/+23
* | Merge remote-tracking branch 'origin/master'Vincent Breitmoser2014-03-132-12/+40
|\|
| * Merge pull request #396 from bhargavgolla/Lint-error-fixDominik Schürmann2014-03-121-0/+2
| |\
| | * Merge remote-tracking branch 'upstream/master' into Lint-error-fixBhargav Golla2014-03-1012-162/+236
| | |\