aboutsummaryrefslogtreecommitdiffstats
path: root/app
Commit message (Collapse)AuthorAgeFilesLines
* Update to Robolectric 3.0Kenny Root2015-07-167-1/+1040
| | | | | | This has better support for Android, so we don't need the separate project here anymore. Simply move all the existing robolectric-based tests to the app directory and remove the robolectric-tests subproject.
* Update build-tools version to 22.0.1Kenny Root2015-07-161-1/+1
|
* Rename logtag values to fit in 23 charactersKenny Root2015-07-1620-20/+20
|
* Address review comments.Jeremy Klein2015-07-151-18/+17
|
* Add the v4 support library and update the notification API.Jeremy Klein2015-07-154-34/+40
| | | | | | Switch to using NotificationCompat.Builder. This will allow for the creation of a "disconnect all" button in the notification (see #93).
* fix merge errorKenny Root2015-07-151-1/+1
|
* Merge branch 'master' into gradle-conversionKenny Root2015-07-151-4/+4
|
* Merge branch 'master' into gradle-conversionKenny Root2015-07-156-5/+45
|
* Upgrade to new Android Studio metafilesKenny Root2015-06-091-6/+4
|
* Merge branch 'master' into gradle-conversionKenny Root2015-06-091-10/+1
|
* Merge branch 'master' into gradle-conversionKenny Root2015-06-091-4/+1
|
* Scale entropy dialog text with display densityKenny Root2015-06-091-1/+1
|
* Merge branch 'master' into gradle-conversionKenny Root2015-06-092-3/+4
|
* Merge branch 'master' into gradle-conversionKenny Root2015-06-012-3/+3
|
* Merge branch 'master' into gradle-conversionKenny Root2015-04-192-5/+25
|
* Merge branch 'master' into gradle-conversionKenny Root2015-04-193-67/+22
|
* Merge branch 'master' into gradle-conversionKenny Root2015-04-171-2/+2
|
* Merge branch 'master' into gradle-conversionKenny Root2015-04-161-15/+11
|
* Merge branch 'master' into gradle-conversionKenny Root2015-04-1430-103/+3
|
* Merge branch 'master' into gradle-conversionKenny Root2015-04-052-3/+3
|
* Merge branch 'master' into gradle-conversionKenny Root2015-04-051-1/+1
|
* Merge branch 'master' into gradle-conversionKenny Root2015-04-052-3/+8
|
* Merge branch 'master' into gradle-conversionKenny Root2015-04-021-2/+2
|
* Merge branch 'master' into gradle-conversionKenny Root2015-04-023-0/+10
|
* Merge branch 'master' into gradle-conversionKenny Root2015-04-032-9/+28
|
* 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
|
* Merge branch 'master' into gradle-conversionKenny Root2015-03-282-4/+7
|
* Merge branch 'master' into gradle-conversionKenny Root2015-03-281-1/+5
|
* Merge branch 'master' into gradle-conversionKenny Root2015-03-2711-21/+52
| | | | Change-Id: I4ea022cf42d3aea8e52d8e4fbd604575c109df1d
* Merge branch 'master' into gradle-conversionKenny Root2015-03-271-0/+5
|
* Merge branch 'master' into gradle-conversionKenny Root2015-03-273-58/+74
|
* Merge branch 'master' into gradle-conversionKenny Root2015-03-275-5/+31
|
* Merge branch 'master' into gradle-conversionKenny Root2015-03-271-1/+0
|
* Merge branch 'master' into gradle-conversionKenny Root2015-03-274-158/+211
| | | | | Conflicts: app/src/main/java/org/connectbot/util/UberColorPickerDialog.java
* Update translationsKenny Root2015-03-2645-72/+53
|
* Add translation gradle tasksKenny Root2015-03-263-0/+4
|
* Move notification icons to correct directoryKenny Root2015-03-263-0/+0
|
* Merge branch 'master' into gradle-conversionKenny Root2015-03-267-9/+52
|
* Merge branch 'master' into gradle-conversionKenny Root2015-03-261-0/+2
|
* Merge branch 'master' into gradle-conversionKenny Root2015-03-261-0/+3
|
* Merge branch 'master' into gradle-conversionKenny Root2015-03-261-0/+1
|
* Add some whitespace rules and fixes for themKenny Root2015-03-2325-219/+234
|
* Clean up some import style violationsKenny Root2015-03-234-12/+7
|
* Update Android Studio configsKenny Root2015-03-231-1/+2
|
* checkstyle: fix leading spacesKenny Root2015-03-231-1/+1
|
* Merge remote-tracking branch 'origin/master'Kenny Root2015-03-2342-272/+201
| | | | | | Conflicts: app/src/main/java/org/connectbot/HostListActivity.java app/src/main/java/org/connectbot/service/TerminalKeyListener.java
* Update to latest build systemKenny Root2015-03-232-8/+12
|
* Merge branch 'master' into gradle-conversionKenny Root2014-10-211-16/+27
|
* Merge branch 'master' into gradle-conversionKenny Root2014-10-197-0/+0
| | | | Change-Id: I77af95fa7ddb22c99f13f0770daba02a98bcf5b7