aboutsummaryrefslogtreecommitdiffstats
path: root/OpenKeychain/src/main/res
Commit message (Collapse)AuthorAgeFilesLines
* Changelog 3.1.1Dominik Schürmann2014-10-301-0/+6
|
* Pull from transifexDominik Schürmann2014-10-2620-0/+220
|
* Pull from transifexDominik Schürmann2014-10-2656-878/+3333
|
* Changelog 3.1Dominik Schürmann2014-10-261-0/+12
|
* Rename multi certify files to certifyDominik Schürmann2014-10-265-299/+85
|
* Display error on certification attempt with yubikeyVincent Breitmoser2014-10-261-0/+1
| | | | Closes #978
* Merge branch 'development' of github.com:open-keychain/open-keychain into ↵Vincent Breitmoser2014-10-261-4/+4
|\ | | | | | | development
| * Use new safe slinger activity from share tabDominik Schürmann2014-10-261-4/+4
| |
* | add descriptive text to safeslinger activityVincent Breitmoser2014-10-263-16/+36
|/
* Merge branch 'development' of github.com:open-keychain/open-keychain into ↵Dominik Schürmann2014-10-261-1/+1
|\ | | | | | | development
| * implement upload of keyring after certification, check that option by defaultVincent Breitmoser2014-10-261-1/+1
| |
* | Move advanced info into own activityDominik Schürmann2014-10-266-80/+111
|/
* Merge branch 'development' of github.com:open-keychain/open-keychain into ↵Dominik Schürmann2014-10-261-0/+1
|\ | | | | | | development
| * Merge branch 'development' of github.com:open-keychain/open-keychain into ↵Vincent Breitmoser2014-10-263-12/+19
| |\ | | | | | | | | | development
| * | Retry canonicalization with pubkey self certs if first attempt failedVincent Breitmoser2014-10-261-0/+1
| | | | | | | | | | | | Fixes #974
* | | Fixes from transifexDominik Schürmann2014-10-261-37/+37
| |/ |/|
* | Move some multi select items in overflow menu, rename importDominik Schürmann2014-10-262-8/+15
| |
* | Fix layout of select key adapterDominik Schürmann2014-10-261-4/+4
|/
* Remove empty layoutDominik Schürmann2014-10-252-49/+1
|
* Remove tabs from import keys activityDominik Schürmann2014-10-251-7/+3
|
* Merge branch 'development' of github.com:open-keychain/open-keychain into ↵Dominik Schürmann2014-10-251-5/+5
|\ | | | | | | development
| * 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 ↵Vincent Breitmoser2014-10-253-11/+110
|\ | | | | | | development
| * Merge branch 'development' of github.com:open-keychain/open-keychain into ↵Dominik Schürmann2014-10-251-0/+10
| |\ | | | | | | | | | development
| * | 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
|\ | | | | Make the Certify screen a little more self-explanatory
| * 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
|