aboutsummaryrefslogtreecommitdiffstats
path: root/OpenKeychain/src/main/res
Commit message (Expand)AuthorAgeFilesLines
...
* Merge branch 'development' of github.com:open-keychain/open-keychain into dev...Dominik Schürmann2014-10-251-5/+5
|\
| * shorter certification explanationVincent Breitmoser2014-10-251-1/+1
| * more rewordingVincent Breitmoser2014-10-251-4/+4
* | Fixes and icons for apps list, also add Password StoreDominik Schürmann2014-10-253-0/+0
|/
* slightly change wording in merge logsVincent Breitmoser2014-10-251-2/+2
* Merge branch 'development' of github.com:open-keychain/open-keychain into dev...Vincent Breitmoser2014-10-253-11/+110
|\
| * Merge branch 'development' of github.com:open-keychain/open-keychain into dev...Dominik Schürmann2014-10-251-0/+10
| |\
| * | Safe slinger activity prepsDominik Schürmann2014-10-253-11/+110
* | | change the way merging is loggedVincent Breitmoser2014-10-251-1/+5
| |/ |/|
* | more work on import loggingVincent Breitmoser2014-10-251-5/+5
* | add logging to import and change order of import, keyservers firstVincent Breitmoser2014-10-251-0/+10
|/
* Qr code button textDominik Schürmann2014-10-242-2/+2
* remove space in on large devices in layouts where no drawer nav is shownDominik Schürmann2014-10-243-142/+0
* Merge pull request #973 from timbray/developmentDominik Schürmann2014-10-243-67/+26
|\
| * reword sync messageTim Bray2014-10-221-1/+1
| * Make the Certify screen a little more self-explanatoryTim Bray2014-10-213-67/+26
* | Start safe slinger activityDominik Schürmann2014-10-231-0/+26
|/
* More consisitencyDominik Schürmann2014-10-153-7/+5
* More color/icon consistencyDominik Schürmann2014-10-152-7/+7
* Group passphrase cache settingsDominik Schürmann2014-10-132-24/+25
* Remove key list filter for nowDominik Schürmann2014-10-131-2/+2
* wordingDominik Schürmann2014-10-131-3/+3
* Better qr code iconDominik Schürmann2014-10-134-0/+0
* Added option for num keypad for YubiKeyJerzy Kołosowski2014-10-133-2/+6
* rewrite export with new operation styleVincent Breitmoser2014-10-131-0/+24
* DeleteResult: add custom createNotifyVincent Breitmoser2014-10-111-0/+20
* move delete into operation classVincent Breitmoser2014-10-111-0/+18
* different wording in share tabVincent Breitmoser2014-10-101-1/+1
* fix width of displayed qr codeVincent Breitmoser2014-10-101-1/+1
* add keys button goes to directly to qr scanVincent Breitmoser2014-10-101-1/+1
* keylist: add safeslinger exchange button to secret keysVincent Breitmoser2014-10-101-0/+26
* Better handling if no api key is selectedDominik Schürmann2014-10-091-20/+28
* rename certify_key_item to the more appropriate multi_certify_itemVincent Breitmoser2014-10-081-0/+0
* Big error screen if signature is invalid or key is revoked/expired, also fixe...Dominik Schürmann2014-10-082-55/+93
* Handle revoked and expired keys in decrypt activityDominik Schürmann2014-10-0814-14/+16
* Merge branch 'development' of github.com:open-keychain/open-keychain into dev...Dominik Schürmann2014-10-082-5/+4
|\
| * remove ui hack, use padding instead of marginVincent Breitmoser2014-10-081-4/+3
| * slightly change text in certify dialogVincent Breitmoser2014-10-081-1/+1
* | New decryption screen UI with modernPGP iconsDominik Schürmann2014-10-0828-129/+177
|/
* Filter key list by certified keysDominik Schürmann2014-10-083-4/+30
* Fix MSG_MF_UID_PRIMARY logDominik Schürmann2014-10-071-1/+1
* Remove monospace from encrypt itemDominik Schürmann2014-10-071-1/+0
* Certify designDominik Schürmann2014-10-071-1/+1
* Certify designDominik Schürmann2014-10-072-96/+114
* forgot layout piece for 096f6e436Vincent Breitmoser2014-10-061-3/+5
* move "synchronize" checkbox to bottom section as wellVincent Breitmoser2014-10-061-17/+14
* multicertify: move key spinner to the bottomVincent Breitmoser2014-10-064-45/+33
* Merge branch 'jacobshack-certify' of github.com:open-keychain/open-keychain i...Vincent Breitmoser2014-10-057-35/+9
|\
| * UI stuffDominik Schürmann2014-10-057-35/+9
* | add support for second line in log viewVincent Breitmoser2014-10-051-28/+61