aboutsummaryrefslogtreecommitdiffstats
path: root/OpenPGP-Keychain/src/main/java/org
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'master' of github.com:openpgp-keychain/openpgp-keychainDominik Schürmann2014-04-013-26/+39
|\
| * don't disable save button, show message if nothing needs to be doneAshley Hughes2014-04-011-3/+4
| * 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
* | 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-305-569/+243
* compiles againDominik Schürmann2014-03-302-7/+9
* More experimental work on decrypt fragmentsDominik Schürmann2014-03-3010-375/+623
* Experiments with fragments in decrypt activityDominik Schürmann2014-03-305-155/+421
* Remove cancel from app menuDominik Schürmann2014-03-301-3/+0
* Revert "Remove cancel from app menu"Dominik Schürmann2014-03-301-0/+3
* Remove cancel from app menuDominik Schürmann2014-03-301-3/+0
* Remove FLAG_ONE_SHOT from most PIsDominik Schürmann2014-03-302-6/+6
* Merge pull request #491 from openpgp-keychain/edit-keyDominik Schürmann2014-03-3013-493/+1206
|\
| * style changesAshley Hughes2014-03-301-27/+26
| * revert mistakeAshley Hughes2014-03-291-1/+1
| * merge masterAshley Hughes2014-03-29123-4249/+5829
| |\
| * | 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 mas...Ashley Hughes2014-03-271-3/+29
| * | 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-0739-770/+1402
| |\ \
| * | | use parcel to save keys, but saving existing keys is disabled, pending a rewr...Ashley Hughes2014-03-064-78/+49
| * | | 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-2255-3619/+3064
| |\ \ \
| * | | | 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
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-18 06:20:02 +0000