aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
* | Merge branch 'master' of github.com:openpgp-keychain/openpgp-keychainDominik Schürmann2014-04-019-117/+347
|\ \
| * \ Merge pull request #501 from Valodim/masterDominik Schürmann2014-04-019-117/+347
| |\ \ | | | | | | | | factor out android dependencies from PgpKeyOperation, and add JUnit/Robolectric testing stubs
| | * | test: add junit+robolectric to buildfiles and stub test fileVincent Breitmoser2014-04-014-1/+112
| | | |
| | * | PgpKeyOperation: factor out all android dependenciesVincent Breitmoser2014-04-015-116/+235
| |/ / | | | | | | | | | | | | | | | Conflicts: OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/pgp/PgpKeyOperation.java OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/service/KeychainIntentService.java
* / / default to allow symmetric decryptionDominik Schürmann2014-04-011-1/+1
|/ /
* | Fix symmetric decryptionDominik Schürmann2014-04-015-117/+117
| |
* | Fix pre-selection for encryptDominik Schürmann2014-04-011-4/+2
| |
* | languageDominik Schürmann2014-04-011-2/+2
| |
* | More layout fixesDominik Schürmann2014-04-011-56/+62
| |
* | More layout fixesDominik Schürmann2014-04-012-97/+108
| |
* | Language clarificationsDominik Schürmann2014-04-013-9/+11
| |
* | Fix layoutsDominik Schürmann2014-04-0111-97/+100
| |
* | Simplify encrypt and sign backendDominik Schürmann2014-04-013-115/+59
| |
* | Fix symmetric encryption and cleanupDominik Schürmann2014-04-018-136/+91
| |
* | Merge branch 'master' of github.com:openpgp-keychain/openpgp-keychainDominik Schürmann2014-04-014-26/+40
|\ \
| * | don't disable save button, show message if nothing needs to be doneAshley Hughes2014-04-012-3/+5
| | |
| * | create three keys by defaultAshley Hughes2014-03-311-1/+8
| | |
| * | change how new default keys are passed back, fix showing their usage flagsAshley Hughes2014-03-313-24/+29
| | |
* | | Small layout fix (more to come)Dominik Schürmann2014-04-011-1/+1
| | |
* | | Experimental work on a fragment-based encrypt activityDominik Schürmann2014-04-0115-1176/+1302
| | |
* | | Layouts for new encrypt designDominik Schürmann2014-03-316-12/+263
|/ /
* | Include signature result in fragmentsDominik Schürmann2014-03-308-290/+242
| |
* | Decrypt mostly works againDominik Schürmann2014-03-307-700/+255
| |
* | compiles againDominik Schürmann2014-03-302-7/+9
| |
* | More experimental work on decrypt fragmentsDominik Schürmann2014-03-3014-516/+831
| |
* | Experiments with fragments in decrypt activityDominik Schürmann2014-03-309-251/+603
| |
* | Remove cancel from app menuDominik Schürmann2014-03-302-7/+0
| |
* | Revert "Remove cancel from app menu"Dominik Schürmann2014-03-302-0/+7
| | | | | | | | This reverts commit 3c0b97f280f11d553d93df9bc93ce47098af35d4.
* | Remove cancel from app menuDominik Schürmann2014-03-302-7/+0
| |
* | Remove FLAG_ONE_SHOT from most PIsDominik Schürmann2014-03-302-6/+6
| |
* | Merge branch 'master' of github.com:openpgp-keychain/openpgp-keychainDominik Schürmann2014-03-3016-504/+1279
|\ \
| * \ Merge pull request #491 from openpgp-keychain/edit-keyDominik Schürmann2014-03-3016-504/+1279
| |\ \ | | | | | | | | Edit key changes
| | * | style changesAshley Hughes2014-03-301-27/+26
| | | |
| | * | use save icon, not tickAshley Hughes2014-03-291-1/+1
| | | |
| | * | revert mistakeAshley Hughes2014-03-291-1/+1
| | | |
| | * | merge masterAshley Hughes2014-03-29353-5731/+26503
| | |\ \
| | * | | all editing cases I can think of now workAshley Hughes2014-03-271-1/+1
| | | | |
| | * | | fix for editing master keys and IDs, case of change primary ID and modify ↵Ashley Hughes2014-03-271-3/+29
| | | | | | | | | | | | | | | | | | | | master key props fails
| | * | | pass through original primary IDAshley Hughes2014-03-273-0/+21
| | | | |
| | * | | add original primary ID field to parcelAshley Hughes2014-03-261-0/+3
| | | | |
| | * | | allow master key updates by removing old primary ID certAshley Hughes2014-03-251-0/+8
| | | | |
| | * | | delete IDs needs to update keyring, flag itAshley Hughes2014-03-251-1/+2
| | | | |
| | * | | allow lists to be subkeys or keyringsAshley Hughes2014-03-251-6/+23
| | | | |
| | * | | results of debugging, fix several bugs - more needed though...Ashley Hughes2014-03-251-31/+45
| | | | |
| | * | | comments, slight change to progress barAshley Hughes2014-03-241-6/+10
| | | | |
| | * | | make sure ID info is savedAshley Hughes2014-03-241-3/+10
| | | | |
| | * | | work on savingAshley Hughes2014-03-241-22/+23
| | | | |
| | * | | move stuff around, save workAshley Hughes2014-03-231-59/+61
| | | | |
| | * | | unused importsAshley Hughes2014-03-111-4/+0
| | | | |
| | * | | start modifying save codeAshley Hughes2014-03-101-8/+26
| | | | |
generated by cgit v1.2.3 (git 2.25.1) at 2024-07-01 14:23:49 +0000