aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Cleanup OpenPgpService2 code, update openpgp-api libDominik Schürmann2015-08-282-51/+3
* Revert "service side support for https://github.com/open-keychain/openpgp-api...Dominik Schürmann2015-08-281-3/+208
* Merge branch 'master' of https://github.com/mgeier63/open-keychain into mgeie...Dominik Schürmann2015-08-284-271/+207
|\
| * service side support for https://github.com/open-keychain/openpgp-api/pull/3mgeier632015-08-271-208/+3
| * service side support for https://github.com/open-keychain/openpgp-api/pull/3mgeier632015-08-273-63/+204
* | Make keybase an experimental featureDominik Schürmann2015-08-2812-213/+213
* | Add missing scrim drawableDominik Schürmann2015-08-281-0/+8
* | introduce text protection and fix color change after confirmDominik Schürmann2015-08-283-10/+38
* | Remove old commentDominik Schürmann2015-08-281-1/+0
* | Improve scrolling in key viewDominik Schürmann2015-08-283-5/+1361
* | Dont show FAB for expired, revoked keysDominik Schürmann2015-08-282-2/+4
* | Improve certify stringsDominik Schürmann2015-08-281-9/+9
* | Merge branch 'master' of github.com:open-keychain/open-keychainDominik Schürmann2015-08-2810-140/+177
|\ \
| * \ Merge branch 'master' of github.com:open-keychain/open-keychainVincent Breitmoser2015-08-278-10/+12216
| |\ \
| * \ \ Merge branch 'master' of github.com:open-keychain/open-keychainVincent Breitmoser2015-08-2726-20/+54
| |\ \ \
| * | | | use nicer filenames during exportVincent Breitmoser2015-08-272-4/+22
| * | | | some cleanup in FileHelper, and allow input of filename during exportVincent Breitmoser2015-08-279-139/+158
* | | | | Collapsing ToolbarDominik Schürmann2015-08-283-288/+269
| |_|/ / |/| | |
* | | | Experimental word comparisonDominik Schürmann2015-08-278-10/+12216
| |/ / |/| |
* | | Fix theme settingDominik Schürmann2015-08-271-0/+2
* | | Prettify settings, rename some stringsDominik Schürmann2015-08-2725-20/+52
|/ /
* | Use SwitchPreference more oftenDominik Schürmann2015-08-274-20/+20
* | Experimental features settings reworkedDominik Schürmann2015-08-276-23/+71
* | Remove dead codeDominik Schürmann2015-08-279-649/+59
* | Experimental feature settingDominik Schürmann2015-08-276-9/+60
* | fix msg_ip_merge_secretDominik Schürmann2015-08-261-1/+1
* | Use CDATA to prevent transifex problemsDominik Schürmann2015-08-261-6/+6
* | Pull from transifexDominik Schürmann2015-08-2644-4229/+965
* | Pull from transifexDominik Schürmann2015-08-2552-755/+1178
|/
* Merge pull request #1501 from open-keychain/multi-thread-fixDominik Schürmann2015-08-241-55/+31
|\
| * fixed update all crashAdithya Abraham Philip2015-08-241-55/+31
* | API: Fix get sign key, related to OpenPgpKeyPreference bugsDominik Schürmann2015-08-243-30/+37
* | Update openpgp-api-libDominik Schürmann2015-08-241-0/+0
|/
* Better del_rev_dialog_titleDominik Schürmann2015-08-241-1/+1
* Better del_rev_dialog_messageDominik Schürmann2015-08-241-1/+1
* Merge branch 'master' of github.com:open-keychain/open-keychainDominik Schürmann2015-08-244-1/+10
|\
| * trigger indexing of file after operation (#1498)Vincent Breitmoser2015-08-221-1/+6
| * mention filename to export to in logVincent Breitmoser2015-08-223-0/+4
* | Move proxy pref values out of stringsDominik Schürmann2015-08-245-13/+19
|/
* Merge pull request #1461 from open-keychain/keyserver-syncDominik Schürmann2015-08-2041-77/+955
|\
| * introduced constants for keyserver sync, fixed sync issueAdithya Abraham Philip2015-08-2012-68/+77
| * added on/off summariesAdithya Abraham Philip2015-08-203-8/+34
| * added sync preferencesAdithya Abraham Philip2015-08-206-3/+95
| * changed orbot notification iconsAdithya Abraham Philip2015-08-2017-7/+12
| * changed sync nameAdithya Abraham Philip2015-08-202-1/+5
| * reworked keyserversyncadapterservice flowAdithya Abraham Philip2015-08-208-163/+385
| * improved orbot notify, added periodic syncAdithya Abraham Philip2015-08-206-18/+108
| * introduced keyserver sync adapterAdithya Abraham Philip2015-08-2014-26/+456
|/
* transifex: remove unused mappingsDominik Schürmann2015-08-201-1/+1
* Revert "Fix pulling Serbian translation from Transifex"Dominik Schürmann2015-08-201-1/+1