aboutsummaryrefslogtreecommitdiffstats
path: root/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'master' of github.com:open-keychain/open-keychainDominik Schürmann2014-05-081-3/+0
|\
| * use setEncryptToSigner for asymmetric encryptionVincent Breitmoser2014-05-081-3/+0
| | | | | | | | (tested and works, closes #569)
* | Use flat buttons where appropriateDominik Schürmann2014-05-083-14/+10
|/
* use LoaderFragment in ViewKey tabsVincent Breitmoser2014-05-084-44/+32
| | | | Closes #616
* extract generic LoaderFragment superclass from KeyListVincent Breitmoser2014-05-082-61/+88
|
* Don't allow certification using keys where primary subkey is strippedVincent Breitmoser2014-05-071-4/+7
| | | | Closes #596
* Add applications section to helpDominik Schürmann2014-05-073-3/+3
|
* Remove code for sharing whole key via qr codeDominik Schürmann2014-05-072-129/+16
|
* GET_KEY: also return PendingIntent to key viewDominik Schürmann2014-05-071-1/+1
|
* Better handling of actionbars backDominik Schürmann2014-05-075-27/+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-074-52/+82
|\
| * 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
| |
* | 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-067-276/+11
|
* ui: apply purple theme (twi is best color)Vincent Breitmoser2014-05-061-1/+1
|
* 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 ViewCertActivity
| * Avoid displaying double 0x before keyid in ViewCertActivityVadim Lebedev2014-05-021-2/+2
| |
* | Merge pull request #603 from timbray/masterDominik Schürmann2014-05-0510-14/+318
|\ \ | | | | | | Adds first level of keybase support
| * | Per pull-request comments.Tim Bray2014-05-043-11/+17
| | |
| * | stupid identation stuffTim Bray2014-04-301-1/+1
| | |
| * | can search openkeychain, retrieve & install & use keys from thereTim Bray2014-04-299-12/+310
| |/
* / New key view design, using Android flat buttons and Android iconsDominik Schürmann2014-05-059-276/+776
|/
* Many API fixes for GET_KEY and GET_KEY_IDSDominik Schürmann2014-04-281-2/+2
|
* Merge commit '0b7fb70'Vincent Breitmoser2014-04-224-15/+31
|\ | | | | | | | | Conflicts: OpenKeychain/src/main/res/values/strings.xml
| * split up filterSign and filterCertify in SelectSecretKeyFragmentVincent Breitmoser2014-04-204-15/+31
| | | | | | | | Closes #588
* | Workaround for nullpointer bug in support lib, close #591Dominik Schürmann2014-04-221-2/+3
| |
* | More code cleanupDominik Schürmann2014-04-1917-88/+83
|/
* Trying a fix for #585Dominik Schürmann2014-04-193-17/+21
|
* Fix more stringsDominik Schürmann2014-04-192-3/+3
|
* Remove unused strings, fix some lint errors, fix some language confusionsDominik Schürmann2014-04-187-9/+11
|
* Do not show lookup button in decrypt activity for decryption-onlyDominik Schürmann2014-04-181-2/+4
|
* FIx nfc buttonDominik Schürmann2014-04-182-7/+14
|
* Fix upload of keys, closes #581Dominik Schürmann2014-04-182-3/+8
|
* get rid of PgpKeyHelper.getMasterKeyIdVincent Breitmoser2014-04-171-3/+6
| | | | Closes #575