 dingguodong
|
e9002f78c2
|
Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms
|
2021-09-08 16:33:36 +08:00 |
|
|
dingguodong
|
870c3be96e
|
* Add lang for GitLab in MR creation.
|
2021-09-08 16:24:11 +08:00 |
|
|
王怡栋
|
fe3f6b3a01
|
* add mr zh-tw lang.
|
2021-09-08 16:02:11 +08:00 |
|
|
dingguodong
|
57c7ed054d
|
* Fixed GitLab selection when creating MR.
|
2021-09-08 14:54:27 +08:00 |
|
|
dingguodong
|
2c957c5970
|
* Adjust column width in MR browse page.
|
2021-09-08 14:29:41 +08:00 |
|
|
dingguodong
|
1dbceea571
|
* Remove needless prompt for required fields.
|
2021-09-08 14:10:08 +08:00 |
|
|
dingguodong
|
a4be8f518a
|
* Fix bug #14996.
|
2021-09-08 13:58:22 +08:00 |
|
|
Guan Xiying
|
d1a08fda29
|
* Fix bug #15006.
|
2021-09-08 13:45:41 +08:00 |
|
|
dingguodong
|
28965b2777
|
* Correct php warnings.
|
2021-09-08 10:55:21 +08:00 |
|
|
dingguodong
|
02a2892002
|
* Fix bug #14994 .
|
2021-09-08 10:54:50 +08:00 |
|
|
Guan Xiying
|
426e366791
|
* Hide mr setting lang item.
|
2021-09-08 10:30:10 +08:00 |
|
|
Guan Xiying
|
6e3be6bdf2
|
* Fix bug #15006.
|
2021-09-08 10:27:05 +08:00 |
|
|
Guan Xiying
|
ba70dcbaab
|
* Fix bug #15007.
|
2021-09-08 10:24:13 +08:00 |
|
|
Guan Xiying
|
b305b8c752
|
* Fix bug #15009 and change config->MR to config->mr.
|
2021-09-08 10:13:28 +08:00 |
|
|
dingguodong
|
b1e05cd0f3
|
* Adjust display style.
|
2021-09-07 20:18:50 +08:00 |
|
|
dingguodong
|
6de75d2fcb
|
* Fix bug for sync mr.
|
2021-09-07 20:17:31 +08:00 |
|
|
dingguodong
|
74d6b1895a
|
* Update accept MR display style.
|
2021-09-07 18:12:01 +08:00 |
|
|
dingguodong
|
4e08891ea9
|
* Optimize comment.
|
2021-09-07 15:46:40 +08:00 |
|
|
dingguodong
|
154662d760
|
* Disable diff in MR feature.
|
2021-09-07 15:05:09 +08:00 |
|
|
dingguodong
|
70f0136b2b
|
Merge branch 'jihuMR' of https://gitlab.zcorp.cc/easycorp/zentaopms into jihuMR
|
2021-09-07 10:51:12 +08:00 |
|
|
dingguodong
|
8e8875319f
|
* Optimize function getDiffs.
|
2021-09-07 10:50:44 +08:00 |
|
|
Guan Xiying
|
d5b52bc7ad
|
* Fix viewDiif.
|
2021-09-07 10:50:34 +08:00 |
|
|
lichengjun
|
b223736b18
|
Merge branch 'jihuMR' of https://gitlab.zcorp.cc/easycorp/zentaopms into jihuMR
|
2021-09-07 02:38:43 +00:00 |
|
|
lichengjun
|
12935f3ead
|
* Adjust GitLab MR TODO Detail.
|
2021-09-07 02:33:36 +00:00 |
|
|
dingguodong
|
701b000c09
|
* Optimize language file.
|
2021-09-07 10:13:57 +08:00 |
|
|
dingguodong
|
14c2e282f2
|
Merge branch 'jihuMR' of https://gitlab.zcorp.cc/easycorp/zentaopms into jihuMR
|
2021-09-07 10:03:34 +08:00 |
|
|
dingguodong
|
ee13e00554
|
* Add tips for merge code locally.
|
2021-09-07 10:02:52 +08:00 |
|
|
lichengjun
|
90c3e3479f
|
* Fix GitLab MR sync status.
|
2021-09-07 01:58:24 +00:00 |
|
|
lichengjun
|
a786e5f00d
|
* GitLab MR Code Merge.
|
2021-09-07 00:50:33 +00:00 |
|
|
lichengjun
|
1c3f706088
|
Merge branch 'jihuMR' of https://gitlab.zcorp.cc/easycorp/zentaopms into jihuMR
|
2021-09-07 00:46:31 +00:00 |
|
|
lichengjun
|
7ca5893ce2
|
* Cancel GitLab SYNC Settings.
|
2021-09-07 00:44:34 +00:00 |
|
|
dingguodong
|
9d5c1de0ab
|
* Sync MR in ZenTao database whatever status of MR in GitLab.
|
2021-09-06 17:57:27 +08:00 |
|
|
lichengjun
|
7e8705afcd
|
Merge branch 'jihuMR' of https://gitlab.zcorp.cc/easycorp/zentaopms into jihuMR
|
2021-09-06 05:26:41 +00:00 |
|
|
lichengjun
|
f16eba5b09
|
* Add GitLab Merge Request Permission configuration.
|
2021-09-06 05:22:27 +00:00 |
|
|
dingguodong
|
94f4d91107
|
* Modify en lang for MR.
|
2021-09-06 11:31:01 +08:00 |
|
|
dingguodong
|
fde5d66e3c
|
* Adjust function comment.
|
2021-09-03 14:54:35 +08:00 |
|
|
dingguodong
|
c80ce42a12
|
* Reformat code for accept MR.
|
2021-09-03 13:39:54 +08:00 |
|
|
dingguodong
|
13506c3cbd
|
* Add locate redirection but test not passed.
|
2021-09-03 13:37:41 +08:00 |
|
|
dingguodong
|
7a7c63499f
|
* Fix bug for no response after accept view.
|
2021-09-03 13:21:14 +08:00 |
|
|
dingguodong
|
7d83d3110f
|
* Fix bug when sudo as user.
|
2021-09-03 13:20:53 +08:00 |
|
|
lichengjun
|
6441a8de44
|
* Add GitLab MR English Language.
|
2021-09-03 01:39:33 +00:00 |
|
|
dingguodong
|
3d360a1e4e
|
* Bug fix and reduce PHP notices.
|
2021-09-02 16:49:52 +08:00 |
|
|
dingguodong
|
1b41b61cee
|
* Using sudo to accept merge request.
|
2021-09-02 15:21:19 +08:00 |
|
|
dingguodong
|
8201fafc46
|
+ Get sudo user ID in GitLab.
|
2021-09-02 15:20:21 +08:00 |
|
|
dingguodong
|
1009626f39
|
Merge branch 'jihuMR' of https://gitlab.zcorp.cc/easycorp/zentaopms into jihuMR
|
2021-09-02 14:20:45 +08:00 |
|
|
dingguodong
|
cbf7227e89
|
* Correct the bug when a API error is raised.
|
2021-09-02 14:19:43 +08:00 |
|
|
lichengjun
|
db552dc428
|
* Adjust sync gitlab mr code.
|
2021-09-02 06:13:18 +00:00 |
|
|
lichengjun
|
d2a348b57b
|
Merge branch 'jihuMR' of https://gitlab.zcorp.cc/easycorp/zentaopms into jihuMR
|
2021-09-01 07:03:04 +00:00 |
|
|
lichengjun
|
7f71a63468
|
* Sync GitLab Todo ZenTao Todo.
|
2021-09-01 07:02:17 +00:00 |
|
|
dingguodong
|
5e5cbe2d2f
|
* Update and correct editing a MR.
|
2021-09-01 11:08:34 +08:00 |
|