Commit Graph
28645 Commits
Author SHA1 Message Date
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
zhengrunyu 4f5c9691a3 *Finish task #43708. 2021-11-01 14:12:39 +08:00
zhengrunyu d7418db734 *Finish task #43708. 2021-11-01 14:07:11 +08:00
李玉春 d4fdd7b9e2 Merge branch 'sprint/169_tianshujie_43621' into 'sprint/169'
* Finish task #43621.

See merge request easycorp/zentaopms!249
2021-11-01 02:45:38 +00:00
孙广明 da02aa3742 Merge branch 'sprint/169_zhengrunyu_43708' into 'sprint/169'
* Finish task #43708.

See merge request easycorp/zentaopms!248
2021-11-01 02:40:36 +00:00
zhengrunyu 594eae2a3f * Finish task #43708. 2021-11-01 10:33:20 +08:00
zhengrunyu bd765c6881 * Finish task #43708. 2021-11-01 10:27:34 +08:00
孙广明 39cdb1dc32 Merge branch 'sprint/169_zhouxin_43556' into 'sprint/169'
Finish task #43556.

See merge request easycorp/zentaopms!232
2021-11-01 02:27:17 +00:00
tianshujie 96513f604e * Modify and maintain product line logic. 2021-11-01 10:21:11 +08:00
tianshujie f78f9ecdfe * Finish task #43621. 2021-11-01 10:18:21 +08:00
孙广明 d17f0f28ce Merge branch 'sprint/169_tanghucheng_43707' into 'sprint/169'
* Finish task #43707.

See merge request easycorp/zentaopms!236
2021-11-01 02:18:14 +00:00
孙广明 cdb03367bb Merge branch 'sprint/169_zhouxin_43539' into 'sprint/169'
Finish task #43539.

See merge request easycorp/zentaopms!238
2021-11-01 02:16:29 +00:00
朱金勇 976f3b80ad Merge branch 'sprint/169' into 'sprint/169'
* Adjust and correct codes for gitlab module.

See merge request easycorp/zentaopms!222
2021-11-01 02:11:15 +00:00
zhengrunyu da27ff9c06 * Finish task #43708 2021-11-01 10:08:36 +08:00