Richard Mahn 47603edf22 Merge remote-tracking branch 'gogits/develop' into feature-create-and-edit-repo-file ...

Conflicts:
	modules/bindata/bindata.go
	public/js/gogs.js

2016-07-22 14:07:36 -06:00

..

migrations

models/user_mail: refactor EmailAddress

2016-07-16 10:08:04 +08:00

access.go

#1692 api: admin list and create team under organization

2016-03-21 12:47:54 -04:00

action.go

models/repo: remove redundant info for some repo methods

2016-07-15 21:53:43 +08:00

admin.go

Add comment note (#3093)

2016-05-23 13:24:40 -07:00

error.go

Feature for editing, creating, uploading and deleting files

2016-07-15 18:35:42 -06:00

git_diff_test.go

go fmt models/git_diff_test.go

2016-02-04 17:55:17 -02:00

git_diff.go

add IsSubmodule field to DiffFile and hide view file button on diff page for submodules (#3097)

2016-07-23 02:18:56 +08:00

issue_comment.go

#2854 fix no mail notification when issue is closed/reopened

2016-07-16 00:36:39 +08:00

issue_label.go

Minor fix for #2710

2016-02-27 11:31:24 -05:00

issue_mail.go

#2854 fix no mail notification when issue is closed/reopened

2016-07-16 00:36:39 +08:00

issue.go

Merge remote-tracking branch 'gogits/develop' into feature-create-and-edit-repo-file

2016-07-22 14:07:36 -06:00

login.go

#3295 fix wrong logic judgement

2016-07-21 14:15:04 +08:00

mail.go

#2854 fix no mail notification when issue is closed/reopened

2016-07-16 00:36:39 +08:00

models_sqlite.go

go vet

2014-04-13 03:14:43 -04:00

models_tidb.go

add tidb support

2015-09-12 15:31:36 -04:00

models.go

getEngine() not handles DB parameters (#2972) (#2974)

2016-07-02 22:39:39 +08:00

org_team.go

#1692 add admin APIs to add/remove a user from teams

2016-03-25 18:04:02 -04:00

org.go

#2854 fix no mail notification when issue is closed/reopened

2016-07-16 00:36:39 +08:00

pull.go

Feature for editing, creating, uploading and deleting files

2016-07-15 18:35:42 -06:00

release.go

models/release: filter input to prevent command line argument vulnerability

2016-05-06 15:40:41 -04:00

repo_branch.go

Minor fix for #2506

2016-02-02 17:07:40 -05:00

repo_collaboration.go

Localize collaboration settings. (#3100)

2016-06-28 00:22:30 +08:00

repo_test.go

The pruning for the synchronized mirrors is a option now. Default value: enable_prune = true (#3246)

2016-07-09 13:22:28 +08:00

repo.go

Update for Edit

2016-07-19 16:12:57 -06:00

ssh_key_test.go

Post work for #2637

2016-02-27 20:48:39 -05:00

ssh_key.go

#2302 Replace time.Time with Unix Timestamp (int64)

2016-03-09 19:53:30 -05:00

token.go

Fixes #3110 (#3136)

2016-06-27 17:02:39 +08:00

update.go

#2650 fix possbility that use email as pusher user name

2016-02-17 22:47:06 -05:00

user_mail.go

models/user_mail: refactor EmailAddress

2016-07-16 10:08:04 +08:00

user.go

avatar: make custom and generated avatars equal (#3301)

2016-07-21 15:31:14 +08:00

webhook_slack.go

rename import path

2015-12-15 17:25:45 -05:00

webhook.go

models/webhook: restrict deletion to be explicitly with repo and org ID

2016-07-17 08:33:59 +08:00

wiki.go

Update for Edit

2016-07-19 16:12:57 -06:00

working_pool.go

Update for Edit

2016-07-19 16:12:57 -06:00