aboutsummaryrefslogtreecommitdiffstats
path: root/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui
Commit message (Expand)AuthorAgeFilesLines
* Spacing correctionsThialfihar2014-04-021-3/+2
* Add missing and curly brackets and fix othersThialfihar2014-04-025-50/+47
* Rearrange too long linesThialfihar2014-04-0216-48/+87
* Adjust variable/member naming to conform to style guideThialfihar2014-04-029-70/+73
* Trivial spacing changes to conform to style guideThialfihar2014-04-0218-57/+56
* Adjust copyright headersThialfihar2014-04-022-2/+2
* Adjust import orderThialfihar2014-04-0211-49/+24
* always askAshley Hughes2014-04-021-1/+1
* confirm that empty IDs are really wantedAshley Hughes2014-04-021-1/+46
* allow blank IDs, allow adding new IDs and let them be masterAshley Hughes2014-04-021-2/+5
* pass through info that keys are new without relying on new keys orginally bei...Ashley Hughes2014-04-013-0/+13
* Menu cleanupDominik Schürmann2014-04-011-4/+5
* Dont show encrypted data before decryption from clipboardDominik Schürmann2014-04-011-7/+14
* CleanupDominik Schürmann2014-04-012-79/+55
* Automatically select newly created key in api accountsDominik Schürmann2014-04-012-16/+19
* Fully qualified importsDominik Schürmann2014-04-011-0/+3
* Remove DECRYPT_ASSUME_SYMMETRICDominik Schürmann2014-04-012-6/+0
* Fix symmetric decryptionDominik Schürmann2014-04-012-0/+6
* Fix pre-selection for encryptDominik Schürmann2014-04-011-4/+2
* Fix layoutsDominik Schürmann2014-04-011-0/+1
* Simplify encrypt and sign backendDominik Schürmann2014-04-012-17/+5
* Fix symmetric encryption and cleanupDominik Schürmann2014-04-016-124/+77
* Merge branch 'master' of github.com:openpgp-keychain/openpgp-keychainDominik Schürmann2014-04-012-21/+20
|\
| * don't disable save button, show message if nothing needs to be doneAshley Hughes2014-04-011-3/+4
| * change how new default keys are passed back, fix showing their usage flagsAshley Hughes2014-03-312-20/+18
* | Experimental work on a fragment-based encrypt activityDominik Schürmann2014-04-0110-857/+1265
|/
* Include signature result in fragmentsDominik Schürmann2014-03-305-245/+204
* Decrypt mostly works againDominik Schürmann2014-03-304-541/+214
* compiles againDominik Schürmann2014-03-302-7/+9
* More experimental work on decrypt fragmentsDominik Schürmann2014-03-305-333/+582
* Experiments with fragments in decrypt activityDominik Schürmann2014-03-305-155/+421
* Merge pull request #491 from openpgp-keychain/edit-keyDominik Schürmann2014-03-307-239/+599
|\
| * merge masterAshley Hughes2014-03-2963-2339/+2823
| |\
| * | pass through original primary IDAshley Hughes2014-03-273-0/+21
| * | keep up with masterAshley Hughes2014-03-0725-364/+939
| |\ \
| * | | use parcel to save keys, but saving existing keys is disabled, pending a rewr...Ashley Hughes2014-03-061-29/+17
| * | | fix saving new key (tmp)Ashley Hughes2014-03-061-1/+4
| * | | pass through which keys are newAshley Hughes2014-02-223-0/+19
| * | | change how primary id changing is passed throughAshley Hughes2014-02-223-1/+21
| * | | master mergeAshley Hughes2014-02-2227-858/+1062
| |\ \ \
| * | | | put main original id at the topAshley Hughes2014-02-211-1/+4
| * | | | pass through deleted keysAshley Hughes2014-02-152-2/+16
| * | | | propgate throughAshley Hughes2014-02-143-10/+33
| * | | | save work, this code doesn't work...Ashley Hughes2014-02-132-0/+34
| * | | | saving fixesAshley Hughes2014-02-083-23/+33
| * | | | some AS Inspect Code fixesAshley Hughes2014-02-081-18/+15
| * | | | consistent uiAshley Hughes2014-02-081-10/+7
| * | | | keep track of brand new keys, they need savingAshley Hughes2014-02-081-1/+4
| * | | | fix create keyring crashAshley Hughes2014-02-081-6/+10
| * | | | disable export if unsavedAshley Hughes2014-02-081-2/+6