aboutsummaryrefslogtreecommitdiffstats
path: root/OpenKeychain/src/main/res
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'development' of https://github.com/open-keychain/open-keychain ...Adithya Abraham Philip2015-02-2811-159/+229
|\
| * Prettify qr code cleanupDominik Schürmann2015-02-271-10/+0
| * Prettify qr code in advanced key viewDominik Schürmann2015-02-271-5/+27
| * Uncluttering advanced key viewDominik Schürmann2015-02-272-133/+0
| * Fix margins of dialog viewsDominik Schürmann2015-02-276-21/+30
| * Merge keybase-proof branchDominik Schürmann2015-02-273-0/+182
| |\
| | * Merge branch 'development' into keybase-proofsDominik Schürmann2014-12-053-5/+3
| | |\
| | * | Check fingerprint match between proof & databaseTim Bray2014-11-221-0/+1
| | * | Merge branch 'development' into keybase-proofsDominik Schürmann2014-11-214-19/+14
| | |\ \
| | * | | Prevent multiple cloud-trust-search launches. Handle DNS query failure grace...Tim Bray2014-11-191-0/+1
| | * | | In the ImportKeysList display, arrange for Keybase UserIDs to sort below the ...Tim Bray2014-11-181-0/+1
| | * | | All keybase proofs now in placeTim Bray2014-11-111-0/+7
| | * | | XML fragment for proof listingTim Bray2014-11-071-0/+19
| | * | | Moved from WebView to Spannables, some proof cleanup tooTim Bray2014-11-072-0/+153
* | | | | merged dialogAdithya Abraham Philip2015-02-26614-1759/+5032
|\| | | |
| * | | | Remove old Holo design resourcesDominik Schürmann2015-02-26308-576/+0
| * | | | Hopefully fixes drop down icon for spinners on Android lower 5Dominik Schürmann2015-02-261-19/+0
| * | | | Fingerprint verification, design fixes for qr code cardDominik Schürmann2015-02-269-28/+214
| * | | | Dont show verification icons in my key view, hide edit button for non-secret ...Dominik Schürmann2015-02-253-9/+10
| * | | | Invoke NFC buttonDominik Schürmann2015-02-2515-2/+10
| * | | | Other icon for key exchangeDominik Schürmann2015-02-2528-3/+3
| * | | | Design fixes for header, QR Code shared element transitionsDominik Schürmann2015-02-255-15/+27
| * | | | CardView and more header designDominik Schürmann2015-02-255-21/+53
| * | | | Use material icon for safeslingerDominik Schürmann2015-02-2512-3/+3
| * | | | Toolbar: qr code in header, cleanup of fragmentDominik Schürmann2015-02-2517-375/+75
| * | | | Bigger status icon in key viewDominik Schürmann2015-02-25110-26/+34
| * | | | First work on new key view toolbarDominik Schürmann2015-02-2518-31/+104
| * | | | Fix QR Code, design experiments for key viewDominik Schürmann2015-02-249-34/+88
| * | | | Remove tabs in view keyDominik Schürmann2015-02-247-13/+370
| * | | | New advanced key viewDominik Schürmann2015-02-235-65/+78
| * | | | Refactor AppsListFragmentDominik Schürmann2015-02-231-1/+0
| * | | | Uncluttering App Settings: Move advanced info in dialogDominik Schürmann2015-02-232-41/+5
| * | | | Remove old pattern lib, add new pattern libDominik Schürmann2015-02-232-43/+36
| * | | | Update tab lib and fix colors of tabsDominik Schürmann2015-02-233-4/+11
| * | | | Fix multi select and more colorsDominik Schürmann2015-02-2211-12/+11
| * | | | Pull from transifexDominik Schürmann2015-02-221-1/+1
| * | | | Pull from transifexDominik Schürmann2015-02-2298-903/+4356
| * | | | Color for holoDominik Schürmann2015-02-221-1/+1
| * | | | Merge branch 'development' of github.com:open-keychain/open-keychain into dev...Dominik Schürmann2015-02-223-4/+14
| |\ \ \ \
| | * \ \ \ Merge pull request #1047 from steelman/dev-stringsDominik Schürmann2015-02-223-4/+14
| | |\ \ \ \
| | | * | | | some Polish translationsŁukasz Stelmach2015-02-211-3/+11
| | | * | | | move a string in the safe slinger activity to resourcesŁukasz Stelmach2015-02-213-1/+3
| * | | | | | Once again: Colors and header imageDominik Schürmann2015-02-225-33/+27
| |/ / / / /
| * | | | | Floating action button icons and methods for key listDominik Schürmann2015-02-218-18/+13
| * | | | | Status bar height fixDominik Schürmann2015-02-216-7/+16
| * | | | | Merge branch 'development' of github.com:open-keychain/open-keychain into dev...Dominik Schürmann2015-02-201-0/+1
| |\| | | |
| | * | | | determine correct filesize during decryption from LiteralData packetVincent Breitmoser2015-02-171-0/+1
| * | | | | Screenshot for GSoCDominik Schürmann2015-02-201-2/+2
| |/ / / /
* / / / / initial Log Display functionAdithya Abraham Philip2015-02-266-0/+15
|/ / / /
* | | | Improve nav drawer drawableDominik Schürmann2015-02-032-0/+9