Commit message (Collapse) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
* | Merge branch 'master' into gradle-conversion | Kenny Root | 2015-03-27 | 4 | -158/+211 | |
| | | | | | 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 | |
| | ||||||
* | Add some whitespace rules and fixes for them | Kenny Root | 2015-03-23 | 25 | -219/+234 | |
| | ||||||
* | Clean up some import style violations | Kenny Root | 2015-03-23 | 4 | -12/+7 | |
| | ||||||
* | checkstyle: fix leading spaces | Kenny Root | 2015-03-23 | 1 | -1/+1 | |
| | ||||||
* | Merge remote-tracking branch 'origin/master' | Kenny Root | 2015-03-23 | 42 | -272/+201 | |
| | | | | | | 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 | |||||
* | Merge branch 'master' into gradle-conversion | Kenny Root | 2014-10-18 | 1 | -2/+2 | |
| | ||||||
* | Fix keyType layout and space out buttons a bit | Kenny Root | 2014-10-18 | 1 | -4/+6 | |
| | | | | Change-Id: Idd46bb2ada1ff7ac934d5e20faee97842a990102 | |||||
* | Disable EC generation when no support | Kenny Root | 2014-10-18 | 1 | -0/+7 | |
| | | | | Change-Id: I1d03afa0a37cfa2779e1264aaf16052c6539640f | |||||
* | Add class hiding for KeyEvent debugging | Kenny Root | 2014-10-18 | 1 | -3/+54 | |
| | | | | Change-Id: Id34acf00f9ec538d81b72b970ae1990c6ed36510 | |||||
* | Merge branch 'master' into gradle-conversion | Kenny Root | 2014-10-18 | 7 | -8/+32 | |
| | ||||||
* | Revert "Add BuildConfig stuff instead of msg_version" | Kenny Root | 2014-10-03 | 4 | -14/+5 | |
| | | | | This reverts commit d2eb6b37b3910f404f229625a39a11954fac681d. | |||||
* | Fix API usage for StrictModeSetup | Kenny Root | 2014-10-02 | 2 | -9/+11 | |
| | ||||||
* | Add BuildConfig stuff instead of msg_version | Kenny Root | 2014-10-02 | 4 | -5/+14 | |
| | ||||||
* | Fix tabs violations | Kenny Root | 2014-10-01 | 8 | -26/+26 | |
| | ||||||
* | Add some TargetApi annotations to appease lint | Kenny Root | 2014-10-01 | 5 | -4/+18 | |
| | ||||||
* | Convert to gradle build system | Kenny Root | 2014-10-01 | 330 | -0/+60733 | |