aboutsummaryrefslogtreecommitdiffstats
path: root/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'new-edit'Vincent Breitmoser2014-06-182-10/+7
|\
| * new-edit: remove old save keyring stuffVincent Breitmoser2014-06-172-10/+7
* | Merge branch 'master' of github.com:open-keychain/open-keychainDominik Schürmann2014-06-181-0/+13
|\|
| * add more progress info from import routineVincent Breitmoser2014-06-161-0/+13
* | Redesign Import, still some todos and regression bugsDominik Schürmann2014-06-1810-322/+227
|/
* Moved Notify class to utilsDaniel Haß2014-06-162-71/+1
* Removed unused importDaniel Haß2014-06-161-1/+0
* Replaced AppMsg with notify wrapper callDaniel Haß2014-06-161-1/+4
* Added notification wrapper for toast like notifysDaniel Haß2014-06-161-0/+70
* Merge remote-tracking branch 'origin/master' into canonicalizeVincent Breitmoser2014-06-137-31/+643
|\
| * Merge pull request #649 from mar-v-in/automatic-contact-discoveryDominik Schürmann2014-06-062-4/+15
| |\
| | * Merge branch 'master' into automatic-contact-discoverymar-v-in2014-06-0522-72/+44
| | |\
| | * | Show keys with android contactsmar-v-in2014-06-051-1/+12
| | * | Make keylist case insensitivemar-v-in2014-06-051-3/+3
| * | | Move SlidingTabLayout and SlidingTabStrip into appropriate subpackageDominik Schürmann2014-06-064-2/+531
| * | | Hide subkeys, certs tabs in key view, checkable menu item to show/hide themDominik Schürmann2014-06-062-10/+87
| | |/ | |/|
| * | Clean up keyimport.ImportKeysListEntryTim Bray2014-06-051-9/+8
| * | Merge pull request #645 from timbray/masterDominik Schürmann2014-06-051-6/+2
| |\ \
| | * | Don't show full fingerprint in key search resultsTim Bray2014-06-051-6/+2
| | * | fixed error messageTim Bray2014-06-041-3/+1
| | |/
* | | canonicalize: more stuffVincent Breitmoser2014-06-121-0/+2
* | | import-log: properly distinguish return statesVincent Breitmoser2014-06-121-3/+3
* | | import-log: use holder pattern in log fragmentVincent Breitmoser2014-06-111-16/+24
* | | import-log: work on log fragment uiVincent Breitmoser2014-06-102-14/+98
* | | import-log: switch to flags instead of statuses for result intVincent Breitmoser2014-06-101-46/+45
* | | import-log: more interface workVincent Breitmoser2014-06-102-17/+20
* | | import-log: some cosmeticsVincent Breitmoser2014-06-102-2/+3
* | | import-log: add LogDisplay activityVincent Breitmoser2014-06-103-4/+107
* | | import-log: use supertoast in ImportKeyActivityVincent Breitmoser2014-06-101-26/+87
|/ /
* | ui: do show Certify identities button even for secret keysVincent Breitmoser2014-06-041-8/+0
* | neatness refactoringVincent Breitmoser2014-06-0421-49/+34
|/
* Merge remote-tracking branch 'origin/master' into edit-key-rewriteVincent Breitmoser2014-06-023-29/+15
|\
| * Finished cleaning up rebase conflicts post Keyserver exception refactorTim Bray2014-05-233-9/+9
| * Add Log.d for QueryFailedExceptionTim Bray2014-05-231-0/+2
| * Add Log.d for QueryFailedExceptionTim Bray2014-05-233-25/+9
* | wrapped-key-ring: move key data around in ParcelableKeyRing instead of Import...Vincent Breitmoser2014-06-024-15/+36
* | new savekeyring operation (mostly stub)Vincent Breitmoser2014-05-272-1/+5
* | rename SaveKeyringParcel to OldSaveKeyringParcelVincent Breitmoser2014-05-271-2/+2
* | introduce WrappedSignature for the ViewCert* ui codeVincent Breitmoser2014-05-232-31/+25
* | wrapped-key-ring: use UncachedKeyRing in ImportKeysListLoaderVincent Breitmoser2014-05-231-28/+8
* | wrapped-key-ring: encapsulate key flagsVincent Breitmoser2014-05-222-18/+20
* | Merge remote-tracking branch 'origin/master' into wrapped-key-ringVincent Breitmoser2014-05-218-115/+88
|\|
| * Merge highlight keyserver pull requestDominik Schürmann2014-05-185-89/+58
| |\
| | * Rename mCurQuery to mQuery for consistencyThialfihar2014-05-161-5/+5
| | * Use Highlighter instead of HighlightQueryCursorAdapterThialfihar2014-05-163-79/+28
| | * Add highlighting to keyserver/keybase searchThialfihar2014-05-161-3/+5
| | * Support mutliple search words and highlight themThialfihar2014-05-163-6/+24
| * | Rename KeyServer to KeyserverDominik Schürmann2014-05-184-22/+21
| |/
| * Rename fingerPrint to fingerprintThialfihar2014-05-142-3/+3
| * Don't guess keybase key algorithm and sizeThialfihar2014-05-141-1/+6
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-30 03:09:52 +0000