mirror of
				https://github.com/go-gitea/gitea.git
				synced 2025-10-31 18:12:20 +01:00 
			
		
		
		
	Merge branch 'master' of github.com:gogits/gogs
This commit is contained in:
		
						commit
						defcc9374b
					
				
							
								
								
									
										2
									
								
								gogs.go
									
									
									
									
									
								
							
							
						
						
									
										2
									
								
								gogs.go
									
									
									
									
									
								
							| @ -19,7 +19,7 @@ import ( | ||||
| // Test that go1.1 tag above is included in builds. main.go refers to this definition. | ||||
| const go11tag = true | ||||
| 
 | ||||
| const APP_VER = "0.0.0.0225" | ||||
| const APP_VER = "0.0.0.0301" | ||||
| 
 | ||||
| func init() { | ||||
| 	runtime.GOMAXPROCS(runtime.NumCPU()) | ||||
|  | ||||
| @ -4,9 +4,10 @@ import ( | ||||
| 	"fmt" | ||||
| 	"os" | ||||
| 	"os/exec" | ||||
| 	"os/user" | ||||
| 	"path/filepath" | ||||
| 	"time" | ||||
| 
 | ||||
| 	"github.com/Unknwon/com" | ||||
| ) | ||||
| 
 | ||||
| var ( | ||||
| @ -27,11 +28,11 @@ func exePath() (string, error) { | ||||
| } | ||||
| 
 | ||||
| func homeDir() string { | ||||
| 	user, err := user.Current() | ||||
| 	home, err := com.HomeDir() | ||||
| 	if err != nil { | ||||
| 		return "/" | ||||
| 	} | ||||
| 	return user.HomeDir | ||||
| 	return home | ||||
| } | ||||
| 
 | ||||
| func init() { | ||||
| @ -68,7 +69,7 @@ func AddPublicKey(key *PublicKey) error { | ||||
| 	if err != nil { | ||||
| 		_, err2 := orm.Delete(key) | ||||
| 		if err2 != nil { | ||||
| 			// TODO: logo the error | ||||
| 			// TODO: log the error | ||||
| 		} | ||||
| 		return err | ||||
| 	} | ||||
|  | ||||
| @ -85,8 +85,7 @@ body { | ||||
| } | ||||
| 
 | ||||
| /* gogits login card */ | ||||
| #gogs-login-card { | ||||
|     width: 600px; | ||||
| .gogs-card{ | ||||
|     margin: auto; | ||||
|     padding: 30px; | ||||
|     background: #fff; | ||||
| @ -95,13 +94,17 @@ body { | ||||
|     box-sizing: border-box; | ||||
| } | ||||
| 
 | ||||
| #gogs-login-card h3 { | ||||
| .gogs-card h3 { | ||||
|     margin-top: 0; | ||||
|     margin-bottom: 30px; | ||||
|     padding-bottom: 20px; | ||||
|     border-bottom: 1px solid #ccc; | ||||
| } | ||||
| 
 | ||||
| #gogs-login-card{ | ||||
|     width: 600px; | ||||
| } | ||||
| 
 | ||||
| #gogs-login-card .form-control { | ||||
|     padding: 6px 12px; | ||||
|     box-sizing: content-box; | ||||
| @ -112,7 +115,7 @@ body { | ||||
|     line-height: 30px; | ||||
| } | ||||
| 
 | ||||
| #gogs-login-card .btn{ | ||||
| .gogs-card .btn{ | ||||
|     cursor: pointer; | ||||
|     margin-right: 1.2em; | ||||
| } | ||||
| @ -170,4 +173,14 @@ body { | ||||
| 
 | ||||
| #gogs-user-act-tabs li.active a{ | ||||
|     border-bottom-color: #ddd; | ||||
| } | ||||
| 
 | ||||
| /* gogits repo create */ | ||||
| 
 | ||||
| #gogs-repo-create{ | ||||
|     width: 800px; | ||||
| } | ||||
| 
 | ||||
| #gogs-repo-create textarea[name=desc]{ | ||||
|     height: 8em; | ||||
| } | ||||
							
								
								
									
										
											BIN
										
									
								
								public/img/checkmark.png
									
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										
											BIN
										
									
								
								public/img/checkmark.png
									
									
									
									
									
										Normal file
									
								
							
										
											Binary file not shown.
										
									
								
							| After Width: | Height: | Size: 169 B | 
| @ -1,24 +1,57 @@ | ||||
| {{template "base/head" .}} | ||||
| {{template "base/navbar" .}} | ||||
| <div class="container"> | ||||
| 	<form action="/repo/create" method="post" class="form-horizontal"> | ||||
| 		<div class="form-group"> | ||||
| <div class="col-md-offset-4 col-md-3"> | ||||
| 				Owner: <input name="userId" type="hidden" value="1"/>lunny | ||||
| 			</div> | ||||
| 			<div class="col-md-offset-4 col-md-3"> | ||||
| 		    	repo name: <input name="name" type="text"/> | ||||
| 		    </div> | ||||
| 		    <div class="col-md-offset-4 col-md-3"> | ||||
| 		    	description(optional): <input name="desc" type="text"/> | ||||
| 		    	</div> | ||||
| 		    	<div class="col-md-offset-4 col-md-3"> | ||||
| 			 | ||||
| 			</div> | ||||
| 		    	<div class="col-md-offset-4 col-md-3"> | ||||
| 		    	<button type="submit" class="btn btn-info">Create repository</button> | ||||
| 		    </div> | ||||
| 		</div> | ||||
| 	</form> | ||||
| <div class="container" id="gogs-body"> | ||||
|     <form action="/repo/create" method="post" class="form-horizontal gogs-card" id="gogs-repo-create"> | ||||
|         <h3>Create New Repository</h3> | ||||
|         <div class="form-group"> | ||||
|             <label class="col-md-2 control-label">Owner<strong class="text-danger">*</strong></label> | ||||
|             <div class="col-md-8"> | ||||
|                 <p class="form-control-static">Owner-name</p> | ||||
|                 <input type="hidden" value="1" name="user-id"/> | ||||
|             </div> | ||||
|         </div> | ||||
|         <div class="form-group"> | ||||
|             <label class="col-md-2 control-label">Repository<strong class="text-danger">*</strong></label> | ||||
|             <div class="col-md-8"> | ||||
|                 <input name="repo" type="text" class="form-control" placeholder="Type your repository name"> | ||||
|                 <span class="help-block">Great repository names are short and memorable. </span> | ||||
|             </div> | ||||
|         </div> | ||||
|         <div class="form-group"> | ||||
|             <label class="col-md-2 control-label">Description</label> | ||||
|             <div class="col-md-8"> | ||||
|                 <textarea name="desc" class="form-control" placeholder="Type your repository name"></textarea> | ||||
|             </div> | ||||
|         </div> | ||||
|         <div class="form-group"> | ||||
|             <label class="col-md-2 control-label">Language</label> | ||||
|             <div class="col-md-8"> | ||||
|                 <select class="form-control" name="language"> | ||||
|                     <option value="">Select a language</option> | ||||
|                     <option value="ActionScript">ActionScript</option> | ||||
|                     <option value="C#">C#</option> | ||||
|                     <option value="Google Go">Google Go</option> | ||||
|                     <option value="Java">Java</option> | ||||
|                     <option value="PHP">PHP</option> | ||||
|                 </select> | ||||
|             </div> | ||||
|         </div> | ||||
|         <div class="form-group"> | ||||
|             <div class="col-md-8 col-md-offset-2"> | ||||
|                 <div class="checkbox"> | ||||
|                     <label> | ||||
|                         <input type="checkbox" value="true" name="init-md"> | ||||
|                         <strong>Initialize this repository with a README</strong> | ||||
|                     </label> | ||||
|                 </div> | ||||
|             </div> | ||||
|         </div> | ||||
|         <div class="form-group"> | ||||
|             <div class="col-md-offset-2 col-md-8"> | ||||
|                 <button type="submit" class="btn btn-lg btn-primary">Create repository</button> | ||||
|                 <a href="/" class="text-danger">Cancel</a> | ||||
|             </div> | ||||
|         </div> | ||||
|     </form> | ||||
| </div> | ||||
| {{template "base/footer" .}} | ||||
| @ -1,7 +1,7 @@ | ||||
| {{template "base/head" .}} | ||||
| {{template "base/navbar" .}} | ||||
| <div class="container" id="gogs-body"> | ||||
|     <form action="/user/signin" method="post" class="form-horizontal" id="gogs-login-card"> | ||||
|     <form action="/user/signin" method="post" class="form-horizontal gogs-card" id="gogs-login-card"> | ||||
|         <h3>Log in</h3> | ||||
|         <div class="form-group"> | ||||
|             <label class="col-md-4 control-label">Username or Email: </label> | ||||
|  | ||||
| @ -1,7 +1,7 @@ | ||||
| {{template "base/head" .}} | ||||
| {{template "base/navbar" .}} | ||||
| <div class="container" id="gogs-body"> | ||||
| 	<form action="/user/signup" method="post" class="form-horizontal" id="gogs-login-card"> | ||||
| 	<form action="/user/signup" method="post" class="form-horizontal gogs-card" id="gogs-login-card"> | ||||
|         <h3>Sign Up</h3> | ||||
| 		<div class="form-group"> | ||||
| 			<label class="col-md-4 control-label">Username: </label> | ||||
|  | ||||
							
								
								
									
										78
									
								
								xorm.log
									
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										78
									
								
								xorm.log
									
									
									
									
									
										Normal file
									
								
							| @ -0,0 +1,78 @@ | ||||
| SELECT `TABLE_NAME` from `INFORMATION_SCHEMA`.`TABLES` WHERE `TABLE_SCHEMA`=? and `TABLE_NAME`=? | ||||
| [gogs user] | ||||
| SELECT `COLUMN_NAME` FROM `INFORMATION_SCHEMA`.`COLUMNS` WHERE `TABLE_SCHEMA` = ? AND `TABLE_NAME` = ? AND `COLUMN_NAME` = ? | ||||
| [gogs user name] | ||||
| SELECT `COLUMN_NAME` FROM `INFORMATION_SCHEMA`.`COLUMNS` WHERE `TABLE_SCHEMA` = ? AND `TABLE_NAME` = ? AND `COLUMN_NAME` = ? | ||||
| [gogs user login_type] | ||||
| SELECT `COLUMN_NAME` FROM `INFORMATION_SCHEMA`.`COLUMNS` WHERE `TABLE_SCHEMA` = ? AND `TABLE_NAME` = ? AND `COLUMN_NAME` = ? | ||||
| [gogs user type] | ||||
| SELECT `COLUMN_NAME` FROM `INFORMATION_SCHEMA`.`COLUMNS` WHERE `TABLE_SCHEMA` = ? AND `TABLE_NAME` = ? AND `COLUMN_NAME` = ? | ||||
| [gogs user num_followers] | ||||
| SELECT `COLUMN_NAME` FROM `INFORMATION_SCHEMA`.`COLUMNS` WHERE `TABLE_SCHEMA` = ? AND `TABLE_NAME` = ? AND `COLUMN_NAME` = ? | ||||
| [gogs user num_followings] | ||||
| SELECT `COLUMN_NAME` FROM `INFORMATION_SCHEMA`.`COLUMNS` WHERE `TABLE_SCHEMA` = ? AND `TABLE_NAME` = ? AND `COLUMN_NAME` = ? | ||||
| [gogs user avatar] | ||||
| SELECT `COLUMN_NAME` FROM `INFORMATION_SCHEMA`.`COLUMNS` WHERE `TABLE_SCHEMA` = ? AND `TABLE_NAME` = ? AND `COLUMN_NAME` = ? | ||||
| [gogs user created] | ||||
| SELECT `COLUMN_NAME` FROM `INFORMATION_SCHEMA`.`COLUMNS` WHERE `TABLE_SCHEMA` = ? AND `TABLE_NAME` = ? AND `COLUMN_NAME` = ? | ||||
| [gogs user updated] | ||||
| SELECT `COLUMN_NAME` FROM `INFORMATION_SCHEMA`.`COLUMNS` WHERE `TABLE_SCHEMA` = ? AND `TABLE_NAME` = ? AND `COLUMN_NAME` = ? | ||||
| [gogs user id] | ||||
| SELECT `COLUMN_NAME` FROM `INFORMATION_SCHEMA`.`COLUMNS` WHERE `TABLE_SCHEMA` = ? AND `TABLE_NAME` = ? AND `COLUMN_NAME` = ? | ||||
| [gogs user email] | ||||
| SELECT `COLUMN_NAME` FROM `INFORMATION_SCHEMA`.`COLUMNS` WHERE `TABLE_SCHEMA` = ? AND `TABLE_NAME` = ? AND `COLUMN_NAME` = ? | ||||
| [gogs user lower_name] | ||||
| SELECT `COLUMN_NAME` FROM `INFORMATION_SCHEMA`.`COLUMNS` WHERE `TABLE_SCHEMA` = ? AND `TABLE_NAME` = ? AND `COLUMN_NAME` = ? | ||||
| [gogs user passwd] | ||||
| SELECT `COLUMN_NAME` FROM `INFORMATION_SCHEMA`.`COLUMNS` WHERE `TABLE_SCHEMA` = ? AND `TABLE_NAME` = ? AND `COLUMN_NAME` = ? | ||||
| [gogs user num_stars] | ||||
| SELECT `COLUMN_NAME` FROM `INFORMATION_SCHEMA`.`COLUMNS` WHERE `TABLE_SCHEMA` = ? AND `TABLE_NAME` = ? AND `COLUMN_NAME` = ? | ||||
| [gogs user num_repos] | ||||
| SELECT `TABLE_NAME` from `INFORMATION_SCHEMA`.`TABLES` WHERE `TABLE_SCHEMA`=? and `TABLE_NAME`=? | ||||
| [gogs public_key] | ||||
| SELECT `COLUMN_NAME` FROM `INFORMATION_SCHEMA`.`COLUMNS` WHERE `TABLE_SCHEMA` = ? AND `TABLE_NAME` = ? AND `COLUMN_NAME` = ? | ||||
| [gogs public_key id] | ||||
| SELECT `COLUMN_NAME` FROM `INFORMATION_SCHEMA`.`COLUMNS` WHERE `TABLE_SCHEMA` = ? AND `TABLE_NAME` = ? AND `COLUMN_NAME` = ? | ||||
| [gogs public_key owner_id] | ||||
| SELECT `COLUMN_NAME` FROM `INFORMATION_SCHEMA`.`COLUMNS` WHERE `TABLE_SCHEMA` = ? AND `TABLE_NAME` = ? AND `COLUMN_NAME` = ? | ||||
| [gogs public_key name] | ||||
| SELECT `COLUMN_NAME` FROM `INFORMATION_SCHEMA`.`COLUMNS` WHERE `TABLE_SCHEMA` = ? AND `TABLE_NAME` = ? AND `COLUMN_NAME` = ? | ||||
| [gogs public_key content] | ||||
| SELECT `COLUMN_NAME` FROM `INFORMATION_SCHEMA`.`COLUMNS` WHERE `TABLE_SCHEMA` = ? AND `TABLE_NAME` = ? AND `COLUMN_NAME` = ? | ||||
| [gogs public_key created] | ||||
| SELECT `COLUMN_NAME` FROM `INFORMATION_SCHEMA`.`COLUMNS` WHERE `TABLE_SCHEMA` = ? AND `TABLE_NAME` = ? AND `COLUMN_NAME` = ? | ||||
| [gogs public_key updated] | ||||
| SELECT `TABLE_NAME` from `INFORMATION_SCHEMA`.`TABLES` WHERE `TABLE_SCHEMA`=? and `TABLE_NAME`=? | ||||
| [gogs repo] | ||||
| SELECT `COLUMN_NAME` FROM `INFORMATION_SCHEMA`.`COLUMNS` WHERE `TABLE_SCHEMA` = ? AND `TABLE_NAME` = ? AND `COLUMN_NAME` = ? | ||||
| [gogs repo owner_id] | ||||
| SELECT `COLUMN_NAME` FROM `INFORMATION_SCHEMA`.`COLUMNS` WHERE `TABLE_SCHEMA` = ? AND `TABLE_NAME` = ? AND `COLUMN_NAME` = ? | ||||
| [gogs repo fork_id] | ||||
| SELECT `COLUMN_NAME` FROM `INFORMATION_SCHEMA`.`COLUMNS` WHERE `TABLE_SCHEMA` = ? AND `TABLE_NAME` = ? AND `COLUMN_NAME` = ? | ||||
| [gogs repo num_watchs] | ||||
| SELECT `COLUMN_NAME` FROM `INFORMATION_SCHEMA`.`COLUMNS` WHERE `TABLE_SCHEMA` = ? AND `TABLE_NAME` = ? AND `COLUMN_NAME` = ? | ||||
| [gogs repo id] | ||||
| SELECT `COLUMN_NAME` FROM `INFORMATION_SCHEMA`.`COLUMNS` WHERE `TABLE_SCHEMA` = ? AND `TABLE_NAME` = ? AND `COLUMN_NAME` = ? | ||||
| [gogs repo lower_name] | ||||
| SELECT `COLUMN_NAME` FROM `INFORMATION_SCHEMA`.`COLUMNS` WHERE `TABLE_SCHEMA` = ? AND `TABLE_NAME` = ? AND `COLUMN_NAME` = ? | ||||
| [gogs repo name] | ||||
| SELECT `COLUMN_NAME` FROM `INFORMATION_SCHEMA`.`COLUMNS` WHERE `TABLE_SCHEMA` = ? AND `TABLE_NAME` = ? AND `COLUMN_NAME` = ? | ||||
| [gogs repo num_stars] | ||||
| SELECT `COLUMN_NAME` FROM `INFORMATION_SCHEMA`.`COLUMNS` WHERE `TABLE_SCHEMA` = ? AND `TABLE_NAME` = ? AND `COLUMN_NAME` = ? | ||||
| [gogs repo num_forks] | ||||
| SELECT `COLUMN_NAME` FROM `INFORMATION_SCHEMA`.`COLUMNS` WHERE `TABLE_SCHEMA` = ? AND `TABLE_NAME` = ? AND `COLUMN_NAME` = ? | ||||
| [gogs repo created] | ||||
| SELECT `COLUMN_NAME` FROM `INFORMATION_SCHEMA`.`COLUMNS` WHERE `TABLE_SCHEMA` = ? AND `TABLE_NAME` = ? AND `COLUMN_NAME` = ? | ||||
| [gogs repo updated] | ||||
| SELECT `TABLE_NAME` from `INFORMATION_SCHEMA`.`TABLES` WHERE `TABLE_SCHEMA`=? and `TABLE_NAME`=? | ||||
| [gogs access] | ||||
| SELECT `COLUMN_NAME` FROM `INFORMATION_SCHEMA`.`COLUMNS` WHERE `TABLE_SCHEMA` = ? AND `TABLE_NAME` = ? AND `COLUMN_NAME` = ? | ||||
| [gogs access id] | ||||
| SELECT `COLUMN_NAME` FROM `INFORMATION_SCHEMA`.`COLUMNS` WHERE `TABLE_SCHEMA` = ? AND `TABLE_NAME` = ? AND `COLUMN_NAME` = ? | ||||
| [gogs access user_name] | ||||
| SELECT `COLUMN_NAME` FROM `INFORMATION_SCHEMA`.`COLUMNS` WHERE `TABLE_SCHEMA` = ? AND `TABLE_NAME` = ? AND `COLUMN_NAME` = ? | ||||
| [gogs access repo_name] | ||||
| SELECT `COLUMN_NAME` FROM `INFORMATION_SCHEMA`.`COLUMNS` WHERE `TABLE_SCHEMA` = ? AND `TABLE_NAME` = ? AND `COLUMN_NAME` = ? | ||||
| [gogs access mode] | ||||
| SELECT `COLUMN_NAME` FROM `INFORMATION_SCHEMA`.`COLUMNS` WHERE `TABLE_SCHEMA` = ? AND `TABLE_NAME` = ? AND `COLUMN_NAME` = ? | ||||
| [gogs access created] | ||||
		Loading…
	
	
			
			x
			
			
		
	
		Reference in New Issue
	
	Block a user