fix invite bug(shouldn't include full name to search box)

diff --git a/cmd/web.go b/cmd/web.go
index 1da1f2500b34bae783f07dbb2f1c81dda49346e6..2251ea921845f51437c7b75e8ab463045b5d0892 100644 (file)
--- a/cmd/web.go
+++ b/cmd/web.go
@@ -75,9 +75,10 @@ func checkVersion() {
        // Check dependency version.
        checkers := []VerChecker{
                {"github.com/Unknwon/macaron", macaron.Version, "0.4.7"},
-               {"github.com/macaron-contrib/binding", binding.Version, "0.0.3"},
+               {"github.com/macaron-contrib/binding", binding.Version, "0.0.4"},
+               {"github.com/macaron-contrib/csrf", csrf.Version, "0.0.1"},
                {"github.com/macaron-contrib/i18n", i18n.Version, "0.0.4"},
-               {"github.com/macaron-contrib/session", session.Version, "0.0.5"},
+               {"github.com/macaron-contrib/session", session.Version, "0.1.0"},
        }
        for _, c := range checkers {
                ver := strings.Join(strings.Split(c.Version(), ".")[:3], ".")

diff --git a/gogs.go b/gogs.go
index c8053b28000e46340a39a993da3b824bc951385a..04141dad3dd7125b6f00a0a13b7dc1f0fb3994c7 100644 (file)
--- a/gogs.go
+++ b/gogs.go
@@ -17,7 +17,7 @@ import (
        "github.com/gogits/gogs/modules/setting"
 )
 
-const APP_VER = "0.5.9.1217 Beta"
+const APP_VER = "0.5.10.1222 Beta"
 
 func init() {
        runtime.GOMAXPROCS(runtime.NumCPU())

diff --git a/public/ng/js/gogs.js b/public/ng/js/gogs.js
index ee14fb401f5feb5af2be8d95d5ee5029cd28005e..ff38bda9d6c0764b4ef59671d2650a25e47f7258 100644 (file)
--- a/public/ng/js/gogs.js
+++ b/public/ng/js/gogs.js
@@ -214,7 +214,7 @@ var Gogs = {};
                 if (json.ok && json.data.length) {
                     var html = '';
                     $.each(json.data, function (i, item) {
-                        html += '<li><a><img src="' + item.avatar_url + '">' + item.username;
+                        html += '<li><a><img src="' + item.avatar_url + '"><span class="username">' + item.username + '</span>';
                         if (notEmpty(item.full_name)) {
                           html += ' (' + item.full_name + ')';
                         }
@@ -571,7 +571,7 @@ function initInvite() {
             $ul.toggleShow();
         }
     }).next().next().find('ul').on("click", 'li', function () {
-        $('#org-member-invite').val($(this).text());
+        $('#org-member-invite').val($(this).find('.username').text());
         $ul.toggleHide();
     });
 }

diff --git a/templates/.VERSION b/templates/.VERSION
index a4d3f0f947035676684406263adb8ca227a52f8a..801600a4bd7e025d87fc947ec14f9e0a33df5d23 100644 (file)
--- a/templates/.VERSION
+++ b/templates/.VERSION
@@ -1 +1 @@
-0.5.9.1217 Beta
\ No newline at end of file
+0.5.10.1222 Beta
\ No newline at end of file