Merge branch 'master' into orgs

Conflicts:
	endpoints/api.py
	static/partials/new-repo.html
This commit is contained in:
Joseph Schorr 2013-11-04 14:59:00 -05:00
commit 633f603f9d
4 changed files with 25 additions and 6 deletions

View file

@ -20,7 +20,7 @@
</div>
<div class="container new-repo" ng-show="!user.anonymous && !creating && !uploading && !building">
<form method="post" name="newRepoForm" ng-submit="createNewRepo()">
<form method="post" name="newRepoForm" id="newRepoForm" ng-submit="createNewRepo()">
<!-- Header -->
<div class="row">
@ -32,7 +32,7 @@
<span class="namespace-selector" user="user" namespace="repo.namespace"></span>
<span style="color: #ccc">/</span>
<span class="name-container">
<input id="repoName" name="repoName" type="text" class="form-control" placeholder="Repository Name" ng-model="repo.name" required autofocus>
<input id="repoName" name="repoName" type="text" class="form-control" placeholder="Repository Name" ng-model="repo.name" required autofocus data-trigger="manual" data-content="{{ createError }}" data-placement="right">
</span>
</div>
</div>