aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Fix some strings thanks to Alain-OlivierDominik Schürmann2015-12-271-3/+3
* Remove unused layoutDominik Schürmann2015-12-224-246/+0
* Remove unused layoutDominik Schürmann2015-12-221-37/+0
* Use correct logger in LinkedIdsAdapterDominik Schürmann2015-12-221-1/+1
* Opt out from fullBackupContent for nowDominik Schürmann2015-12-221-0/+1
* Remove spongycastle pkix dependency to stay below Androids dex limitDominik Schürmann2015-12-222-2/+0
* Update spongycastle to 1.53Dominik Schürmann2015-12-225-6/+8
* Backup: Move FAQ button to last screen and simplify codeDominik Schürmann2015-12-224-124/+113
* Cleanup in HelpActivityDominik Schürmann2015-12-221-4/+0
* Update FAQ from websiteDominik Schürmann2015-12-221-57/+90
* Improve how_to_importDominik Schürmann2015-12-221-1/+1
* Merge branch 'TedaLIEz-master'Dominik Schürmann2015-12-226-8/+86
|\
| * Merge branch 'master' of https://github.com/TedaLIEz/open-keychain into TedaL...Dominik Schürmann2015-12-226-8/+86
|/|
| * Issue #1595aLIEzTed2015-12-226-8/+86
* | Default for theme settingDominik Schürmann2015-12-221-2/+3
* | Add hint to encrypt fieldDominik Schürmann2015-12-223-5/+2
* | Follow notification style guidelines, dismiss permission notification on clickDominik Schürmann2015-12-223-64/+9
* | Merge branch 'master' of github.com:open-keychain/open-keychainDominik Schürmann2015-12-219-45/+78
|\ \
| * \ Merge pull request #1633 from open-keychain/preference-fixDominik Schürmann2015-12-204-45/+59
| |\ \
| | * | fixed key update preference not turning offAdithya Abraham Philip2015-12-214-45/+59
| |/ /
| * | set spongycastle submodule to correct commitVincent Breitmoser2015-12-171-0/+0
| * | api: add micalg result extra to detached signature api callVincent Breitmoser2015-12-175-0/+19
* | | Make ContactHelper less staticDominik Schürmann2015-12-219-166/+152
|/ /
* | linked: correctly show errors in linked id wizardVincent Breitmoser2015-12-141-7/+1
* | some work on benchmark operation (affects only debug build)Vincent Breitmoser2015-12-132-1/+85
* | encryptkeycompletionview: don't use prefixVincent Breitmoser2015-12-131-16/+4
* | Nicer RESULT_INSECURE fallback for old API versionsDominik Schürmann2015-12-101-9/+2
* | Merge pull request #1610 from open-keychain/facebookDominik Schürmann2015-12-1026-374/+554
|\ \
| * | added Facebook links support, reworked PreferencesAdithya Abraham Philip2015-12-0626-374/+554
* | | Merge pull request #1621 from TedaLIEz/masterDominik Schürmann2015-12-101-1/+6
|\ \ \ | | |/ | |/|
| * | Issue#1605 solvedTedaLIEz2015-12-091-1/+6
|/ /
* | Merge pull request #1617 from fiaxh/sign_key_id_typeDominik Schürmann2015-12-032-5/+4
|\|
| * Return EXTRA_SIGN_KEY_ID = 0L for "none" key chosen for ACTION_GET_SIGN_KEY_IDfiaxh2015-12-032-5/+4
|/
* encryptkeycompletionview: don't initialize to null on attachVincent Breitmoser2015-11-302-12/+3
* move custm api permission methods into helper class (composition over inherit...Vincent Breitmoser2015-11-272-41/+49
* Note about transitive depsDominik Schürmann2015-11-241-0/+1
* Version 3.7Dominik Schürmann2015-11-241-2/+2
* Pull from transifexDominik Schürmann2015-11-2423-0/+92
* 3.7 changelogDominik Schürmann2015-11-231-0/+4
* Pull from transifexDominik Schürmann2015-11-2349-422/+3510
* externalize notification helper for iconDominik Schürmann2015-11-231-0/+50
* Fix strings, thanks to Alain-OlivierDominik Schürmann2015-11-2310-64/+38
* re-enable contact sync by defaultDominik Schürmann2015-11-232-7/+3
* Revert "Add first time wizard for sync settings"Dominik Schürmann2015-11-236-175/+5
* No need to delete by raw contact idDominik Schürmann2015-11-231-30/+8
* Disable contact sync by default on Android >= 6Dominik Schürmann2015-11-233-35/+36
* Add first time wizard for sync settingsDominik Schürmann2015-11-236-5/+175
* Update proguard workaround for support lib 23.1.1Dominik Schürmann2015-11-231-1/+2
* API version 10Dominik Schürmann2015-11-232-1/+1
* Fix potential NPEDominik Schürmann2015-11-231-2/+2