Commit Graph
45973 Commits
Author SHA1 Message Date
wangyidong deb373941a Merge branch 'zentaopms_239_task#71585' into zentaopms_239 2022-10-10 17:23:09 +08:00
王怡栋 c943f77c80 Merge branch 'zentaopms_239' into 'zentaopms_239_task#71585'
# Conflicts:
#   module/testtask/model.php
2022-10-10 09:22:39 +00:00
王怡栋 abcdde7ea3 Merge branch 'zentaopms_239_wangyuting' into 'zentaopms_239'
* Fix systemMode bug.

See merge request easycorp/zentaopms!5710
2022-10-10 09:18:50 +00:00
sunguangming 9a32b08644 * Fix bug #28393. 2022-10-10 16:41:39 +08:00
李玉春 9c9bd3d848 Merge branch 'zentaopms_239_wangjianhua_70793' into 'zentaopms_239'
* Hide creating repo button if project has no product.

See merge request easycorp/zentaopms!5708
2022-10-10 08:29:55 +00:00
wangjianhua f783a3f2a0 * Change boolean operator. 2022-10-10 16:26:08 +08:00
sunguangming 0b24d258e4 * Fix bug #28290. 2022-10-10 15:49:09 +08:00
wangyuting2 aa9bc2b8ec * Fix systemMode bug. 2022-10-10 07:32:11 +00:00
liugang f0d3d3e70f * Fix bug #27897. 2022-10-10 14:57:30 +08:00
wangjianhua 8ec12030ef * Hide creating repo button if project has no product. 2022-10-10 14:24:56 +08:00
wangyidong c13286de9e * code for task #71659. 2022-10-10 14:13:25 +08:00
daitingting f8259297b7 * Finish task #71585,#71586,#71587. 2022-10-10 05:46:31 +00:00
liugang 4512eaf2b4 * Fix bug #27899. 2022-10-10 13:40:04 +08:00
liugang 3cb2f063cd * Fix error param. 2022-10-10 13:39:34 +08:00
liugang 986b7ff785 * Fix bug #27906. 2022-10-10 13:32:00 +08:00
liugang a46a83eb49 * Fix bug #27893. 2022-10-10 13:23:03 +08:00
sunguangming 541b100471 * Fix bug #28339,#28326. 2022-10-10 13:21:39 +08:00
wangyidong 8fdde5fa0e * code for task #71616. 2022-10-10 11:31:03 +08:00
sunguangming 87bc77221f * Fix bug #28348. 2022-10-10 11:19:13 +08:00
liugang 8c952ffe3b * Fix bug #28342. 2022-10-10 11:09:29 +08:00
王怡栋 e65c5bd607 Merge branch 'zentaopms_239_task#71645' into 'zentaopms_239'
* Finish task #71645.

See merge request easycorp/zentaopms!5700
2022-10-10 03:02:36 +00:00
王怡栋 97f4bdac55 Merge branch 'zentaopms_239_task#71580' into 'zentaopms_239'
* Finish task #71580,#71581,#71582,#71583,#71584.

See merge request easycorp/zentaopms!5694
2022-10-10 03:01:48 +00:00
王怡栋 d25752de05 Merge branch 'zentaopms_239_task#71648' into 'zentaopms_239'
* Finish task #71648.

See merge request easycorp/zentaopms!5693
2022-10-10 03:00:06 +00:00
王怡栋 f5209c2fc0 Merge branch 'zentaopms_239_bug#28291' into 'zentaopms_239'
* Fix bug #28291.

See merge request easycorp/zentaopms!5685
2022-10-10 02:59:24 +00:00
王怡栋 16ca720a08 Merge branch 'zentaopms_239_task#71576' into 'zentaopms_239'
* Finish task #71576,#71577,#71578,#71579.

See merge request easycorp/zentaopms!5684
2022-10-10 02:59:07 +00:00
wangyidong e9b5ab09cc * code for task #71612. 2022-10-10 10:45:36 +08:00
liugang c2289a381c * Fix bug #28344. 2022-10-10 10:34:46 +08:00
wangyidong 0e12fd8930 * code for task #71610. 2022-10-10 10:25:04 +08:00
wangyidong d1f5709027 * code for task #71610. 2022-10-10 10:22:13 +08:00
wangyuting2 79aca158d8 * Finish task #71645. 2022-10-10 02:05:06 +00:00
liugang 1fe49e8b1e * Fix bug #27894. 2022-10-10 09:32:47 +08:00
wangyidong fb6235dd76 Merge branch 'zentaopms_239' of https://gitlab.zcorp.cc/easycorp/zentaopms into zentaopms_239 2022-10-10 09:08:57 +08:00
李玉春 be9e0b7ff9 Merge branch 'zentaopms_239_wangjianhua_70792' into 'zentaopms_239'
* Finish task #70792: Create code repository in module of project without product.

See merge request easycorp/zentaopms!5687
2022-10-10 01:08:30 +00:00
wangyidong a51f42e7b8 * code for task #71609. 2022-10-10 09:08:28 +08:00
wangyidong 059cf9a8af * code for task #71608. 2022-10-09 17:24:56 +08:00
liugang e19ff62117 * Fix bug #28278. 2022-10-09 17:16:37 +08:00
刘刚 bb9bd954a9 Merge branch 'sprint/239_liuruogu_bug' into 'zentaopms_239'
* Fix bug #28289.

See merge request easycorp/zentaopms!5695
2022-10-09 09:08:09 +00:00
liuruogu 18a6694b4c * Fix bug #28289. 2022-10-09 09:00:41 +00:00
liugang 48703a3f26 * Fix bug #28271. 2022-10-09 16:53:11 +08:00
liugang bc7506003f * Fix bug #28275. 2022-10-09 16:24:08 +08:00
daitingting 39064a3e22 * Finish task #71580,#71581,#71582,#71583,#71584. 2022-10-09 08:22:27 +00:00
wangyuting2 4fcf7ae1bd * Optimize code. 2022-10-09 08:14:10 +00:00
wangyuting2 82b7246b8d * Finish task #71648. 2022-10-09 07:44:39 +00:00
sunguangming 55de5d362b * Fix bug #28293. 2022-10-09 15:33:33 +08:00
wangjianhua 821d93a2cd * Improve codes to query product. 2022-10-09 15:03:41 +08:00
wangjianhua fbf7bd7907 * Finish task #70792: Create code repository in module of project without product. 2022-10-09 14:43:52 +08:00
liugang 0efa9c5f00 * Fix bug #28288. 2022-10-09 14:39:15 +08:00
wangyidong 07a41aa312 Merge branch 'zentaopms_239' of https://gitlab.zcorp.cc/easycorp/zentaopms into zentaopms_239 2022-10-09 14:30:59 +08:00
刘刚 9f5727879f Merge branch 'sprint/239_liuruogu_bug_light' into 'zentaopms_239'
* Fix light for product.

See merge request easycorp/zentaopms!5678
2022-10-09 06:27:59 +00:00
wangyidong 50c365d5b0 * code for task #71604. 2022-10-09 14:26:59 +08:00