aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
...
* Change license of NfcOperationActivity and fix copyright in BaseNfcActivityDominik Schürmann2015-08-122-3/+19
* Fix theme bugsDominik Schürmann2015-08-127-14/+47
* Merge branch 'master' of github.com:open-keychain/open-keychainDominik Schürmann2015-08-121-0/+1
|\
| * Merge branch 'master' of github.com:open-keychain/open-keychainVincent Breitmoser2015-08-121-5/+21
| |\
| * | show result error in cachingcryptooperationfragment (related #1445)Vincent Breitmoser2015-08-121-0/+1
* | | Adpt official theme naming schemaDominik Schürmann2015-08-124-18/+18
* | | Style dialog buttonsDominik Schürmann2015-08-122-2/+16
| |/ |/|
* | API: Better fallback for OpenPgpDecryptionResultDominik Schürmann2015-08-121-5/+21
|/
* Support API version 8Dominik Schürmann2015-08-101-2/+3
* Update dependenciesDominik Schürmann2015-08-103-27/+26
* Increase s2k iterations back to 0x90Dominik Schürmann2015-08-101-2/+2
* Merge pull request #1465 from open-keychain/requirementsDominik Schürmann2015-08-1035-466/+944
|\
| * Disable new failing test for nowDominik Schürmann2015-08-101-2/+3
| * Fix API backward compatDominik Schürmann2015-08-101-4/+4
| * Fix test cases, add test cases (still 1 failing)Dominik Schürmann2015-08-106-42/+182
| * Dont allow RSA_SIGN, RSA_ENCRYPT, deprecated in RFCDominik Schürmann2015-08-101-10/+3
| * Move TODOs into issueDominik Schürmann2015-08-101-13/+0
| * Improve comments and reasons in PgpConstants, simple checks for insecure asym...Dominik Schürmann2015-08-1024-277/+471
| * Use default compression in OpenPgpServiceDominik Schürmann2015-08-091-3/+2
| * Follow some of coorus recommendations: better selection of algo whitelist, ig...Dominik Schürmann2015-08-095-40/+53
| * Introduce constants in OpenPgpSignature and DecryptionResult for unsigned/une...Dominik Schürmann2015-08-0919-276/+427
|/
* use snackbar from repository (again), and update to 2.11.0Vincent Breitmoser2015-08-074-5/+2
* Merge pull request #1473 from open-keychain/orbot-helperDominik Schürmann2015-08-0611-169/+468
|\
| * updated OrbotHelper with silent startAdithya Abraham Philip2015-08-0611-169/+468
* | Merge pull request #1474 from open-keychain/themes-drawablesDominik Schürmann2015-08-067-12/+35
|\ \ | |/ |/|
| * fixed crash on api < 21 due to drawable using attrsAdithya Abraham Philip2015-08-067-12/+35
|/
* Merge pull request #1456 from xSooDx/masterDominik Schürmann2015-08-052-11/+24
|\
| * renamed the insertLinks() method to formatSpannableString() and added comment...xSooDx2015-08-041-2/+5
| * -Added failsafe in case '%s' is not in the stringxSooDx2015-07-211-2/+6
| * -No longer appends the links to the keybase_narrativesxSooDx2015-07-212-11/+17
* | Fix account_privacy_textDominik Schürmann2015-08-051-1/+1
* | Update libsDominik Schürmann2015-08-033-29/+26
* | Use gradle-allDominik Schürmann2015-08-031-3/+3
* | Add privacy information to account screenDominik Schürmann2015-08-0315-13/+28
* | Fix color and design in help activityDominik Schürmann2015-08-032-15/+10
* | Merge branch 'thialfihar-feature/add-theme-setting'Dominik Schürmann2015-07-2583-320/+573
|\ \
| * | Hide theme setting for nowDominik Schürmann2015-07-251-3/+3
| * | Restore fab colors in key listDominik Schürmann2015-07-251-6/+6
| * | Fix crash with new themeDominik Schürmann2015-07-251-1/+1
| * | Refactor theme selection of dialogsThialfihar2015-07-217-27/+27
| * | Fix key view toolbar and status colourThialfihar2015-07-212-5/+25
| * | Fix preference version handlingThialfihar2015-07-211-2/+2
| * | Use a constant for the default value of the themeThialfihar2015-07-212-1/+2
| * | Refactor theme changing to avoid code repetitionThialfihar2015-07-213-55/+70
| * | Rename updatePreferences() to upgradePreferences()Thialfihar2015-07-212-2/+2
| * | Refactor theme preference values into constantsThialfihar2015-07-214-4/+14
| * | Upgrade MaterialDrawer to 3.0.9Thialfihar2015-07-212-23/+26
| * | Fix color of selected text in drawer menu for light themeThialfihar2015-07-212-0/+4
| * | Fix drawer background color for ViewKeyActivityThialfihar2015-07-213-5/+6
| * | Update recent decrypt changes to use new theme attributesThialfihar2015-07-212-11/+12