aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* 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
| | | |
| | * | uncomment, use Parcel. Builds, not functionalAshley Hughes2014-03-071-25/+23
| | | |
| | * | keep up with masterAshley Hughes2014-03-07168-3031/+2898
| | |\ \
| | * | | use parcel to save keys, but saving existing keys is disabled, pending a ↵Ashley Hughes2014-03-064-78/+49
| | | | | | | | | | | | | | | | | | | | rewrite...
| | * | | fix saving new key (tmp)Ashley Hughes2014-03-063-3/+13
| | | | |
| | * | | a method, if not the best one, for each propertyAshley Hughes2014-03-061-2/+6
| | | | |
| | * | | begin adding parcel for save intentAshley Hughes2014-03-022-3/+97
| | | | |
| | * | | pass through which keys are newAshley Hughes2014-02-225-3/+29
| | | | |
| | * | | remove deleted keysAshley Hughes2014-02-221-0/+4
| | | | |
| | * | | first go at saving IDs correctlyAshley Hughes2014-02-221-14/+64
| | | | |
| | * | | change how primary id changing is passed throughAshley Hughes2014-02-225-5/+28
| | | | |
| | * | | master mergeAshley Hughes2014-02-22259-5932/+10079
| | |\ \ \
| | * | | | put main original id at the topAshley Hughes2014-02-211-1/+4
| | | | | |
| | * | | | initial split into two functionsAshley Hughes2014-02-211-24/+154
| | | | | |
| | * | | | pass through deleted keysAshley Hughes2014-02-154-4/+21
| | | | | |
| | * | | | propgate throughAshley Hughes2014-02-143-10/+33
| | | | | |
| | * | | | save work, this code doesn't work...Ashley Hughes2014-02-134-21/+58
| | | | | |
| | * | | | should have used refactor...Ashley Hughes2014-02-081-1/+1
| | | | | |
| | * | | | fix Android Studio analysis issuesAshley Hughes2014-02-081-37/+17
| | | | | |
| | * | | | 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-082-2/+7
| | | | | |
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-03 10:05:41 +0000