aboutsummaryrefslogtreecommitdiffstats
path: root/OpenKeychain/src/main/java/org/sufficientlysecure
Commit message (Expand)AuthorAgeFilesLines
* Final Commit for #662Daniel Albert2014-07-161-1/+6
* Merge remote-tracking branch 'upstream/master' into feature-conceal-softwareDaniel Albert2014-07-133-8/+223
|\
| * Merge branch 'master' of github.com:open-keychain/open-keychainDominik Schürmann2014-07-123-16/+151
| |\
| | * Fixed misplaced bracketDaniel Albert2014-07-121-1/+1
| * | more work on edit keyDominik Schürmann2014-07-122-7/+222
* | | Added Preference for concealing the PgpApplicationDaniel Albert2014-07-123-0/+28
| |/ |/|
* | Fixed issues discussed in #713Daniel Albert2014-07-122-12/+12
* | Put text into strings.xml, for internationalizationDaniel Albert2014-07-121-6/+6
* | Added Purging for Android < 4.1Daniel Albert2014-07-121-28/+51
* | Implemented Notification, no fallback yetDaniel Albert2014-07-123-7/+83
* | new PassphraseCache, storing UserIDs as wellDaniel Albert2014-07-121-11/+47
|/
* Fix OperationResultParcelmar-v-in2014-07-091-8/+8
* Fix nullpointer in API, fix #693Dominik Schürmann2014-07-081-1/+7
* Merge branch 'master' of github.com:open-keychain/open-keychainDominik Schürmann2014-07-082-6/+27
|\
| * Prefer composition to inheritance is the mantra these dasArt O Cathain2014-07-062-6/+27
* | Work on subkeys adapterDominik Schürmann2014-07-084-52/+246
|/
* Use strings in edit keyDominik Schürmann2014-07-031-3/+4
* Remove old edit button, rename activitiesDominik Schürmann2014-07-036-801/+780
* cleanup, debug for passphrase setDominik Schürmann2014-07-031-5/+4
* fix no passphrase checkDominik Schürmann2014-07-031-1/+3
* Cache passphrase for editDominik Schürmann2014-07-031-2/+2
* Cache passphrase for editDominik Schürmann2014-07-033-30/+60
* parcel newPassphraseDominik Schürmann2014-07-031-0/+4
* cleanupDominik Schürmann2014-07-032-0/+5
* edit key: subkey adapterDominik Schürmann2014-07-032-1/+361
* Work on editDominik Schürmann2014-07-035-48/+66
* smaller dropdown itemsDominik Schürmann2014-07-032-4/+4
* Remove unnecessary error logsDominik Schürmann2014-07-022-2/+2
* merge KeychainIntentServiceDominik Schürmann2014-07-027-104/+339
|\
| * Merge remote-tracking branch 'origin/master'Vincent Breitmoser2014-07-0211-378/+269
| |\
| * \ Merge branch 'create-keyring'Vincent Breitmoser2014-07-027-103/+338
| |\ \
| | * | support changing primary user id in SaveKeyringParcelVincent Breitmoser2014-07-022-4/+113
| | * | use expert create key for key creation testing (revert this later on!)Vincent Breitmoser2014-07-021-5/+50
| | * | fix subkey additionVincent Breitmoser2014-07-022-37/+62
| | * | add create key capabilities to SaveKeyringParcelVincent Breitmoser2014-06-295-60/+116
* | | | fix nullpointer, cleanupDominik Schürmann2014-07-023-10/+9
* | | | remove init methods from adapterDominik Schürmann2014-07-024-88/+53
| |_|/ |/| |
* | | edit key: work on savingDominik Schürmann2014-07-023-23/+24
* | | Merge branch 'master' of github.com:open-keychain/open-keychainDominik Schürmann2014-07-022-1/+6
|\| |
| * | forgot a line in previous commitVincent Breitmoser2014-07-021-0/+1
| * | don't use zero plural string for englishVincent Breitmoser2014-07-021-1/+5
* | | Edit key: adding user idsDominik Schürmann2014-07-0210-221/+258
* | | edit key: part 3Dominik Schürmann2014-07-014-327/+180
|/ /
* | Merge branch 'master' of github.com:open-keychain/open-keychainDominik Schürmann2014-06-3015-68/+52
|\ \
| * | Fixed Bootstrap resourceDaniel Albert2014-06-301-1/+1
| * | Fixed, issue #702Daniel Albert2014-06-301-1/+1
| * | Merge branch 'master' of https://github.com/open-keychain/open-keychainDaniel Albert2014-06-3021-299/+1109
| |\|
| * | Converted all other buttonsDaniel Albert2014-06-305-30/+20
| * | Ported even more buttons to use new design (Key and User editor)Daniel Albert2014-06-294-13/+12
| * | Converted AsymetricKeyFragment to new button styleDaniel Albert2014-06-291-4/+3
generated by cgit v1.2.3 (git 2.25.1) at 2024-07-03 00:46:51 +0000