Merge branch 'dev' of github.com:gogits/gogs into access

Conflicts:
	gogs.go
	models/models.go
	models/user.go
	templates/.VERSION
	templates/org/home.tmpl

diff --cc models/issue.go
Simple merge

diff --cc models/models.go
Simple merge

diff --cc models/org.go
Simple merge

diff --cc models/repo.go
Simple merge

diff --cc models/user.go
Simple merge

diff --cc modules/middleware/repo.go
Simple merge

diff --cc modules/setting/setting.go
Simple merge

diff --cc routers/api/v1/repo.go
Simple merge

diff --cc routers/repo/setting.go
Simple merge

diff --cc templates/.VERSION
index 3e22111f8cf2bbf1a4c9917cef7e526c836918e8,b9cd4a186a115865534367e7fe2f6eee35ba5865..056f3141af17e6b2c608d9794ccffef0ecffa3f4
--- 1/templates/.VERSION
--- 2/templates/.VERSION
+++ b/templates/.VERSION
@@@ -1,1 -1,1 +1,1 @@@
- 0.5.14.0213 Beta
 -0.5.14.0222 Beta
++0.5.14.0222 Beta

diff --cc templates/org/home.tmpl
index 4929a881983e032428f52634edc7444bafe4e7c1,df29d61fc4a5b6b2c6b2d6fcc428b6405c823c8f..fdce06a298b4f9f765160e539a7fa14e3721b28f
--- 1/templates/org/home.tmpl
--- 2/templates/org/home.tmpl
+++ b/templates/org/home.tmpl
@@@ -19,75 -19,75 +19,75 @@@
  </div>
  <div class="container">
        {{$isMember := .Org.IsOrgMember $.SignedUser.Id}}
-     <div id="org-home-repo-list" class="left grid-2-3">
-         <div class="clear">
-               {{if .IsOrganizationOwner}}
-             <a class="btn btn-green btn-large btn-link btn-radius right" href="{{AppSubUrl}}/repo/create?org={{.Org.Id}}"><i class="octicon octicon-repo-create"></i> {{.i18n.Tr "new_repo"}}</a>
-               {{end}}
-         </div>
-         <div id="org-repo-list">
-                       {{range .Repos}}
-                               {{if .HasAccess $.SignedUser}}
-                               <div class="org-repo-item">
-                     <ul class="org-repo-status right">
-                         <li><i class="octicon octicon-star"></i> {{.NumStars}}</li>
-                         <li><i class="octicon octicon-git-branch"></i> {{.NumForks}}</li>
-                     </ul>
-                                       <h2><a href="{{AppSubUrl}}/{{$.Org.Name}}/{{.Name}}">{{.Name}}</a></h2>
-                                       <p class="org-repo-description">{{.Description}}</p>
-                                       <p class="org-repo-updated">{{$.i18n.Tr "org.repo_updated"}} {{TimeSince .Updated $.i18n.Lang}}</p>
-                               </div>
-                               {{end}}
+   <div id="org-home-repo-list" class="left grid-2-3">
+     <div class="clear">
+               {{if .IsOrganizationOwner}}
+            <a class="btn btn-green btn-large btn-link btn-radius right" href="{{AppSubUrl}}/repo/create?org={{.Org.Id}}"><i class="octicon octicon-repo-create"></i> {{.i18n.Tr "new_repo"}}</a>
+               {{end}}
+     </div>
+     <div id="org-repo-list">
+               {{range .Repos}}
 -                      {{if or (not .IsPrivate) (.HasAccess $.SignedUser.Name)}}
++                      {{if or (not .IsPrivate) (.HasAccess $.SignedUser)}}
+                       <div class="org-repo-item">
+         <ul class="org-repo-status right">
+           <li><i class="octicon octicon-star"></i> {{.NumStars}}</li>
+           <li><i class="octicon octicon-git-branch"></i> {{.NumForks}}</li>
+         </ul>
+                               <h2><a href="{{AppSubUrl}}/{{$.Org.Name}}/{{.Name}}">{{.Name}}</a></h2>
+                               <p class="org-repo-description">{{.Description}}</p>
+                               <p class="org-repo-updated">{{$.i18n.Tr "org.repo_updated"}} {{TimeSince .Updated $.i18n.Lang}}</p>
+                       </div>
                        {{end}}
-         </div>
+               {{end}}
      </div>
-     <div class="grid-1-3 right">
-       <div class="org-sidebar">
-               <div class="panel panel-radius">
-                       <div class="panel-header">
-                               {{if $isMember}}
-                               <a class="text-grey right" href="{{AppSubUrl}}/org/{{.Org.LowerName}}/members"><strong>{{.Org.NumMembers}}</strong><span class="octicon octicon-chevron-right"></span></a>
-                               {{end}}
-                               <strong>{{.i18n.Tr "org.people"}}</strong>
-                       </div>
-                       <div class="panel-body member-avatar-group">
-                               {{range .Members}}
+   </div>
+   <div class="grid-1-3 right">
+       <div class="org-sidebar">
+       <div class="panel panel-radius">
+               <div class="panel-header">
+                       {{if $isMember}}
+                       <a class="text-grey right" href="{{AppSubUrl}}/org/{{.Org.LowerName}}/members"><strong>{{.Org.NumMembers}}</strong><span class="octicon octicon-chevron-right"></span></a>
+                       {{end}}
+                       <strong>{{.i18n.Tr "org.people"}}</strong>
+               </div>
+               <div class="panel-body member-avatar-group">
+                       {{range .Members}}
                                                {{if or $isMember (.IsPublicMember $.Org.Id)}}
-                                       <a href="{{AppSubUrl}}/{{.Name}}" title="{{.Name}}"><img src="{{.AvatarLink}}"></a>
-                                       {{end}}
+                               <a href="{{AppSubUrl}}/{{.Name}}" title="{{.Name}}"><img src="{{.AvatarLink}}"></a>
                                {{end}}
-                       </div>
-                       {{if .IsOrganizationOwner}}
-                       <div class="panel-footer">
-                               <a class="btn btn-medium btn-blue btn-link btn-radius" href="{{AppSubUrl}}/org/{{.Org.LowerName}}/invitations/new">{{.i18n.Tr "org.invite_someone"}}</a>
-                       </div>
-                       {{end}}
-               </div>
-               {{if $isMember}}
-               <br>
-               <div class="panel panel-radius">
-                       <div class="panel-header">
-                               <a class="text-grey right" href="{{AppSubUrl}}/org/{{.Org.LowerName}}/teams"><strong>{{.Org.NumTeams}}</strong><span class="octicon octicon-chevron-right"></span></a>
-                               <strong>{{.i18n.Tr "org.teams"}}</strong>
-                       </div>
-                       <div class="panel-body" id="org-home-team-list">
-                               <ul>
-                                       {{range .Teams}}
-                                       <li>
-                                               <a class="text-black" href="{{AppSubUrl}}/org/{{$.Org.LowerName}}/teams/{{.LowerName}}"><strong class="team-name">{{.Name}}</strong></a>
-                                               <p class="team-meta">{{.NumMembers}} {{$.i18n.Tr "org.lower_members"}} · {{.NumRepos}} {{$.i18n.Tr "org.lower_repositories"}}</p>
-                                       </li>
-                                       {{end}}
-                               </ul>
-                       </div>
-                       {{if .IsOrganizationOwner}}
-                       <div class="panel-footer">
-                               <a class="btn btn-medium btn-blue btn-link btn-radius" href="{{AppSubUrl}}/org/{{$.Org.LowerName}}/teams/new">{{.i18n.Tr "org.create_new_team"}}</a>
-                       </div>
-                       {{end}}
-               </div>
-               {{end}}
+                       {{end}}
+               </div>
+               {{if .IsOrganizationOwner}}
+               <div class="panel-footer">
+                       <a class="btn btn-medium btn-blue btn-link btn-radius" href="{{AppSubUrl}}/org/{{.Org.LowerName}}/invitations/new">{{.i18n.Tr "org.invite_someone"}}</a>
+               </div>
+               {{end}}
        </div>
-     </div>
+       {{if $isMember}}
+       <br>
+       <div class="panel panel-radius">
+               <div class="panel-header">
+                       <a class="text-grey right" href="{{AppSubUrl}}/org/{{.Org.LowerName}}/teams"><strong>{{.Org.NumTeams}}</strong><span class="octicon octicon-chevron-right"></span></a>
+                       <strong>{{.i18n.Tr "org.teams"}}</strong>
+               </div>
+               <div class="panel-body" id="org-home-team-list">
+                       <ul>
+                               {{range .Teams}}
+                               <li>
+                                       <a class="text-black" href="{{AppSubUrl}}/org/{{$.Org.LowerName}}/teams/{{.LowerName}}"><strong class="team-name">{{.Name}}</strong></a>
+                                       <p class="team-meta">{{.NumMembers}} {{$.i18n.Tr "org.lower_members"}} · {{.NumRepos}} {{$.i18n.Tr "org.lower_repositories"}}</p>
+                               </li>
+                               {{end}}
+                       </ul>
+               </div>
+               {{if .IsOrganizationOwner}}
+               <div class="panel-footer">
+                       <a class="btn btn-medium btn-blue btn-link btn-radius" href="{{AppSubUrl}}/org/{{$.Org.LowerName}}/teams/new">{{.i18n.Tr "org.create_new_team"}}</a>
+               </div>
+               {{end}}
+       </div>
+       {{end}}
+       </div>
+   </div>
  </div>
  {{template "ng/base/footer" .}}

diff --cc templates/user/profile.tmpl
Simple merge