aboutsummaryrefslogtreecommitdiffstats
path: root/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'development' into linked-identitiesVincent Breitmoser2015-04-0924-135/+404
|\
| * rewrite EncryptKeyCompletionView with generalized KeyAdapterVincent Breitmoser2015-03-304-392/+400
| * -Fixed a situation where additional emails could be duplicated when creating ...Daniel Ramos2015-03-271-12/+36
| * Modify break as return.iseki2015-03-261-1/+1
| * Add brackets for if-else constructs and externalize the procedure as showMult...iseki2015-03-261-26/+33
| * Add a loop for multiple key export.iseki2015-03-251-13/+68
| * Pull from transifexDominik Schürmann2015-03-233-10/+10
| * Merge pull request #1166 from adithyaphilip/multi-threadedDominik Schürmann2015-03-2316-84/+239
| |\
| | * shifted multi-threading to own serviceAdithya Abraham Philip2015-03-2316-98/+165
| | * introduced multi-threadingAdithya Abraham Philip2015-03-231-0/+88
| * | Merge pull request #1174 from Jesperbk/developmentDominik Schürmann2015-03-231-1/+3
| |\ \ | | |/ | |/|
| | * Fixed issue where setting a passphrase to null later causes a NullPointerExce...JesperBK2015-03-231-1/+3
| * | Merge branch 'development' of github.com:open-keychain/open-keychain into dev...Dominik Schürmann2015-03-231-14/+23
| |\ \
| * | | Use markdown for in-app helpDominik Schürmann2015-03-233-17/+41
| | |/ | |/|
* | | rewrite EncryptKeyCompletionView with generalized KeyAdapterVincent Breitmoser2015-03-304-393/+400
* | | even more linked id ui workVincent Breitmoser2015-03-295-28/+29
* | | more (subtle) ui workVincent Breitmoser2015-03-262-9/+38
* | | more linked id ui fine tuningVincent Breitmoser2015-03-261-0/+2
* | | some linked id ui fine tuningVincent Breitmoser2015-03-261-23/+30
* | | secret/public distinction in LinkedIdViewVincent Breitmoser2015-03-241-5/+5
* | | work on cookie scanning during creationVincent Breitmoser2015-03-246-13/+25
* | | Merge branch 'development' into linked-identitiesVincent Breitmoser2015-03-2450-786/+827
|\ \ \ | | |/ | |/|
| * | use top line in snackbar for status indicationVincent Breitmoser2015-03-221-14/+23
| |/
| * Added docs for Notify classManoj Khanna2015-03-201-0/+10
| * Fixed Snackbar behind keyboard on ImportKeysActivityManoj Khanna2015-03-201-4/+9
| * Reworked Notify classManoj Khanna2015-03-2017-173/+130
| * Merge pull request #1163 from kentnek/dev-list-footerDominik Schürmann2015-03-201-2/+17
| |\
| | * - Added footer so that the Floating Action Button won't block the last few it...Kent2015-03-201-2/+17
| * | Implemented #1162: Invoke NFC in Advanced ViewKent2015-03-202-154/+36
| |/
| * Remove on click on iconDominik Schürmann2015-03-191-0/+2
| * Merge branch 'development' of github.com:open-keychain/open-keychain into dev...Dominik Schürmann2015-03-192-45/+81
| |\
| | * Fix for Issue #1114Manoj Khanna2015-03-191-5/+30
| | * Fixed a crash on ViewKeyActivityManoj Khanna2015-03-191-40/+51
| * | Manage my keys wizardDominik Schürmann2015-03-1911-263/+323
| |/
| * New Passphrase class for safer passphrase handling in memoryDominik Schürmann2015-03-1917-65/+81
| * File extensions into ConstantsDominik Schürmann2015-03-174-13/+15
| * Allow for hidden recipients in encrypt methodsDominik Schürmann2015-03-163-8/+36
| * Allow encrypt of filenames via overflow menuDominik Schürmann2015-03-164-6/+27
| * object oriented split user idDominik Schürmann2015-03-1620-88/+84
| * Fix nullpointer when scanning malformed qr codesDominik Schürmann2015-03-161-1/+1
| * Clarify MIME usageDominik Schürmann2015-03-152-2/+2
* | support github resource (re)Vincent Breitmoser2015-03-243-0/+252
* | work on certification uiVincent Breitmoser2015-03-152-12/+20
* | Merge branch 'development' into linked-identitiesVincent Breitmoser2015-03-1529-143/+316
|\|
| * Remove display of key id in other listsDominik Schürmann2015-03-153-18/+65
| * Show main user id instead of key in certify screenDominik Schürmann2015-03-151-10/+15
| * Fixes for selection of certify keyDominik Schürmann2015-03-152-10/+21
| * Merge pull request #1142 from tdjogi010/developmentDominik Schürmann2015-03-151-4/+10
| |\
| | * Preselected Suitable Keytdjogi010@gmail.com2015-03-131-4/+10
| * | Merge pull request #1147 from Hiperzone/developmentDominik Schürmann2015-03-151-1/+3
| |\ \