1985 Commits

Author SHA1 Message Date
Ryan Chang
5260d70b19 templates: fix typo in repo/home.tmpl (#4845) 2017-11-18 00:47:48 -05:00
Unknwon
0f14b92bce
MISC: minor fixes in webhook 2017-11-18 00:38:46 -05:00
Unknwon
3b8b8a2ee3
pull_request: able to ignore whitespace when check conflict (#4834) 2017-11-16 22:22:38 -05:00
Unknwon
6f04ee879c
auth/ldap: allow placeholder %s for BindDN (#2526) 2017-11-16 19:32:33 -05:00
Unknwon
e1e76d3f88
admin/config: add UI for [http] section (#3987) 2017-11-16 19:03:46 -05:00
Unknwon
3dd93f5533
vendor: update github.com/gogits/git-module 2017-11-16 00:04:07 -05:00
Unknwon
34c2e52bd5
repo/pull: allow rebase before merging (#4805) 2017-11-15 23:28:31 -05:00
mharinder
5cd1fdeb9e
pull: add an option to use rebase for merging pull requests
For DVCS, either merge or rebase works for getting new code in a pull
request in the main branch.

The rebase workflow produces a linear history which is cleaner, and
more bisect-able.

This commit adds a repo-level option to enable the rebase workflow. Once
enabled, "Merge Pull Request" will be replaced by
"Rebase and Merge Pull Request" which does exactly what the user wants.
It's unlikely a project wants a mixed-use of both rebase and merge
workflows, therefore the feature is not implemented as a drop-down
button like what GitHub does
(https://github.com/blog/2243-rebase-and-merge-pull-requests).
2017-11-15 23:28:23 -05:00
Unknwon
dbe6de313e
public: update Semantic UI 2.2.10 -> 2.2.13 2017-11-15 21:59:47 -05:00
Unknwon
4258bf3d54
user/auth: fix page not redirect after login 2017-10-22 19:29:17 -04:00
Unknwon
4d1d66d906
Bump version 2017-10-15 00:12:52 -04:00
Unknwon
b727e0be71
SECURITY: fix branch name persistent XSS
Reported by Carl Hattenfels.
2017-10-15 00:07:46 -04:00
Athurg Feng
52f3833811 Add Dingtalk webhook support (#4773)
* Add dingtalk webhook into html template

* Add Dingtalk's icon

* Insert dingtalk into repo's webhook page template

* Insert dingtalk into org's webhook page

* Add dingtalk into default webhook config

* Add locale string for add_dingtalk_hook_desc

* Update bindata

* Add dingtalk webhook form validator

* Add dingtalk hook task

* Add dingtalk hook create handler

* Add dingtalk hook edit handler

* Add dingtalk router

* Add dingtalk webhook task skeleton

* Add markdown link formatter

* Add Dingtalk ActionCard create wrapper

* Add support for dingtalk create event payload

* Add support for dingtalk delete event payload

* Add support for dingtalk fork event payload

* Add support for dingtalk push event payload

* Add support for dingtalk issue event payload

* Add support for dingtalk issue comment payload

* Add support for dingtalk pull event payload

* Add support for dingtalk release event payload
2017-09-21 14:32:48 -04:00
Unknwon
6bc11c4450
hook: fix email not sent after push (#4430)
Turns out mail service was not initialized at all, also mail must
be sent in sync in hook mode before program exits.
2017-07-27 16:53:02 -04:00
Unknwon
643c85e9c8
routes/home: minor code improve 2017-07-18 22:09:57 -04:00
Unknwon
dc10594d7b
repo: fix cannot fork repository (#4572)
Should not load attributes if repository not found in HasForkedRepo.
2017-07-18 12:56:23 -04:00
Unknwon
e02fac4968
repo: fix panic on pull request submit (#4572) 2017-07-14 18:51:23 -04:00
Unknwon
f67d6bbca3
repo/diff: fix line number in split view template (#4584) 2017-07-14 17:02:45 -04:00
Unknwon
c970c4ee41
css: not include line numbers in diff selection (#4584)
Changed template file in order to make CSS work properly.
2017-07-14 16:50:49 -04:00
Unknwon
8ed2330d6e
issue_comment: fix pg syntax ambiguous (#4586)
Also handle error related to time parsing.
2017-06-27 20:21:36 -04:00
Unknwon
d1a96c2543
cmd/restore: skip non existent directories in backup archive (#4413) 2017-06-25 01:16:32 -04:00
Unknwon
11b1498a6e
api/repo: load attributes when listing user repositories (#4565) 2017-06-21 17:41:18 -04:00
Unknwon
e16196124e
setting: disable SSH minimum key size check when not eligible (#4507) 2017-06-11 02:06:26 -04:00
Unknwon
ab2197bc75
random: some code simplify 2017-06-11 00:56:31 -04:00
Unknwon
a887e475e3
repo: change action visibility when repository visibility changed (#4414) 2017-06-11 00:43:56 -04:00
Unknwon
4400d2fdd9
Refactoring: rename package routers -> routes 2017-06-11 00:34:14 -04:00
Unknwon
91f65cedc8
repo/view: trim Windows line ending when display content (#4546) 2017-06-09 20:05:04 -04:00
Unknwon
09f2cbfb18
api/repo: response full API format for search results (#4522) 2017-06-08 15:53:19 -04:00
Unknwon
b40dc550ed
vendor: update github.com/go-xorm/* (#4419) 2017-06-07 01:19:32 -04:00
Unknwon
c210984b40
repo: improve relative path detection (#4366) 2017-06-06 16:06:28 -04:00
Unknwon
455dc072ba
repo: use BranchLink instead of TreeLink (#4366) 2017-06-06 15:50:12 -04:00
Unknwon
a851b77ac9
markup: able to display image from IPython notebook (#4366) 2017-06-06 15:41:27 -04:00
Unknwon
c0be055541
api/repo: fix admin migrate repo for non-org users (#4479) 2017-06-05 17:11:57 -04:00
Unknwon
36d6450977
repo/pull: detect case when no merge base found (#4434) 2017-06-05 00:10:53 -04:00
Unknwon
f4d61ac6d2
templates: fix version 2017-06-03 06:52:45 -04:00
Unknwon
239dd978ff
repo: support go get subpkg (#1878) 2017-06-03 06:50:09 -04:00
Unknwon
16913ba814
css: start using fixing width container
Get rid of responsive issue.

Also fixes #4527.
2017-06-03 02:58:54 -04:00
Unknwon
6bb9c442b2
issue: fix updated_unix is not updated for new comments (#4462) 2017-06-02 17:30:15 -04:00
Simon Dann
bf060387af ui: fix emoji not rendered in commits table (#4440) 2017-05-29 23:46:43 -04:00
Unknwon
a1d411a018
ldap: minor fix for PR #4398 2017-05-29 23:18:34 -04:00
aboron
dbb7e5464b ldap: add check for group membership (#4398)
* Add standard LDAP group membership checking.

* Fix formatting, typo, grammer, and syntax errors

* Debugging done.
Gave up on locale file edits.
2017-05-29 22:33:50 -04:00
Unknwon
4e87e62d5c
models/repo_collaboration: cannot change permissions of collaborators (#4512) 2017-05-29 16:33:18 -04:00
Unknwon
b17995a332
restore: reset table sequences for PostgreSQL (#4357) 2017-05-21 04:37:37 -04:00
Unknwon
d71a8fece8
feature/org-mode: fix compile error 2017-05-17 18:50:14 -04:00
Unknwon
6500aafcb8
install: validate port in SMTP host address (#2243) 2017-04-07 23:23:39 -04:00
Unknwon
6ebdf91b32
templates/repo: fix README.ipynb not rendered (#4367) 2017-04-07 22:33:19 -04:00
Unknwon
91cd350b63
repo/editor: fix wrong context for subdirectory (#4368) 2017-04-07 21:44:55 -04:00
Unknwon
62a20b8a2d
repo/wiki: improve UI 2017-04-07 15:30:08 -04:00
Unknwon
d0612be402
user/setting: improve UI 2017-04-07 15:08:53 -04:00
Unknwon
5f8ec0dc8b
templates/repo: improve symlink file icon in list view (#4237) 2017-04-07 13:51:10 -04:00