aboutsummaryrefslogtreecommitdiffstats
path: root/OpenKeychain/src/main
Commit message (Expand)AuthorAgeFilesLines
* Some small style fixesDominik Schürmann2014-05-068-33/+46
* edit button with imageDominik Schürmann2014-05-062-4/+6
* Always use section style instead of custom classDominik Schürmann2014-05-065-81/+8
* Move logic classes for import into own sub-packageDominik Schürmann2014-05-0616-48/+38
* ui: apply purple theme (twi is best color)Vincent Breitmoser2014-05-06231-28/+572
* ui: use textview buttons in decrypt verify dialogueVincent Breitmoser2014-05-065-53/+75
* ui: use textviews instead of bootstrap buttons in SignEncryptVincent Breitmoser2014-05-065-45/+51
* ui: make primary star icon slightly largerVincent Breitmoser2014-05-068-0/+0
* Touch view only onceDominik Schürmann2014-05-061-9/+11
* ui: use primary icon color for certification statusVincent Breitmoser2014-05-0610-17/+8
* ui: show revocation and expiry status on info tabVincent Breitmoser2014-05-062-50/+74
* 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 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-0518-31/+676
|\ \
| * | 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-2915-12/+647
| |/
* | 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
|/
* Merge pull request #601 from thi/rename-builder-methodsDominik Schürmann2014-04-294-58/+58
|\
| * 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 to ProgressableThialfihar2014-04-298-54/+57
| * 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-283-17/+25
* Version 2.6.1Dominik Schürmann2014-04-222-2/+7
* 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
| * | Merge commit '0b7fb70'Vincent Breitmoser2014-04-225-15/+32
| |\ \
| | * | split up filterSign and filterCertify in SelectSecretKeyFragmentVincent Breitmoser2014-04-205-15/+32
* | | | 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
| |/ |/|
* | More code cleanupDominik Schürmann2014-04-1920-105/+129
|/
* version 2.6Dominik Schürmann2014-04-191-2/+2
* Update from transifexDominik Schürmann2014-04-1926-106/+117
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-09 18:02:48 +0000