aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'master' into gradle-conversionKenny Root2015-04-032-9/+28
|\
| * Check for EC support before enabling itKenny Root2015-04-031-6/+24
| | | | | | | | Fixes #69
| * Break circle since connectionLost should not call closeKenny Root2015-04-031-2/+2
| |
| * Fix JavaDoc (okay, not much of an improvement)Kenny Root2015-04-031-1/+2
| |
| * Return empty port forward list if host arg is nullKenny Root2015-03-291-1/+4
| | | | | | | | | | There would be a NullPointerException if the host passed in was null, so just preclude it by checking.
* | Return empty port forward list if host arg is nullKenny Root2015-03-291-1/+4
| | | | | | | | | | There would be a NullPointerException if the host passed in was null, so just preclude it by checking.
* | Merge branch 'master' into gradle-conversionKenny Root2015-03-281-4/+1
|\|
| * Fix last merge request to not undo final of bridgeKenny Root2015-03-281-4/+1
| | | | | | | | Change-Id: I47a0d6a0dfcdf735f26dcc09dc4b98d58cb0aa33
* | Merge branch 'master' into gradle-conversionKenny Root2015-03-282-4/+7
|\|
| * Fix indentation in last pull requestKenny Root2015-03-282-4/+5
| | | | | | | | Change-Id: Ib80ec5184ae7b329979580fd0a0c187f8ac01fbf
| * Merge pull request #60 from sblackshear/service_npe_fixKenny Root2015-03-291-1/+3
| |\ | | | | | | Fix possible NPE in HostListActivity.onCreateContextMenu
| | * Fix possible NPE in HostListActivity.onCreateContextMenuSam Blackshear2015-03-201-1/+3
| | |
| * | Merge pull request #61 from sblackshear/pubkeylist_npe_fixKenny Root2015-03-291-2/+2
| |\ \ | | | | | | | | Fixing possible NPE in PubkeyListActivity
| | * | Fixing possible NPE in PubkeyListActivitySam Blackshear2015-03-251-2/+2
| | |/
* | | Merge branch 'master' into gradle-conversionKenny Root2015-03-281-0/+516
|\| |
| * | Fix typo in new translationsKenny Root2015-03-281-1/+1
| | | | | | | | | | | | Change-Id: I64e8f92ea6a6c58b204bf94eee3820e72bd0d578
| * | Merge pull request #68 from pejakm/srtrKenny Root2015-03-291-0/+516
| |\ \ | | | | | | | | Add Serbian translation
| | * | Add Serbian translationMladen Pejaković2015-03-281-0/+516
| |/ /
* | | Merge branch 'master' into gradle-conversionKenny Root2015-03-281-1/+5
|\| |
| * | Localize numbers in ColorsActivityKenny Root2015-03-281-1/+5
| | |
* | | Merge branch 'master' into gradle-conversionKenny Root2015-03-2711-21/+52
|\| | | | | | | | | | | Change-Id: I4ea022cf42d3aea8e52d8e4fbd604575c109df1d
| * | Update translationsKenny Root2015-03-2712-49/+61
| | | | | | | | | | | | Change-Id: Iabc1d6dee20517eba48e22c72784b2d06f887651
* | | Merge branch 'master' into gradle-conversionKenny Root2015-03-271-0/+5
|\| |
| * | Do not try to resize local PTY before connectionKenny Root2015-03-271-0/+5
| | | | | | | | | | | | | | | | | | | | | At that point shellFd is null and trying to get a field from it via JNI will cause the runtime to abort. Fixes #65
* | | Merge branch 'master' into gradle-conversionKenny Root2015-03-273-58/+74
|\| |
| * | Use a sane default font sizeKenny Root2015-03-273-58/+74
| | | | | | | | | | | | | | | | | | | | | This will also try to scale existing host entries down by the appropriate amount. Fixes #44
* | | Android Studio: add inspection profilesKenny Root2015-03-271-0/+11
| | |
* | | Merge branch 'master' into gradle-conversionKenny Root2015-03-275-5/+31
|\| |
| * | Add a close-on-disconnect optionmendhak2015-03-275-5/+31
| | | | | | | | | | | | | | | | | | | | | | | | Defaults to off to preserve previous behavior. Original patch by Jeff King (@peff) Fixes #23
* | | Merge branch 'master' into gradle-conversionKenny Root2015-03-271-1/+0
|\| |
| * | Remove newer API level layout parameterKenny Root2015-03-271-1/+0
| | |
* | | Merge branch 'master' into gradle-conversionKenny Root2015-03-276-158/+211
|\| | | | | | | | | | | | | | Conflicts: app/src/main/java/org/connectbot/util/UberColorPickerDialog.java
| * | Make the color picker scale with display densityKenny Root2015-03-274-165/+217
| | | | | | | | | | | | | | | | | | | | | | | | The UberColorPickerDialog was written when there was only one display density (mdpi). Scale all of the values appropriately for modern multi-density displays. Fixes #64
| * | Move new scaled icons out of res/ because they're not allowed in therePaul "LeoNerd" Evans2015-03-262-0/+0
| | |
| * | Added 64px and 14px rescaled versions of the icon, for launchpad brandingPaul "LeoNerd" Evans2015-03-262-0/+0
| | |
* | | Update translationsKenny Root2015-03-2645-72/+53
| | |
* | | Do not overquote the a2po argsKenny Root2015-03-261-1/+1
| | |
* | | Add translation gradle tasksKenny Root2015-03-264-0/+86
| | |
* | | Move notification icons to correct directoryKenny Root2015-03-263-0/+0
| | |
* | | Merge branch 'master' into gradle-conversionKenny Root2015-03-267-9/+52
|\| |
| * | Update translationsKenny Root2015-03-267-9/+52
| | | | | | | | | | | | Change-Id: I7973910fc038dc7d593f0e516d6a4fcd8c41f63a
* | | Merge branch 'master' into gradle-conversionKenny Root2015-03-261-0/+2
|\| |
| * | Add updated zh_TW translationsKenny Root2015-03-261-0/+2
| | | | | | | | | | | | Change-Id: If5cf2e451c92313eb727de535861dbc9791ed5ed
* | | Merge branch 'master' into gradle-conversionKenny Root2015-03-261-0/+3
|\| |
| * | Add translation context for description stringsKenny Root2015-03-261-0/+3
| | | | | | | | | | | | Change-Id: Iea226b10973fe418d3a8e3bf6f5067dd0b1ded26
* | | Merge branch 'master' into gradle-conversionKenny Root2015-03-261-0/+1
|\| |
| * | Add context for new sticky key modifier preferenceKenny Root2015-03-261-0/+1
| | | | | | | | | | | | Change-Id: If34064f1dd42ebdc3887a54fc51ee16a0119687e
* | | Android Studio: try to make code format match existingKenny Root2015-03-241-0/+5
| | |
* | | Add some whitespace rules and fixes for themKenny Root2015-03-2326-219/+245
| | |
* | | travis: also cache gradle distsKenny Root2015-03-231-0/+1
| | |