aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* ui: subkey view redesignVincent Breitmoser2014-05-052-93/+93
|
* ui: remove primary subkey infoVincent Breitmoser2014-05-053-231/+8
|
* Merge pull request #609 from Vadiml1024/masterDominik Schürmann2014-05-051-2/+2
|\ | | | | Avoid displaying double 0x before keyid in ViewCertActivity
| * Avoid displaying double 0x before keyid in ViewCertActivityVadim Lebedev2014-05-021-2/+2
| |
* | Fix license headerDominik Schürmann2014-05-051-12/+11
| |
* | Merge pull request #603 from timbray/masterDominik Schürmann2014-05-0519-32/+678
|\ \ | | | | | | Adds first level of keybase support
| * | Per pull-request comments.Tim Bray2014-05-047-45/+52
| | |
| * | stupid identation stuffTim Bray2014-04-301-1/+1
| | |
| * | tidy up IntentServiceTim Bray2014-04-301-2/+2
| | |
| * | Changes should now be in sync with dominikTim Bray2014-04-301-4/+5
| | |
| * | keybase ID stuffTim Bray2014-04-291-3/+8
| | |
| * | Clean up debug crudTim Bray2014-04-292-4/+1
| | |
| * | can search openkeychain, retrieve & install & use keys from thereTim Bray2014-04-2916-13/+649
| | |
* | | Update from transifexDominik Schürmann2014-05-054-0/+240
| | |
* | | Update from transifexDominik Schürmann2014-05-0517-159/+44
| | |
* | | New key view design, using Android flat buttons and Android iconsDominik Schürmann2014-05-0550-594/+1788
| | |
* | | Update from transifexDominik Schürmann2014-05-0240-74/+1193
| |/ |/|
* | Speed up build: Upgrade to Gradle Android Plugin 0.10.0, Disable LintDominik Schürmann2014-05-026-5/+21
| |
* | add DESIGN documentVincent Breitmoser2014-04-301-0/+54
|/
* Merge pull request #601 from thi/rename-builder-methodsDominik Schürmann2014-04-294-58/+58
|\ | | | | Rename builder methods
| * Rename setter methods for PgpDecryptVerify.BuilderThialfihar2014-04-293-13/+13
| |
| * Rename setter methods for PgpSignEncrypt.BuilderThialfihar2014-04-293-45/+45
| |
* | Merge pull request #600 from thi/rename-progressdialogupdaterDominik Schürmann2014-04-298-54/+57
|\| | | | | Rename progressdialogupdater
| * Rename ProgressDialogUpdater to ProgressableThialfihar2014-04-298-54/+57
| | | | | | | | | | Also fix some inconsistent usages of "progress", now using "progressable" in all builders.
| * Move util.ProgressDialogUpdater to pgp.ProgressableThialfihar2014-04-291-0/+0
| |
* | Formatting KeychainDatabaseDominik Schürmann2014-04-291-17/+17
| |
* | Clarify sqlite datatypesDominik Schürmann2014-04-291-2/+12
|/
* API: Fix GET_KEY, closes #599Dominik Schürmann2014-04-281-10/+13
|
* Many API fixes for GET_KEY and GET_KEY_IDSDominik Schürmann2014-04-288-68/+207
|
* Version 2.6.1Dominik Schürmann2014-04-223-2/+10
|
* Merge branch 'master' of github.com:open-keychain/open-keychainDominik Schürmann2014-04-226-16/+34
|\
| * Merge commit '9cdb2ec4e270a572520d5bcdbee55867e3c37003'Vincent Breitmoser2014-04-221-1/+2
| |\
| | * fix nullpointer on missing s2kVincent Breitmoser2014-04-201-1/+2
| | | | | | | | | | | | Fixes #590
| * | Merge commit '0b7fb70'Vincent Breitmoser2014-04-225-15/+32
| |\ \ | | | | | | | | | | | | | | | | Conflicts: OpenKeychain/src/main/res/values/strings.xml
| | * | split up filterSign and filterCertify in SelectSecretKeyFragmentVincent Breitmoser2014-04-205-15/+32
| | | | | | | | | | | | | | | | Closes #588
* | | | add has_secret for all who are upgrading from a beta versionDominik Schürmann2014-04-221-3/+9
|/ / /
* | | Workaround for nullpointer bug in support lib, close #591Dominik Schürmann2014-04-2210-18/+52
| | |
* | | Fix a nullptr in KeychainProviderVincent Breitmoser2014-04-201-1/+1
| |/ |/| | | | | Fixes #589
* | More code cleanupDominik Schürmann2014-04-1920-105/+129
|/
* version 2.6Dominik Schürmann2014-04-191-2/+2
|
* Update READMEDominik Schürmann2014-04-191-10/+8
|
* Update from transifexDominik Schürmann2014-04-1926-106/+117
|
* better error string for too many responsesDominik Schürmann2014-04-191-1/+1
|
* Trying a fix for #585Dominik Schürmann2014-04-194-18/+22
|
* Fix some smaller annoyances, closes #583, #582Dominik Schürmann2014-04-192-11/+5
|
* Fix more stringsDominik Schürmann2014-04-1913-36/+36
|
* certify keysDominik Schürmann2014-04-191-2/+2
|
* Update from transifexDominik Schürmann2014-04-1915-512/+0
|
* fix unified query columns for select*fragmentVincent Breitmoser2014-04-182-6/+5
|
* Update maven libs and use fixed versionDominik Schürmann2014-04-181-5/+5
|