aboutsummaryrefslogtreecommitdiffstats
path: root/OpenKeychain/src
Commit message (Collapse)AuthorAgeFilesLines
* Final Commit for #662Daniel Albert2014-07-161-1/+6
|
* Merge remote-tracking branch 'upstream/master' into feature-conceal-softwareDaniel Albert2014-07-134-10/+225
|\
| * Fix strings from 'keys' to 'passphrases'Dominik Schürmann2014-07-121-2/+2
| |
| * Merge branch 'master' of github.com:open-keychain/open-keychainDominik Schürmann2014-07-124-16/+158
| |\
| | * 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-125-0/+34
| |/ |/|
* | Wello there, That's Java, not C^^Daniel Albert2014-07-121-1/+1
| |
* | Fixed issues discussed in #713Daniel Albert2014-07-123-14/+15
| |
* | Put text into strings.xml, for internationalizationDaniel Albert2014-07-122-6/+12
| |
* | 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
| | | Naming conventions save lives... or atleast make addAll() work
* Fix nullpointer in API, fix #693Dominik Schürmann2014-07-081-1/+7
|
* cleanupDominik Schürmann2014-07-081-30/+0
|
* 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-088-66/+310
|/
* Bett API stringDominik Schürmann2014-07-041-3/+3
|
* Use strings in edit keyDominik Schürmann2014-07-033-7/+18
|
* Pull from transifexDominik Schürmann2014-07-033-7/+30
|
* Pull from transifexDominik Schürmann2014-07-0325-352/+1289
|
* Small strings fixDominik Schürmann2014-07-031-1/+1
|
* Remove old edit button, rename activitiesDominik Schürmann2014-07-038-819/+782
|
* 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-035-37/+152
|
* parcel newPassphraseDominik Schürmann2014-07-031-0/+4
|
* cleanupDominik Schürmann2014-07-032-0/+5
|
* edit key: subkey adapterDominik Schürmann2014-07-034-2/+458
|
* Work on editDominik Schürmann2014-07-038-60/+69
|
* smaller dropdown itemsDominik Schürmann2014-07-032-4/+4
|
* Remove unnecessary error logsDominik Schürmann2014-07-022-2/+2
|
* A little bit less purpleDominik Schürmann2014-07-022-7/+4
|
* merge KeychainIntentServiceDominik Schürmann2014-07-029-105/+343
|\
| * Merge remote-tracking branch 'origin/master'Vincent Breitmoser2014-07-0216-461/+341
| |\
| * \ Merge branch 'create-keyring'Vincent Breitmoser2014-07-029-104/+342
| |\ \
| | * | support changing primary user id in SaveKeyringParcelVincent Breitmoser2014-07-023-4/+115
| | | | | | | | | | | | | | | | Closes #695
| | * | 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-297-61/+118
| | | |
* | | | 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-024-31/+24
| | |
* | | Merge branch 'master' of github.com:open-keychain/open-keychainDominik Schürmann2014-07-023-2/+7
|\| |
| * | forgot a line in previous commitVincent Breitmoser2014-07-021-0/+1
| | |
| * | don't use zero plural string for englishVincent Breitmoser2014-07-022-2/+6
| | | | | | | | | | | | closes #703
* | | Edit key: adding user idsDominik Schürmann2014-07-0214-236/+330
| | |
generated by cgit v1.2.3 (git 2.25.1) at 2024-07-05 18:52:11 +0000