aboutsummaryrefslogtreecommitdiffstats
path: root/OpenKeychain/src/main
Commit message (Collapse)AuthorAgeFilesLines
...
| | | * | | add toString for test easeArt O Cathain2014-07-061-0/+10
| | | | | |
| | | * | | actually canonicalizeArt O Cathain2014-07-061-1/+10
| | | | | |
| | | * | | work in progressArt O Cathain2014-07-063-1/+511
| | | | | |
| | * | | | use KeyringTestHelper.diffKeyrings method for unit testVincent Breitmoser2014-07-071-1/+1
| | | | | |
| | * | | | add diffKeyrings methodVincent Breitmoser2014-07-071-0/+133
| | | | | |
| | * | | | Merge remote-tracking branch 'artbristol/functional-testing-canonicalize'Vincent Breitmoser2014-07-074-1/+530
| | |\ \ \ \ | | | |/ / / | | |/| | | | | | | | | | | | | | | Conflicts: OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service/OperationResultParcel.java
| | | * | | add toString for test easeArt O Cathain2014-07-061-0/+10
| | | | | |
| | | * | | actually canonicalizeArt O Cathain2014-07-061-1/+10
| | | | | |
| | | * | | work in progressArt O Cathain2014-07-063-1/+511
| | | | | |
| * | | | | 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
| |/
* | use SuperToast instead of AppMsg in code, part 2Vincent Breitmoser2014-07-072-3/+64
| |
* | use SuperToast instead of AppMsg in code, part 1Vincent Breitmoser2014-07-0717-112/+82
| |
* | get rid of AppMsg libraryVincent Breitmoser2014-07-072-744/+1
|/
* 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-028-104/+343
|\
| * Merge remote-tracking branch 'origin/master'Vincent Breitmoser2014-07-0216-461/+341
| |\
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-09 07:47:00 +0000