 xiawenlong
|
d6fe248caf
|
Merge branch 'sugon' of https://gitlab.zcorp.cc/easycorp/zentaopms into sugon
|
2021-11-11 18:16:03 +08:00 |
|
|
xiawenlong
|
976e00197f
|
update gitlab webhook
|
2021-11-11 18:16:01 +08:00 |
|
|
dingguodong
|
6ce5b1de33
|
* Correct bad code style and resolve others.
|
2021-11-11 17:24:09 +08:00 |
|
|
dingguodong
|
9536d3caa8
|
* Fill in the missing code of action module for MR review.
|
2021-11-11 14:05:47 +08:00 |
|
|
dingguodong
|
0eaa75267f
|
* Correct the browse link in MR module.
|
2021-11-11 10:30:40 +08:00 |
|
|
dingguodong
|
b9a2673f5a
|
* Correct the issue that when the MR is deleted in GitLab.
|
2021-11-10 17:39:12 +08:00 |
|
|
zenggang
|
763a7e0175
|
* Finish task#43848,43850,add gitlab project namespace
|
2021-11-10 09:31:47 +00:00 |
|
|
dingguodong
|
51960d25b4
|
Finish task#43858. review code in diff view of MR module.
|
2021-11-10 15:07:03 +08:00 |
|
|
dingguodong
|
99b100e7f4
|
* Correct editing a MR and optimize related front style
(some diff func mixd).
|
2021-11-10 15:05:10 +08:00 |
|
|
dingguodong
|
58aef31f15
|
* Finish task#44144.
|
2021-11-09 18:18:06 +08:00 |
|
|
zenggang
|
20f94c4e7c
|
* Finish task#43847,43860
|
2021-11-09 09:18:04 +00:00 |
|
|
dingguodong
|
8e4bf08e4f
|
* Finish task#43855. Approval page issue is fixed.
|
2021-11-09 16:21:08 +08:00 |
|
|
dingguodong
|
efb3a369c8
|
* Add compile status of job when creating a MR.
|
2021-11-09 12:10:03 +08:00 |
|
|
zenggang
|
65d9c524bb
|
* Finish task#43846
|
2021-11-08 09:38:15 +00:00 |
|
|
dingguodong
|
53d263c3c6
|
* Close and Reopen MR.
|
2021-11-08 15:33:39 +08:00 |
|
|
dingguodong
|
1e931339ef
|
* Get latest MR when viewing it in ZenTaoPMS.
|
2021-11-08 15:32:07 +08:00 |
|
|
zenggang
|
7ee8e8dbef
|
* Add gitlab user avatar
|
2021-11-08 06:25:03 +00:00 |
|
|
dingguodong
|
cc14a18799
|
* Add approval for MR(Optimization is required).
|
2021-11-08 11:37:06 +08:00 |
|
|
zenggang
|
06c235fe9a
|
* Finish task#43845
|
2021-11-06 08:58:11 +00:00 |
|
|
zenggang
|
02aa340f18
|
* Code for task#43845
|
2021-11-06 07:50:54 +00:00 |
|
|
dingguodong
|
af3433da43
|
* Correct misspelled words.
|
2021-11-05 14:28:10 +08:00 |
|
|
dingguodong
|
ea759a4401
|
* Add zt_mrapproval table.
|
2021-11-05 14:27:41 +08:00 |
|
|
dingguodong
|
38995c2713
|
* Fix issue when the type of message is string.
|
2021-11-05 14:26:44 +08:00 |
|
|
dingguodong
|
2155948d19
|
* Add approve function for MR module.
|
2021-11-05 13:47:57 +08:00 |
|
|
zenggang
|
d7831c28e0
|
* Finish task#43841,43842,43843
|
2021-11-05 05:19:27 +00:00 |
|
|
zenggang
|
7945a8c8cb
|
* Finish task#43841,43842,43843
|
2021-11-05 05:13:36 +00:00 |
|
|
dingguodong
|
3bce793b94
|
* Optimize view MR and prepare for approve MR.
|
2021-11-04 16:03:20 +08:00 |
|
|
dingguodong
|
33368deaf4
|
* Make sure each file with same ID is unique.
|
2021-11-04 11:27:19 +08:00 |
|
|
dingguodong
|
af5636233f
|
* Add .vscode into .gitignore file.
|
2021-11-04 10:38:56 +08:00 |
|
|
dingguodong
|
2acf4c98db
|
* Optimize merge request status in view page of MR module.
|
2021-11-04 10:21:17 +08:00 |
|
|
dingguodong
|
201e471acc
|
* Enable diff function in view page of MR module.
|
2021-11-04 10:20:43 +08:00 |
|
|
dingguodong
|
d5c9ad1017
|
* Optimize diff function in MR module.
|
2021-11-04 10:18:38 +08:00 |
|
|
dingguodong
|
bdcf454239
|
* Implement view diffs in MR module.
|
2021-11-03 17:53:14 +08:00 |
|
|
dingguodong
|
074d13aa20
|
* Correct malformed codes and create sugon branch.
|
2021-11-03 08:53:18 +08:00 |
|
|
hufangzhou
|
8b1b92bdfc
|
* Add the version.
zentaopms_15.7.1_20211102
|
2021-11-02 12:37:51 +08:00 |
|
|
王怡栋
|
f8e3ffe97b
|
Merge branch 'sprint/169'
|
2021-11-02 09:54:05 +08:00 |
|
|
李玉春
|
07581624f2
|
Merge branch 'sprint/169_hufangzhou_bug' into 'sprint/169'
* Fix bug #15838.
See merge request easycorp/zentaopms!271
|
2021-11-02 01:00:26 +00:00 |
|
|
hufangzhou
|
70c21e6a28
|
* Fix bug #15838.
|
2021-11-02 08:56:20 +08:00 |
|
|
李玉春
|
67743d72d9
|
Merge branch 'sprint/169_songchenxuan_15784' into 'sprint/169'
Sprint/169 songchenxuan 15784
See merge request easycorp/zentaopms!267
|
2021-11-01 09:22:43 +00:00 |
|
|
root
|
1c4ceda168
|
Fix bug 15784
|
2021-11-01 17:19:25 +08:00 |
|
|
root
|
1aac9130a4
|
Fix bug 15784
|
2021-11-01 17:16:28 +08:00 |
|
|
root
|
69287cea22
|
Fix bug 15784
|
2021-11-01 17:06:51 +08:00 |
|
|
root
|
8101f661ab
|
Fix bug 15784
|
2021-11-01 17:01:13 +08:00 |
|
|
root
|
01656fd005
|
Fix bug 15784
|
2021-11-01 16:59:27 +08:00 |
|
|
李玉春
|
771de2c02e
|
Merge branch 'sprint/169_xieqiyu_15716' into 'sprint/169'
* Fix bug#15716.
See merge request easycorp/zentaopms!265
|
2021-11-01 08:42:37 +00:00 |
|
|
xieqiyu
|
00d83c729c
|
* Fix bug#15716.
|
2021-11-01 16:40:18 +08:00 |
|
|
root
|
7f9028691c
|
Fix bug 15784
|
2021-11-01 16:20:56 +08:00 |
|
|
王怡栋
|
46f2aecae3
|
Merge branch 'sprint/167'
|
2021-11-01 15:27:58 +08:00 |
|
|
孙广明
|
d77254c662
|
Merge branch 'sprint/169_zhengrunyu_43708' into 'sprint/169'
*Finish task #43708.
See merge request easycorp/zentaopms!255
|
2021-11-01 07:26:28 +00:00 |
|
|
王怡栋
|
a2ca4f646f
|
Merge branch '15.6'
|
2021-11-01 15:23:15 +08:00 |
|