Commit Graph

83 Commits (8675dff045e550c8938fa66b549a3fa36e92122d)

Author SHA1 Message Date
Unknwon 51e0eef11e
locale: sync from Crowdin 2017-11-18 01:27:56 -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 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 9b4054f1fc
locale: sync from Crowdin 2017-11-05 23:59:12 -05:00
Unknwon c1507eda45
locale: sync from Crowdin 2017-10-14 04:19:24 -04:00
Unknwon 1b24e6ed76
locale: sync from Crowdin 2017-09-25 20:29:10 -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 b1100b5e34
locale: sync from Crowdin 2017-08-15 18:20:28 -04:00
Unknwon f2c3f4a944
locale: sync from Crowdin 2017-07-30 02:45:13 -04:00
Unknwon b18a2bdcd3
locale: sync from Crowdin 2017-07-14 16:48:41 -04:00
Unknwon d09eaef542
locale: sync from Crowdin 2017-07-09 21:38:11 -04:00
Unknwon ea03bee1b9
locale: sync from Crowdin 2017-06-27 14:45:10 -04:00
Unknwon f59500a90b
locale: sync from Crowdin 2017-06-20 00:10:10 -04:00
Unknwon 6197a7639a
locale: sync from Crowdin 2017-06-10 01:43:18 -04:00
Unknwon 88791089ed
locale: sync from Crowdin 2017-06-08 14:11:25 -04:00
Unknwon 36d6450977
repo/pull: detect case when no merge base found (#4434) 2017-06-05 00:10:53 -04:00
Unknwon 02a576a6a0
locale: update translations 2017-06-04 14:55:55 -04:00
Unknwon 5c10eff67f
bindata: regenerate 2017-06-03 06:51:16 -04:00
Unknwon 4cb01fe332
locale: add Hungarian 2017-06-01 23:41:58 -04:00
Unknwon a1d411a018
ldap: minor fix for PR #4398 2017-05-29 23:18:34 -04:00
Unknwon a5bd095c30
locale: add en-GB 2017-05-25 12:53:28 -04:00
Unknwon ce6e8ed8fe
models: remove redundant tags for primary keys 2017-05-21 04:36:41 -04:00
Unknwon a11044f789
locale: sync from Crowdin 2017-05-17 18:37:25 -04:00
Unknwon 6500aafcb8
install: validate port in SMTP host address (#2243) 2017-04-07 23:23:39 -04:00
Unknwon 809db853fa
locale: fix zh-CN 2017-04-07 15:41:54 -04:00
Unknwon d0612be402
user/setting: improve UI 2017-04-07 15:08:53 -04:00
Unknwon bd1f2ccaf8
user/settings/security: add token description about 2FA 2017-04-06 16:27:31 -04:00
Unknwon a617d52374
2fa: initial support (#945) 2017-04-06 00:14:30 -04:00
Unknwon e0a787b5ee
Update locales 2017-04-05 13:26:53 -04:00
Unknwon d05395fe90
Refactoring: rename modules -> pkg
Reasons to change:

1. Shorter than 'modules'
2. More generally used by other Go projects
3. Corresponds to the naming of '$GOPATH/pkg' directory
2017-04-04 19:29:59 -04:00