aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* local build changesHEADmasterhsm2016-05-291-2/+10
* support for open-keychain authhsm2016-05-294-3/+34
* Merge pull request #400 from kruton/update-to-2.2.4Kenny Root2016-05-191-1/+1
|\
| * Update to sshlib 2.2.4Kenny Root2016-05-191-1/+1
|/
* Merge pull request #393 from toff/sessionless_busy_loop_fixKenny Root2016-03-271-6/+8
|\
| * Avoid creating relay thread in sessionless modeToff2016-03-271-6/+8
|/
* Merge pull request #383 from kruton/auth-agent-ec-keysKenny Root2016-03-141-0/+6
|\
| * Handle EC keys in auth agent scenariosKenny Root2016-03-141-0/+6
|/
* Merge pull request #381 from kruton/hostkey-fixKenny Root2016-03-111-11/+14
|\
| * Make sure new known hosts are inserted and deletedKenny Root2016-03-111-11/+14
|/
* Merge pull request #375 from trygveaa/fix/show-action-bar-on-clickKenny Root2016-03-081-5/+5
|\
| * Make sure the action bar is always shown on clickTrygve Aaberge2016-03-061-5/+5
|/
* Merge pull request #379 from kruton/fix-travisKenny Root2016-03-051-4/+1
|\
| * Try to work around bug in Travis buildKenny Root2016-03-041-4/+1
|/
* Merge pull request #374 from kruton/dep-upgradesKenny Root2016-02-211-4/+4
|\
| * Update dependency minor versionsKenny Root2016-02-211-4/+4
|/
* Merge pull request #373 from kruton/multiple-hostkeysKenny Root2016-02-215-38/+180
|\
| * Support multiple known keys per hostKenny Root2016-02-215-38/+180
|/
* Merge pull request #372 from kruton/update-translationsKenny Root2016-01-254-2/+38
|\
| * Update translationsKenny Root2016-01-254-2/+38
|/
* Merge pull request #371 from kruton/stairstep-effectKenny Root2016-01-252-11/+21
|\
| * Avoid stair-stepping local text outputKenny Root2016-01-242-11/+21
* | Merge pull request #370 from kruton/sshlib-upgradeKenny Root2016-01-251-1/+1
|\ \ | |/
| * Upgrade to sshlib 2.2.3Kenny Root2016-01-241-1/+1
|/
* Merge pull request #364 from arthurhsu/disconnectallJeremy Klein2016-01-082-11/+25
|\
| * Fix review commentsArthur Hsu2016-01-071-2/+1
| * Add DisconnectAll to HostActivity's Options.Arthur Hsu2016-01-072-11/+26
|/
* Merge pull request #360 from kruton/upgrade-sshlibKenny Root2015-12-283-10/+11
|\
| * Update to version 2.2.2 of sshlibKenny Root2015-12-281-1/+1
| * Update instrumentation tests for new source layoutKenny Root2015-12-282-9/+10
|/
* Merge pull request #354 from kruton/translationsKenny Root2015-12-172-0/+33
|\
| * Update translationsKenny Root2015-12-162-0/+33
|/
* Release 1.9.0-alpha1Kenny Root2015-11-233-4/+5
* Update changelogKenny Root2015-11-231-3/+14
* Merge pull request #337 from kruton/contribution-guidelinesKenny Root2015-11-061-0/+60
|\
| * Add contribution guidelinesKenny Root2015-11-061-0/+60
* | Merge pull request #330 from alescdb/keyboard-always-visibleKenny Root2015-11-066-7/+40
|\ \
| * \ Merge branch 'master' into keyboard-always-visibleAlex2015-10-2612-0/+18
| |\ \
| * | | Better context for translatorsAlex2015-10-261-1/+1
| * | | Better context for translatorsAlex2015-10-261-1/+1
| * | | Merge branch 'master' into keyboard-always-visibleAlex2015-10-2642-181/+0
| |\ \ \
| * | | | Extra tabs removedalescdb2015-10-241-1/+1
| * | | | Restore (unused) ns in string.xlmalescdb2015-10-241-1/+2
| * | | | Resource context & french translationalescdb2015-10-242-2/+4
| * | | | Restore imports orderalescdb2015-10-241-14/+13
| * | | | Update ConsoleActivity.javaAlex2015-10-241-3/+0
| * | | | Remove summary and change titlealescdb2015-10-233-4/+1
| * | | | Code style (xml) spaces -> tabalescdb2015-10-231-4/+3
| * | | | Code stylealescdb2015-10-231-16/+17
| * | | | Code stylealescdb2015-10-234-44/+44