aboutsummaryrefslogtreecommitdiffstats
path: root/OpenKeychain/src/main/java
Commit message (Expand)AuthorAgeFilesLines
* Better handling of actionbars backDominik Schürmann2014-05-076-46/+50
* Design fixes for certification activityDominik Schürmann2014-05-071-44/+43
* Merge branch 'master' of github.com:open-keychain/open-keychainDominik Schürmann2014-05-075-52/+102
|\
| * ui: use SlidingTabLayout in help activityVincent Breitmoser2014-05-071-20/+30
| * small fix for 6aafb3, forgot to commit this lineVincent Breitmoser2014-05-071-0/+1
| * ui: purplize searchtext in keylistVincent Breitmoser2014-05-071-0/+3
| * display AppMsg warning when no encryption subkey is availableVincent Breitmoser2014-05-071-0/+12
| * ui: slight edit icon cosmetics in keylistVincent Breitmoser2014-05-071-0/+4
| * ui: move revocation/expiry notes above tab sliderVincent Breitmoser2014-05-072-32/+32
| * ui: purplize edge overscroll glow effectVincent Breitmoser2014-05-071-0/+20
* | Clarify languageDominik Schürmann2014-05-072-2/+2
|/
* Clarify languageDominik Schürmann2014-05-061-1/+1
* edit button with imageDominik Schürmann2014-05-061-2/+3
* Always use section style instead of custom classDominik Schürmann2014-05-061-69/+0
* 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-062-2/+2
* ui: use textview buttons in decrypt verify dialogueVincent Breitmoser2014-05-062-6/+6
* ui: use textviews instead of bootstrap buttons in SignEncryptVincent Breitmoser2014-05-062-10/+9
* Touch view only onceDominik Schürmann2014-05-061-9/+11
* ui: use primary icon color for certification statusVincent Breitmoser2014-05-061-11/+8
* ui: show revocation and expiry status on info tabVincent Breitmoser2014-05-061-31/+40
* ui: subkey view redesignVincent Breitmoser2014-05-051-31/+13
* ui: remove primary subkey infoVincent Breitmoser2014-05-051-113/+7
* 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-0515-31/+621
|\ \
| * | 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-2912-12/+592
| |/
* / New key view design, using Android flat buttons and Android iconsDominik Schürmann2014-05-0511-276/+1305
|/
* 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
* Merge branch 'master' of github.com:open-keychain/open-keychainDominik Schürmann2014-04-225-16/+33
|\
| * 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-224-15/+31
| |\ \
| | * | split up filterSign and filterCertify in SelectSecretKeyFragmentVincent Breitmoser2014-04-204-15/+31