Commit Graph
161 Commits
Author SHA1 Message Date
zenggang b2875e7c20 * Adjust code 2022-01-28 01:17:50 +00:00
孙广明 307184ea77 Merge branch 'devops20_liyuchun' into 'master'
* Adjsut unit cases.

See merge request easycorp/zentaopms!1669
2022-01-27 05:04:51 +00:00
liyuchun 4b9ee0cc3c * Adjsut unit cases. 2022-01-27 11:16:10 +08:00
caoyanyi 9b8743c494 * Modify mr view style. 2022-01-26 08:40:55 +00:00
孙广明 edf6d49b46 Merge branch 'devops20_liyuchun' into 'master'
* Fix error in mr view.

See merge request easycorp/zentaopms!1640
2022-01-26 03:29:36 +00:00
liyuchun b6bf9f253d * Fix error in mr view. 2022-01-26 10:49:57 +08:00
zenggang 7aa6a292d4 * Adjust code for deleted project 2022-01-26 02:47:19 +00:00
liyuchun 555fbaddef Merge branch 'devops20' 2022-01-25 16:55:51 +08:00
caoyanyi c077f9ff4d * Modify auth check. 2022-01-24 08:20:40 +00:00
caoyanyi a2a1df2b9e * Modify isset check. 2022-01-24 08:08:24 +00:00
caoyanyi d0b289ed21 * Finish task #48108. 2022-01-24 07:46:22 +00:00
zenggang e315a62440 * Adjust code 2022-01-21 02:38:51 +00:00
zenggang 36c97752b4 * Finish task#48104 2022-01-20 09:25:44 +00:00
李玉春 39e8a3fae7 Revert "Merge branch 'devops_caoyanyi' into 'master'"
This reverts merge request !1515
2022-01-20 05:42:05 +00:00
caoyanyi f87294adf7 * Modify page error. 2022-01-20 05:37:33 +00:00
zenggang 4b0d2e842a * Fix bug#18456,18393,18392 2022-01-17 06:49:36 +00:00
zenggang a87d365a09 * Fix bug#18277 2022-01-07 03:03:44 +00:00
liyuchun 2c5d8abc45 * Fix bug #18150. 2022-01-04 16:15:17 +08:00
liyuchun 55c7c7e848 * Fix bug #18078. 2021-12-30 16:13:40 +08:00
zenggang bfde525f13 * Finish task#46555 2021-12-30 03:08:42 +00:00
zenggang 8e4cfa8744 * Finish task#46549 2021-12-29 02:29:19 +00:00
zenggang 4955bd5450 * Fix bug#17909,17910 2021-12-24 02:46:49 +00:00
zenggang b9e46558c5 * Code for task#46005 2021-12-23 09:21:51 +00:00
liyuchun aba26e05ac * Add unit testcase of delete tag. 2021-12-23 17:00:24 +08:00
liyuchun da283574bb * Fix errors. 2021-12-23 15:04:53 +08:00
李玉春 66bf2a0f80 Merge branch 'devops17_wangyidong_api' into 'devops17'
* code for mr diff that is from ztool.

See merge request easycorp/zentaopms!1080
2021-12-22 09:22:08 +00:00
王怡栋 11dc36d278 * code for mr diff that is from ztool. 2021-12-22 17:17:11 +08:00
王怡栋 0682282971 Merge branch 'sprint/devops17_liyuchun' into 'devops17'
* Code for task #46003.

See merge request easycorp/zentaopms!1077
2021-12-22 08:16:40 +00:00
liyuchun cdbff35897 * Code for task #46003. 2021-12-22 16:12:03 +08:00
zenggang 5751dd0783 * Fix bug#17846 2021-12-22 07:17:31 +00:00
李玉春 30acf3d2a7 Merge branch 'devops17' into 'devops17_wangyidong_46002'
# Conflicts:
#   db/update16.0.beta1.sql
2021-12-21 03:19:16 +00:00
caoyanyi 9e08030544 * Modify conflict status. 2021-12-17 07:52:19 +00:00
王怡栋 1a66159617 * code for task #46002. 2021-12-17 08:47:23 +08:00
zenggang af434d440a * Finish task#46142 2021-12-16 03:12:21 +00:00
李玉春 fb6f913229 Merge branch 'sprint/devops16_wangyidong_test' into 'master'
* code for bug #17445.

See merge request easycorp/zentaopms!920
2021-12-14 01:47:24 +00:00
王怡栋 98a46445b3 * code for bug #17445. 2021-12-13 17:24:52 +08:00
李玉春 fec4ab4604 Merge branch 'sprint/devops16_wangyidong_test' into 'sprint/devops16'
Sprint/devops16 wangyidong test

See merge request easycorp/zentaopms!888
2021-12-10 07:06:16 +00:00
王怡栋 c0ce88d4fb * fix bug #17352,17349,17347,17346. 2021-12-10 14:02:17 +08:00
liyuchun d121e2e01a * Fix bug #17293. 2021-12-10 10:11:56 +08:00
李玉春 8e4803745c Merge branch 'sprint/devops16_45445' into 'sprint/devops16'
* Adjust code

See merge request easycorp/zentaopms!867
2021-12-10 01:02:17 +00:00
liyuchun ddc651efbb * Code for task #45445. 2021-12-10 09:01:31 +08:00
王怡栋 760cfb42be Merge branch 'sprint/devops_liyuchun_45441' into 'sprint/devops16'
* Finish task #45439.

See merge request easycorp/zentaopms!852
2021-12-09 09:24:55 +00:00
zenggang dcc9200457 * Adjust code 2021-12-09 09:01:02 +00: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
王怡栋 973bb32da4 * fix error. 2021-12-09 13:30:48 +08:00
王怡栋 cc682f7953 * fix error. 2021-12-09 13:24:00 +08:00
liyuchun 07ce01bda2 * Finish task #45439. 2021-12-09 12:28:32 +08:00
王怡栋 f1689b4dea * code for task #45504. 2021-12-09 11:24:14 +08:00
zenggang 4061d19777 * Finish task#45445 2021-12-08 06:53:11 +00:00