aboutsummaryrefslogtreecommitdiffstats
path: root/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui
Commit message (Expand)AuthorAgeFilesLines
* Better exception handling for import of keysDominik Schürmann2014-07-312-36/+16
* More file association hacks for AndroidManifest and key importDominik Schürmann2014-07-312-14/+24
* Create key: work on uploadDominik Schürmann2014-07-304-10/+14
* Create key: repeat passphraseDominik Schürmann2014-07-302-7/+32
* Create key: uploadDominik Schürmann2014-07-301-13/+20
* return values for create keyDominik Schürmann2014-07-302-4/+20
* Fix conflictsDominik Schürmann2014-07-301-1/+2
* Merge branch 'master' of github.com:open-keychain/open-keychainDominik Schürmann2014-07-3018-873/+92
|\
| * fix a couple remaining AppMsgsVincent Breitmoser2014-07-292-10/+7
| * Merge branch 'ditch-appmsg'Vincent Breitmoser2014-07-2914-850/+84
| |\
| | * introduce EditKeyResult with transient UncachedKeyRing (half-baked!)Vincent Breitmoser2014-07-273-10/+6
| | * some more work on supertoast and result parcel stuffVincent Breitmoser2014-07-275-15/+18
| | * Merge branch 'master' into ditch-appmsgVincent Breitmoser2014-07-2614-602/+813
| | |\
| | * | use SuperToast instead of AppMsg in code, part 1Vincent Breitmoser2014-07-0711-101/+71
| | * | get rid of AppMsg libraryVincent Breitmoser2014-07-071-744/+0
* | | | Create key with fragmentsDominik Schürmann2014-07-304-212/+464
|/ / /
* | | Use new icons in other key related activites, delete old iconsDominik Schürmann2014-07-284-23/+49
* | | Use verified icon for certify actionDominik Schürmann2014-07-281-2/+12
* | | Set visibility at lastDominik Schürmann2014-07-282-6/+6
* | | Use icons in key viewDominik Schürmann2014-07-282-22/+39
* | | Use new status icons in key listDominik Schürmann2014-07-281-20/+23
* | | Smaller status images, green testDominik Schürmann2014-07-281-1/+1
* | | Fix resource names, add small testDominik Schürmann2014-07-281-5/+10
* | | cleanup left-oversDominik Schürmann2014-07-271-2/+0
* | | Redesigned QR Code viewDominik Schürmann2014-07-273-115/+119
* | | 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 versi...Dominik Schürmann2014-07-272-27/+92
* | | Prettify buttonsDominik Schürmann2014-07-271-7/+6
* | | Work on first time wizard designDominik Schürmann2014-07-275-22/+90
| |/ |/|
* | Program flow fixesDominik Schürmann2014-07-253-42/+47
* | Merge remote-tracking branch 'upstream/master'Daniel Albert2014-07-1611-550/+317
|\ \
| * | 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-162-46/+57
| * | New first time screenDominik Schürmann2014-07-164-474/+230
| * | Fallback if no primary user id existsDominik Schürmann2014-07-162-4/+4
| * | move getPublicKey into abstract WrappedKeyRing (also, fix getPrimaryUserId)Vincent Breitmoser2014-07-152-4/+4
| * | some fixes for editDominik Schürmann2014-07-151-3/+4
| * | Merge remote-tracking branch 'origin/master' into external-testVincent Breitmoser2014-07-153-10/+234
| |\ \
| * \ \ Merge remote-tracking branch 'origin/master' into external-testVincent Breitmoser2014-07-114-53/+247
| |\ \ \
| * | | | SaveKeyringParcel: follow attribute m prefix coding guidelineVincent Breitmoser2014-07-115-24/+21
* | | | | Merge remote-tracking branch 'upstream/master' into feature-conceal-softwareDaniel Albert2014-07-132-7/+222
|\ \ \ \ \ | | |_|/ / | |/| | |
| * | | | Merge branch 'master' of github.com:open-keychain/open-keychainDominik Schürmann2014-07-121-3/+12
| |\ \ \ \
| * | | | | more work on edit keyDominik Schürmann2014-07-122-7/+222
| | |_|/ / | |/| | |
* | | | | Added Preference for concealing the PgpApplicationDaniel Albert2014-07-121-0/+17
| |/ / / |/| | |
* | | | Fixed issues discussed in #713Daniel Albert2014-07-121-2/+2
* | | | Implemented Notification, no fallback yetDaniel Albert2014-07-121-3/+12
|/ / /
* | | Merge branch 'master' of github.com:open-keychain/open-keychainDominik Schürmann2014-07-081-1/+2
|\| |
| * | Prefer composition to inheritance is the mantra these dasArt O Cathain2014-07-061-1/+2
| |/
* / Work on subkeys adapterDominik Schürmann2014-07-084-52/+246
|/
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-12 19:14:07 +0000