aboutsummaryrefslogtreecommitdiffstats
path: root/OpenKeychain/src/main/res
Commit message (Expand)AuthorAgeFilesLines
* Fixes for uploadDominik Schürmann2014-07-311-0/+1
* Create key: design fixesDominik Schürmann2014-07-318-22/+45
* Fix animations in create keyDominik Schürmann2014-07-312-25/+13
* Add notify layouts to some activitiesDominik Schürmann2014-07-314-80/+104
* Merge branch 'master' of github.com:open-keychain/open-keychainDominik Schürmann2014-07-311-0/+14
|\
| * completely overengineer progress indication in {modify,create}SecretKeyRing m...Vincent Breitmoser2014-07-311-0/+14
* | Robots like coffee too...Dominik Schürmann2014-07-319-15/+36
|/
* Fix stringDominik Schürmann2014-07-311-1/+1
* Keyserver exception translateableDominik Schürmann2014-07-319-21/+23
* Smaller notesDominik Schürmann2014-07-311-1/+1
* Exception handling with keyserver queriesDominik Schürmann2014-07-311-1/+1
* Better exception handling for import of keysDominik Schürmann2014-07-316-6/+6
* Merge branch 'master' of github.com:open-keychain/open-keychainDominik Schürmann2014-07-301-0/+1
|\
| * couple of fixes in save*KeyRing methodsVincent Breitmoser2014-07-301-0/+1
* | Create key: work on uploadDominik Schürmann2014-07-303-182/+219
|/
* Create key: repeat passphraseDominik Schürmann2014-07-303-4/+14
* Create key: uploadDominik Schürmann2014-07-301-0/+2
* Fix drawer in key listDominik Schürmann2014-07-301-4/+4
* Create key: layout above buttonsDominik Schürmann2014-07-302-4/+8
* Fix conflictsDominik Schürmann2014-07-301-2/+23
* Merge branch 'master' of github.com:open-keychain/open-keychainDominik Schürmann2014-07-3012-70/+33
|\
| * Merge branch 'ditch-appmsg'Vincent Breitmoser2014-07-2912-70/+33
| |\
| | * introduce EditKeyResult with transient UncachedKeyRing (half-baked!)Vincent Breitmoser2014-07-277-7/+7
| | * some more work on supertoast and result parcel stuffVincent Breitmoser2014-07-275-67/+21
| | * Merge branch 'master' into ditch-appmsgVincent Breitmoser2014-07-2611-227/+183
| | |\
| | * | use SuperToast instead of AppMsg in code, part 1Vincent Breitmoser2014-07-073-1/+7
| | * | get rid of AppMsg libraryVincent Breitmoser2014-07-071-0/+1
* | | | Create key with fragmentsDominik Schürmann2014-07-309-80/+261
|/ / /
* | | 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-2831-30/+28
* | | Use verified icon for certify actionDominik Schürmann2014-07-281-11/+40
* | | Use icons in key viewDominik Schürmann2014-07-283-21/+25
* | | Use new status icons in key listDominik Schürmann2014-07-281-24/+6
* | | Smaller status images, green testDominik Schürmann2014-07-2860-0/+0
* | | Fix resource names, add small testDominik Schürmann2014-07-2861-2/+2
* | | Add icons from ModernPGP projectDominik Schürmann2014-07-2860-0/+0
* | | Fix background color of notify areaDominik Schürmann2014-07-271-2/+0
* | | Redesigned QR Code viewDominik Schürmann2014-07-274-19/+47
* | | Open keyboard on passphrase dialog, this should now work on all Android versi...Dominik Schürmann2014-07-271-0/+2
* | | Prettify buttonsDominik Schürmann2014-07-271-34/+70
* | | Work on first time wizard designDominik Schürmann2014-07-274-84/+120
| |/ |/|
* | test and fix: adding an empty user id should failVincent Breitmoser2014-07-261-0/+1
* | canonicalize: fix for testsVincent Breitmoser2014-07-191-0/+2
* | 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-168-212/+130
|\ \
| * | Simple create keyDominik Schürmann2014-07-161-5/+0
| * | New first time screenDominik Schürmann2014-07-168-205/+114
| * | merge: different msg if nothing was mergedVincent Breitmoser2014-07-151-0/+1