aboutsummaryrefslogtreecommitdiffstats
path: root/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/adapter
Commit message (Expand)AuthorAgeFilesLines
* Rename folder structure from OpenPGP Keychain to OpenKeychainDominik Schürmann2014-04-0612-1661/+0
* certs: fix CertifyKeyActivity and improve user id listVincent Breitmoser2014-04-061-8/+17
* certs: display uid status in uid listVincent Breitmoser2014-04-061-10/+20
* certs: various improvementsVincent Breitmoser2014-04-051-4/+5
* certs: more fixes, almost working nowVincent Breitmoser2014-04-051-4/+6
* Merge remote-tracking branch 'origin/master' into certsVincent Breitmoser2014-04-059-89/+322
|\
| * Merge branch 'db-overhaul' of git://github.com/Valodim/openpgp-keychain into ...Dominik Schürmann2014-04-031-3/+3
| |\
| | * Merge remote-tracking branch 'origin/master' into db-overhaulVincent Breitmoser2014-04-037-29/+30
| | |\
| | * | Break a lot of stuff. Also, database redesign.Vincent Breitmoser2014-04-031-3/+3
| * | | Implement ACTION_IMPORT_KEY_FROM_KEYSERVER_AND_RETURNDominik Schürmann2014-04-031-3/+25
| | |/ | |/|
| * | Replace wildcard imports with explicit importsThialfihar2014-04-021-1/+5
| * | Rearrange too long linesThialfihar2014-04-021-1/+3
| * | Adjust variable/member naming to conform to style guideThialfihar2014-04-025-13/+13
| * | Trivial spacing changes to conform to style guideThialfihar2014-04-022-8/+9
| * | Adjust import orderThialfihar2014-04-023-6/+0
| |/
| * Decrypt mostly works againDominik Schürmann2014-03-301-2/+2
| * Experiments with fragments in decrypt activityDominik Schürmann2014-03-302-6/+80
| * fix capability icons and remove red text for revoked keysuberspot2014-03-261-4/+0
| * add strike through text for revoked or expired keys and disable views for rev...uberspot2014-03-261-4/+19
| * Display expiry of subkeys in single key view.Alexander Sulfrian2014-03-251-0/+22
| * Fix fingerprint handlingDominik Schürmann2014-03-201-1/+1
| * put colorize method into key helperDominik Schürmann2014-03-201-1/+1
| * 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-192-2/+2
| * Merge pull request #434 from honnel/revocation-statusDominik Schürmann2014-03-181-1/+12
| |\
| | * Show revocation status in SelectPublicKeyFragment #375Daniel Hammann2014-03-181-1/+12
| * | 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
| | |/
* | | certs: more filters, better initial uid selection, code cosmeticsVincent Breitmoser2014-03-171-3/+6
* | | certs: green dots for verified status \o/Vincent Breitmoser2014-03-151-2/+10
* | | Merge branch 'certify' into certsVincent Breitmoser2014-03-151-6/+75
|\| |
| * | certify: viewkeyuseridsadapter cosmetics and checkbox capabilityVincent Breitmoser2014-03-151-6/+75
| |/
* | Merge branch 'master' into certsVincent Breitmoser2014-03-1511-145/+158
|\|
| * Fix two bugs in ImportKeys screen (issue #416)uberspot2014-03-142-0/+2
| * more code style changes in /ui and /utiluberspot2014-03-138-91/+111
| * First code style changes in uiuberspot2014-03-1310-54/+45
* | Merge branch 'master' into certsVincent Breitmoser2014-03-126-37/+151
|\|
| * Merge branch 'unified-keylist'Vincent Breitmoser2014-03-122-350/+0
| |\
| * | fix plenty of lint warnings, make some for loops into foreach, remove unused ...uberspot2014-03-112-3/+0
| * | Merge pull request #383 from sreeram-boyapati/masterDominik Schürmann2014-03-101-26/+39
| |\ \
| | * | ViewHolder Pattern ImplementedSreeram Boyapati2014-03-101-26/+39
| * | | Make code more tidy for multiselectDominik Schürmann2014-03-102-19/+1
| * | | Improve hightlight query code: make cursor abstract, tidy up codeDominik Schürmann2014-03-104-55/+51
| * | | Merge pull request #384 from mb-14/search1Dominik Schürmann2014-03-103-7/+77
| |\ \ \
| | * \ \ Merge remote-tracking branch 'upstream/master' into search1Miroojin Bakshi2014-03-101-0/+3
| | |\ \ \
| | * | | | Create custom HighlightQueryCursorAdapterMiroojin Bakshi2014-03-103-68/+70