aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Removed submodule android-lockpatternDominik Schürmann2015-02-234-984/+0
* Update tab lib and fix colors of tabsDominik Schürmann2015-02-234-5/+12
* Disable default yubikey PIN by defaultDominik Schürmann2015-02-221-1/+1
* Fix multi select and more colorsDominik Schürmann2015-02-2216-20/+18
* Pull from transifexDominik Schürmann2015-02-221-1/+1
* Pull from transifexDominik Schürmann2015-02-2298-903/+4356
* Fix back button in encrypt activitiesDominik Schürmann2015-02-221-6/+12
* 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
* | | Use right colors in snackbars and logsDominik Schürmann2015-02-222-18/+20
* | | Go to keyserver settings directlyDominik Schürmann2015-02-222-6/+4
* | | Once again: Colors and header imageDominik Schürmann2015-02-22102-1383/+5626
|/ /
* | show app name instead of keys in main listDominik Schürmann2015-02-212-1/+6
* | Floating action button icons and methods for key listDominik Schürmann2015-02-2174-35/+1708
* | Status bar height fixDominik Schürmann2015-02-217-8/+17
* | ScreenshotsDominik Schürmann2015-02-203-0/+0
* | Merge branch 'development' of github.com:open-keychain/open-keychain into dev...Dominik Schürmann2015-02-205-16/+29
|\|
| * fix comments and some warnings in PgpDecryptVerifyVincent Breitmoser2015-02-171-9/+4
| * add check for filesize to encrypt/decrypt testsVincent Breitmoser2015-02-171-0/+18
| * determine correct filesize during decryption from LiteralData packetVincent Breitmoser2015-02-174-7/+7
* | Screenshot for GSoCDominik Schürmann2015-02-203-3/+3
|/
* Improve nav drawer drawableDominik Schürmann2015-02-033-137/+146
* Improve nav drawer drawableDominik Schürmann2015-02-032-2/+2
* Fix first time wizard designDominik Schürmann2015-02-0311-57/+78
* Add FAB to key listDominik Schürmann2015-02-034-35/+104
* Move encrypt decrypt operations in own starter activityDominik Schürmann2015-02-0320-27/+74
* More toolbar fixesDominik Schürmann2015-02-035-11/+20
* App settings statusbar fixDominik Schürmann2015-02-032-3/+8
* Toolbar fixes, Toolbar under status bar on LollipopDominik Schürmann2015-02-0334-96/+118
* Floating Action Button added in app settingsDominik Schürmann2015-02-0340-715/+451
* Merge branch 'development' of github.com:open-keychain/open-keychain into dev...Dominik Schürmann2015-02-0270-875/+1092
|\
| * fix tests for new PgpSignEncryptInputVincent Breitmoser2015-02-021-29/+29
| * rewrite PgpSignEncrypt data flowVincent Breitmoser2015-02-0169-851/+1062
| * Merge remote-tracking branch 'origin/development' into developmentVincent Breitmoser2015-01-3149-1370/+3221
| |\
| * | prevent recursive consolidateVincent Breitmoser2015-01-315-5/+11
* | | UI experiments for app settingsDominik Schürmann2015-02-025-50/+69
| |/ |/|
* | Rename app setting classes for consistencyDominik Schürmann2015-01-307-15/+14
* | Fix saving of allowed keysDominik Schürmann2015-01-301-11/+5
* | Fix travis for build tools updateDominik Schürmann2015-01-302-1/+1
* | Update mini dns libDominik Schürmann2015-01-301-0/+0
* | Merge branch 'ligi-ligi/fix/add_ability_to_compile_with_java8' into developmentDominik Schürmann2015-01-302-2/+2
|\ \
| * | Merge branch 'ligi/fix/add_ability_to_compile_with_java8' of https://github.c...Dominik Schürmann2015-01-302-2/+2
|/| |
| * | Add explicit casting to be able to compile with java8ligi2015-01-291-1/+1
| * | Use latest buildToolsligi2015-01-291-1/+1
* | | Header exportedDominik Schürmann2015-01-301-1/+4
* | | Saving of allowed keysDominik Schürmann2015-01-2912-232/+467
* | | Introduce allowed keys table per API clientDominik Schürmann2015-01-294-5/+70