aboutsummaryrefslogtreecommitdiffstats
path: root/OpenKeychain/src
Commit message (Collapse)AuthorAgeFilesLines
...
| | * Merge branch 'master' into ditch-appmsgVincent Breitmoser2014-07-2659-1453/+1695
| | |\ | | | | | | | | | | | | | | | | | | | | Conflicts: OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/EditKeyActivityOld.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/KeyListActivity.java
| | * | 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
| | | |
| * | | watch out for nullpointers from get(Un|)HashedSubpacketsVincent Breitmoser2014-07-283-10/+19
| | | | | | | | | | | | | | | | fixes #721
* | | | Create key with fragmentsDominik Schürmann2014-07-3014-297/+733
|/ / /
* | | Fix build by removing old icon referenceDominik Schürmann2014-07-281-1/+0
| | |
* | | Use new icons in other key related activites, delete old iconsDominik Schürmann2014-07-2835-53/+77
| | |
* | | Use verified icon for certify actionDominik Schürmann2014-07-282-13/+52
| | |
* | | Set visibility at lastDominik Schürmann2014-07-282-6/+6
| | |
* | | Use icons in key viewDominik Schürmann2014-07-285-43/+64
| | |
* | | Use new status icons in key listDominik Schürmann2014-07-282-44/+29
| | |
* | | Smaller status images, green testDominik Schürmann2014-07-2861-1/+1
| | |
* | | Fix resource names, add small testDominik Schürmann2014-07-2862-7/+12
| | |
* | | Add icons from ModernPGP projectDominik Schürmann2014-07-2860-0/+0
| | |
* | | Fix background color of notify areaDominik Schürmann2014-07-271-2/+0
| | |
* | | cleanup left-oversDominik Schürmann2014-07-271-2/+0
| | |
* | | Redesigned QR Code viewDominik Schürmann2014-07-278-134/+170
| | |
* | | Load QR Code asynchronously and with a fade in animationDominik Schürmann2014-07-271-5/+41
| | |
* | | Open keyboard on passphrase dialog, this should now work on all Android ↵Dominik Schürmann2014-07-274-44/+109
| | | | | | | | | | | | versions... hopefully
* | | Make PassphraseCacheService a foreground serviceDominik Schürmann2014-07-271-72/+67
| | |
* | | Prettify buttonsDominik Schürmann2014-07-272-41/+76
| | |
* | | Work on first time wizard designDominik Schürmann2014-07-2710-107/+215
| |/ |/|
* | canonicalize: couple of fixesVincent Breitmoser2014-07-262-18/+30
| |
* | generic UncachedKeyRing fixesVincent Breitmoser2014-07-261-25/+24
| |
* | Merge remote-tracking branch 'origin/master'Vincent Breitmoser2014-07-264-43/+48
|\ \
| * | Program flow fixesDominik Schürmann2014-07-254-43/+48
| | |
* | | UncachedKeyRing.merge: copy over new secret subkeys into secret keyringsVincent Breitmoser2014-07-261-12/+9
| | |
* | | fixes for extractPublicKeyRing, update SpongyCastleVincent Breitmoser2014-07-262-15/+18
| | |
* | | test and fix: adding an empty user id should failVincent Breitmoser2014-07-263-0/+7
|/ /
* | canonicalize: fix for testsVincent Breitmoser2014-07-195-5/+11
| |
* | Merge branch 'master' of https://github.com/da-kid/open-keychain into ↵Dominik Schürmann2014-07-186-2/+43
|\ \ | | | | | | | | | | | | | | | | | | da-kid-master Conflicts: OpenKeychain/src/test/resources/extern/OpenPGP-Haskell
| * | Fixed another unescaped apostrophe.Daniel Albert2014-07-171-1/+1
| | |
| * | Fixed unescaped apostropheDaniel Albert2014-07-171-1/+1
| | |
| * | Added description to Setting, Changed title to suggested oneDaniel Albert2014-07-172-3/+5
| | |
| * | Merge remote-tracking branch 'upstream/master'Daniel Albert2014-07-1650-1294/+865
| |\ \ | |/ / |/| | | | | | | | | | | Conflicts: OpenKeychain-Test/src/test/resources/extern/OpenPGP-Haskell OpenKeychain/src/main/java/org/sufficientlysecure/keychain/Constants.java
| * | Final Commit for #662Daniel Albert2014-07-161-1/+6
| | |
| * | Merge remote-tracking branch 'upstream/master' into feature-conceal-softwareDaniel Albert2014-07-134-10/+225
| |\ \
| * | | Added Preference for concealing the PgpApplicationDaniel Albert2014-07-125-0/+34
| | | |
* | | | Temporary program flow fixesDominik Schürmann2014-07-161-0/+3
| | | |
* | | | Simple create keyDominik Schürmann2014-07-161-1/+0
| | | |
* | | | Simple create keyDominik Schürmann2014-07-163-51/+57
| | | |
* | | | New first time screenDominik Schürmann2014-07-1615-681/+362
| | | |
* | | | Fallback if no primary user id existsDominik Schürmann2014-07-1611-13/+34
| | | |
* | | | move getPublicKey into abstract WrappedKeyRing (also, fix getPrimaryUserId)Vincent Breitmoser2014-07-159-22/+21
| | | |
* | | | Merge branch 'master' of github.com:open-keychain/open-keychainDominik Schürmann2014-07-151-1/+1
|\ \ \ \
| * | | | signatures: a revocation reason does NOT determine if a cert is a revocation ↵Vincent Breitmoser2014-07-151-1/+1
| | | | | | | | | | | | | | | | | | | | type
* | | | | Merge branch 'master' of github.com:open-keychain/open-keychainDominik Schürmann2014-07-154-3/+9
|\| | | |
| * | | | merge: different msg if nothing was mergedVincent Breitmoser2014-07-154-3/+9
| | | | |
* | | | | some fixes for editDominik Schürmann2014-07-152-4/+5
|/ / / /
generated by cgit v1.2.3 (git 2.25.1) at 2024-08-06 16:21:43 +0000