James Moger
2014-05-07 337e2a0406d56b0b05012eb8e3bc1a393502f714
Merge branch 'ticket/63' into develop
1 files added
3 files modified
21 ■■■■■ changed files
releases.moxie 3 ●●●●● patch | view | raw | blame | history
src/main/distrib/data/clientapps.json 11 ●●●●● patch | view | raw | blame | history
src/main/java/com/gitblit/Constants.java 7 ●●●● patch | view | raw | blame | history
src/main/resources/tortoise32.png patch | view | raw | blame | history
releases.moxie
@@ -16,6 +16,7 @@
    - Fix forcing default locale to en or LANG_CC for web ui (ticket-51)
    - Fix inconsistency with repository ownership permission checking (ticket-52)
    - Prevent submission from New|Edit ticket page with empty titles (ticket-53)
    - Fix transport determination for SSH urls served on port 22 (issue-421, ticket-63)
    changes:
    - improve French translation (pr-176)
    - simplify current plugin release detection and ignore the currentRelease registry field
@@ -31,6 +32,8 @@
    - Olivier Rouits
    - Owen Nelson
    - Alexander Zabluda
    - Philipp Beckmann
    - Jakob Boysen
}
#
src/main/distrib/data/clientapps.json
@@ -89,5 +89,16 @@
        "icon": "sparkleshare_32x32.png",
        "minimumPermission" : "RW+",
        "isActive": false
    },
    {
        "name": "TortoiseGit",
        "title": "TortoiseGit",
        "description": "Windows Shell Interface to Git",
        "legal": "released under the GPLv2 open source license",
        "cloneUrl": "tgit://clone/${repoUrl}",
        "productUrl": "http://www.tortoisegit.org",
        "platforms": [ "windows" ],
        "icon": "tortoise32.png",
        "isActive": true
    }
]
src/main/java/com/gitblit/Constants.java
@@ -556,7 +556,12 @@
        }
        public static Transport fromUrl(String url) {
            String scheme = url.substring(0, url.indexOf("://"));
            int delim = url.indexOf("://");
            if (delim == -1) {
                // if no protocol is specified, SSH is assumed by git clients
                return SSH;
            }
            String scheme = url.substring(0, delim);
            return fromString(scheme);
        }
    }
src/main/resources/tortoise32.png