aboutsummaryrefslogtreecommitdiffstats
path: root/OpenKeychain
Commit message (Expand)AuthorAgeFilesLines
* put unit tests into external module (CAVEAT)Vincent Breitmoser2014-07-098-232/+0
* use KeyringTestHelper.diffKeyrings method for unit testVincent Breitmoser2014-07-072-2/+19
* add diffKeyrings methodVincent Breitmoser2014-07-071-0/+133
* Merge remote-tracking branch 'artbristol/functional-testing-canonicalize'Vincent Breitmoser2014-07-075-1/+564
|\
| * add toString for test easeArt O Cathain2014-07-061-0/+10
| * actually canonicalizeArt O Cathain2014-07-062-5/+11
| * work in progressArt O Cathain2014-07-064-1/+548
* | Prefer composition to inheritance is the mantra these dasArt O Cathain2014-07-062-6/+27
|/
* 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
| | * | 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
* | | Edit key: adding user idsDominik Schürmann2014-07-0214-236/+330
* | | edit key: part 3Dominik Schürmann2014-07-015-387/+180
|/ /
* | remove leftover of AndroidBootstrapDominik Schürmann2014-06-301-0/+0
* | Merge branch 'master' of github.com:open-keychain/open-keychainDominik Schürmann2014-06-3058-159/+268
|\ \
| * | Fixed Bootstrap resourceDaniel Albert2014-06-301-1/+1
| * | (should have) fixed Travis buildsDaniel Albert2014-06-302-7/+2
| * | Deprecated Android Bootstrap, thus fixing #597Daniel Albert2014-06-301-1/+0
| * | Fixed, issue #702Daniel Albert2014-06-301-1/+1
| * | Merge branch 'master' of https://github.com/open-keychain/open-keychainDaniel Albert2014-06-3030-309/+1460
| |\|
| * | Converted all other buttonsDaniel Albert2014-06-3023-60/+48
| * | Ported even more buttons to use new design (Key and User editor)Daniel Albert2014-06-2917-37/+102
| * | Converted AsymetricKeyFragment to new button styleDaniel Albert2014-06-292-9/+6
generated by cgit v1.2.3 (git 2.25.1) at 2024-05-19 00:16:20 +0000