Jonas Franz a8dc699e74 Merge branch 'master' into feat/approval-new ...

# Conflicts:
#	models/error.go
#	models/migrations/migrations.go
#	models/models.go
#	public/js/index.js

2018-05-19 18:17:01 +02:00

..

fixtures

Merge branch 'master' into feat/approval-new

2018-05-19 18:17:01 +02:00

migrations

Merge branch 'master' into feat/approval-new

2018-05-19 18:17:01 +02:00

access_test.go

…

access.go

…

action_list.go

…

action_test.go

…

action.go

Add more webhooks support and refactor webhook templates directory (#3929)

2018-05-16 22:01:55 +08:00

admin_test.go

…

admin.go

…

attachment_test.go

…

attachment.go

Add Size column to attachment (#3734)

2018-03-31 09:10:44 +08:00

branches_test.go

…

branches.go

…

consistency.go

…

error_oauth2.go

…

error.go

Merge branch 'master' into feat/approval-new

2018-05-19 18:17:01 +02:00

external_login_user.go

…

git_diff_test.go

Add support for invalidating comments

2018-05-13 13:24:19 +02:00

git_diff.go

Improved comment rendering in "Files" view by adding Comments to DiffLine

2018-05-12 19:09:42 +02:00

gpg_key_test.go

…

gpg_key.go

…

graph_test.go

…

graph.go

…

helper.go

…

issue_assignees_test.go

Multiple assignees (#3705)

2018-05-09 19:29:04 +03:00

issue_assignees.go

Multiple assignees (#3705)

2018-05-09 19:29:04 +03:00

issue_comment_test.go

Fix unit tests by updating fixtures and updating outdated test

2018-05-14 10:55:50 +02:00

issue_comment.go

Add support for new webhooks

2018-05-17 14:04:43 +02:00

issue_indexer.go

…

issue_label_test.go

…

issue_label.go

…

issue_list_test.go

Shows total tracked time in issue and milestone list (#3341)

2018-04-29 13:58:47 +08:00

issue_list.go

Multiple assignees (#3705)

2018-05-09 19:29:04 +03:00

issue_mail.go

Multiple assignees (#3705)

2018-05-09 19:29:04 +03:00

issue_milestone_test.go

Add more webhooks support and refactor webhook templates directory (#3929)

2018-05-16 22:01:55 +08:00

issue_milestone.go

Add more webhooks support and refactor webhook templates directory (#3929)

2018-05-16 22:01:55 +08:00

issue_reaction_test.go

…

issue_reaction.go

…

issue_stopwatch_test.go

…

issue_stopwatch.go

Shows total tracked time in issue and milestone list (#3341)

2018-04-29 13:58:47 +08:00

issue_test.go

Shows total tracked time in issue and milestone list (#3341)

2018-04-29 13:58:47 +08:00

issue_tracked_time_test.go

…

issue_tracked_time.go

Shows total tracked time in issue and milestone list (#3341)

2018-04-29 13:58:47 +08:00

issue_user_test.go

Multiple assignees (#3705)

2018-05-09 19:29:04 +03:00

issue_user.go

Multiple assignees (#3705)

2018-05-09 19:29:04 +03:00

issue_watch_test.go

…

issue_watch.go

…

issue.go

Multiple assignees (#3705)

2018-05-09 19:29:04 +03:00

lfs_lock.go

…

lfs.go

…

login_source.go

…

mail.go

…

main_test.go

…

models_sqlite.go

…

models_test.go

…

models_tidb.go

…

models.go

Merge branch 'master' into feat/approval-new

2018-05-19 18:17:01 +02:00

notification_test.go

…

notification.go

…

oauth2.go

Store OAuth2 session data in database (#3660)

2018-04-29 09:09:24 +03:00

org_team_test.go

…

org_team.go

…

org_test.go

…

org.go

…

pull_test.go

…

pull.go

Add support for new webhooks

2018-05-17 14:04:43 +02:00

release.go

Add more webhooks support and refactor webhook templates directory (#3929)

2018-05-16 22:01:55 +08:00

repo_activity.go

…

repo_branch.go

…

repo_collaboration_test.go

…

repo_collaboration.go

…

repo_editor.go

…

repo_indexer.go

…

repo_issue.go

Add EnableTimetracking option to app settings (#3719)

2018-04-09 23:15:32 +08:00

repo_list_test.go

…

repo_list.go

…

repo_mirror.go

…

repo_redirect_test.go

…

repo_redirect.go

…

repo_test.go

…

repo_unit.go

…

repo_watch_test.go

…

repo_watch.go

…

repo.go

Add more webhooks support and refactor webhook templates directory (#3929)

2018-05-16 22:01:55 +08:00

review_test.go

Add support for showing code comments of reviews in conversation

2018-05-15 12:52:28 +02:00

review.go

Add support for showing code comments of reviews in conversation

2018-05-15 12:52:28 +02:00

ssh_key_test.go

…

ssh_key.go

…

star_test.go

…

star.go

…

status_test.go

…

status.go

…

test_fixtures.go

…

token_test.go

…

token.go

…

topic_test.go

Add topic support (#3711)

2018-04-11 10:51:44 +08:00

topic.go

Add topic support (#3711)

2018-04-11 10:51:44 +08:00

twofactor.go

Do not allow to reuse TOTP passcode (#3878)

2018-05-02 18:02:02 +03:00

u2f_test.go

Add support for FIDO U2F (#3971)

2018-05-19 17:12:37 +03:00

u2f.go

Add support for FIDO U2F (#3971)

2018-05-19 17:12:37 +03:00

unit_tests.go

…

unit.go

…

update_test.go

…

update.go

…

user_follow_test.go

…

user_follow.go

…

user_mail_test.go

…

user_mail.go

…

user_openid_test.go

…

user_openid.go

…

user_test.go

…

user.go

Multiple assignees (#3705)

2018-05-09 19:29:04 +03:00

webhook_dingtalk.go

Add more webhooks support and refactor webhook templates directory (#3929)

2018-05-16 22:01:55 +08:00

webhook_discord.go

Add more webhooks support and refactor webhook templates directory (#3929)

2018-05-16 22:01:55 +08:00

webhook_slack.go

Add more webhooks support and refactor webhook templates directory (#3929)

2018-05-16 22:01:55 +08:00

webhook_test.go

Add more webhooks support and refactor webhook templates directory (#3929)

2018-05-16 22:01:55 +08:00

webhook.go

Add more webhooks support and refactor webhook templates directory (#3929)

2018-05-16 22:01:55 +08:00

wiki_test.go

test: reduce testing time. (#3885)

2018-05-02 21:56:19 +08:00

wiki.go

Fix to use only needed columns from tables to get repository git paths (#3870)

2018-05-02 09:10:19 +03:00