aboutsummaryrefslogtreecommitdiffstats
path: root/OpenKeychain/src/main
Commit message (Expand)AuthorAgeFilesLines
* Clarify languageDominik Schürmann2014-05-072-3/+4
* Pull translations from transifexDominik Schürmann2014-05-0717-102/+151
* Merge branch 'master' of github.com:open-keychain/open-keychainDominik Schürmann2014-05-0727-223/+180
|\
| * ui: apply theme to tab buttonsVincent Breitmoser2014-05-071-0/+2
| * ui: use SlidingTabLayout in help activityVincent Breitmoser2014-05-072-20/+35
| * ui: primary certification icon was a pixel or two offVincent Breitmoser2014-05-071-2/+3
| * small fix for 6aafb3, forgot to commit this lineVincent Breitmoser2014-05-071-0/+1
| * ui: purplize searchtext in keylistVincent Breitmoser2014-05-072-0/+10
| * display AppMsg warning when no encryption subkey is availableVincent Breitmoser2014-05-072-0/+13
| * ui: slight edit icon cosmetics in keylistVincent Breitmoser2014-05-073-6/+13
| * ui: move revocation/expiry notes above tab sliderVincent Breitmoser2014-05-074-54/+61
| * ui: purplize edge overscroll glow effectVincent Breitmoser2014-05-071-0/+20
| * ui: purpelize fastscroll thumbVincent Breitmoser2014-05-0715-142/+23
* | Clarify languageDominik Schürmann2014-05-074-8/+8
|/
* Clarify languageDominik Schürmann2014-05-0614-31/+31
* 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