Commit message (Collapse) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
* | Merge branch 'master' into gradle-conversion | Kenny Root | 2015-03-27 | 2 | -33/+35 | |
| | | | | | Conflicts: app/src/main/java/org/connectbot/util/UberColorPickerDialog.java | |||||
* | Update translations | Kenny Root | 2015-03-26 | 45 | -72/+53 | |
| | ||||||
* | Move notification icons to correct directory | Kenny Root | 2015-03-26 | 3 | -0/+0 | |
| | ||||||
* | Merge branch 'master' into gradle-conversion | Kenny Root | 2015-03-26 | 7 | -9/+52 | |
| | ||||||
* | Merge branch 'master' into gradle-conversion | Kenny Root | 2015-03-26 | 1 | -0/+2 | |
| | ||||||
* | Merge branch 'master' into gradle-conversion | Kenny Root | 2015-03-26 | 1 | -0/+3 | |
| | ||||||
* | Merge branch 'master' into gradle-conversion | Kenny Root | 2015-03-26 | 1 | -0/+1 | |
| | ||||||
* | Merge remote-tracking branch 'origin/master' | Kenny Root | 2015-03-23 | 37 | -257/+115 | |
| | | | | | | Conflicts: app/src/main/java/org/connectbot/HostListActivity.java app/src/main/java/org/connectbot/service/TerminalKeyListener.java | |||||
* | Merge branch 'master' into gradle-conversion | Kenny Root | 2014-10-21 | 1 | -16/+27 | |
| | ||||||
* | Merge branch 'master' into gradle-conversion | Kenny Root | 2014-10-19 | 7 | -0/+0 | |
| | | | | Change-Id: I77af95fa7ddb22c99f13f0770daba02a98bcf5b7 | |||||
* | Fix keyType layout and space out buttons a bit | Kenny Root | 2014-10-18 | 1 | -4/+6 | |
| | | | | Change-Id: Idd46bb2ada1ff7ac934d5e20faee97842a990102 | |||||
* | Merge branch 'master' into gradle-conversion | Kenny Root | 2014-10-18 | 5 | -3/+13 | |
| | ||||||
* | Revert "Add BuildConfig stuff instead of msg_version" | Kenny Root | 2014-10-03 | 2 | -2/+2 | |
| | | | | This reverts commit d2eb6b37b3910f404f229625a39a11954fac681d. | |||||
* | Add BuildConfig stuff instead of msg_version | Kenny Root | 2014-10-02 | 2 | -2/+2 | |
| | ||||||
* | Convert to gradle build system | Kenny Root | 2014-10-01 | 103 | -0/+9254 | |