Commit Graph
218 Commits
Author SHA1 Message Date
王怡栋 69023a52bc * code for bug #17438. 2021-12-13 15:24:04 +08:00
李玉春 fd6cc79ea0 Merge branch 'sprint/devops16_17391' into 'master'
* Fix bug#17391

See merge request easycorp/zentaopms!907
2021-12-13 05:51:46 +00:00
zenggang 5726fde3d6 * Fix bug#17391 2021-12-13 03:12:21 +00:00
王怡栋 9fd77be3ef * adjust for upgrade. 2021-12-10 15:44:35 +08:00
王怡栋 bfcb3deb8e * code for task #45676. 2021-12-10 13:30:07 +08:00
李玉春 0ebff09658 Merge branch 'sprint/devops16_wangyidong_45504' into 'sprint/devops16'
Sprint/devops16 wangyidong 45504

See merge request easycorp/zentaopms!857
2021-12-09 07:56:27 +00:00
王怡栋 dc7416ebb4 * adjust code for mr. 2021-12-09 15:54:41 +08:00
王怡栋 cb6dbdf1d1 * fix error for task #45504. 2021-12-09 14:42:14 +08:00
王怡栋 beadf58834 * adjust for bug type for mr. 2021-12-09 13:04:26 +08:00
王怡栋 f1689b4dea * code for task #45504. 2021-12-09 11:24:14 +08:00
zenggang d5d7e8a578 * Finish task#45440 2021-12-08 05:26:59 +00:00
zenggang 4b53f349df * Fix bug#16736,17037,16844 2021-12-03 01:59:04 +00:00
zenggang a48f584ca8 * Fix bug#16765,16771 2021-12-02 07:14:31 +00:00
liyuchun 71d27fc151 * Fix error. 2021-12-01 17:23:44 +08:00
liyuchun f6301e4c9a Merge branch 'sugon' 2021-12-01 16:48:00 +08:00
liyuchun 38038eb3ad * Fix bug #16956. 2021-12-01 15:12:44 +08:00
zenggang 2e36226f17 * Fix bug#16947 2021-11-30 09:26:24 +00:00
zenggang 5d192a8413 * Fix bug#16764 2021-11-30 06:37:17 +00:00
zenggang 354203e7c9 * Fix bug#16857 2021-11-30 06:14:53 +00:00
liyuchun ac79294f8d * Fix bug #16920. 2021-11-30 13:36:37 +08:00
zenggang 404a567b73 * Fix bug#16818 2021-11-30 00:53:46 +00:00
zenggang 1b6059c5b3 * Fix bug#16858 2021-11-29 08:41:24 +00:00
zenggang f837e6af2c * Fix bug#16762 2021-11-29 02:37:38 +00:00
zenggang 6bfdcd4e40 * Adjust mr create logic 2021-11-26 08:12:46 +00:00
liyuchun 0479696334 * Finish task #44798. 2021-11-25 17:23:46 +08:00
xiawenlong ace43eb90d * Fix code error 2021-11-23 19:11:03 +08:00
zenggang 8d458a0a72 * Finish task#44404 2021-11-23 11:08:15 +00:00
zenggang 699204dc87 * Finish task#44395 2021-11-22 07:20:48 +00:00
zenggang 2e677116d7 * Finish task#44399 2021-11-22 02:57:11 +00:00
zenggang 7c6a0b0e4e * Finish task#44402 2021-11-19 08:19:21 +00:00
zenggang 15ce4de1e4 * Finish task#44398 2021-11-19 06:36:47 +00:00
xiawenlong 34df7f8995 fix mr bug 2021-11-19 13:54:55 +08:00
zenggang 95e04b9bf0 * Finish task#44397 2021-11-18 10:27:39 +00:00
xiawenlong 8c1f8ea70c *Finish 44403,44406,44406,44401 2021-11-17 10:53:37 +08:00
dingguodong 4e97e695f3 * Correct the bad param type. 2021-11-16 10:55:27 +08:00
dingguodong 2d9d95cc98 * Correct or Optimize codes to meet code styles. 2021-11-16 10:46:48 +08:00
dingguodong 8dc0a669e9 * Correct bad comments or bad code style. 2021-11-12 18:15:02 +08:00
dingguodong 2f5e351b2c * Fix bug that compile status of the MR not synced. 2021-11-12 17:04:20 +08:00
dingguodong 6ce5b1de33 * Correct bad code style and resolve others. 2021-11-11 17:24:09 +08:00
zhujinyong 1515e07c04 * Fix bugs: Compatibility for old version. 2021-11-11 17:19:55 +08:00
dingguodong 0eaa75267f * Correct the browse link in MR module. 2021-11-11 10:30:40 +08:00
dingguodong 51960d25b4 Finish task#43858. review code in diff view of MR module. 2021-11-10 15:07:03 +08:00
dingguodong 58aef31f15 * Finish task#44144. 2021-11-09 18:18:06 +08: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
dingguodong 53d263c3c6 * Close and Reopen MR. 2021-11-08 15:33:39 +08:00
dingguodong cc14a18799 * Add approval for MR(Optimization is required). 2021-11-08 11:37:06 +08:00
dingguodong 2155948d19 * Add approve function for MR module. 2021-11-05 13:47:57 +08: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