Commit Graph
39636 Commits
Author SHA1 Message Date
王怡栋 6838f5bcb8 Merge branch 'sprint/zdoo18_wangyuting' into 'sprint/zdoo18'
* Add processing of datasource viewType.

See merge request easycorp/zentaopms!3790
2022-06-08 06:33:33 +00:00
wangyuting2 3fb390115c * Add processing of datasource viewType. 2022-06-08 14:23:42 +08:00
王怡栋 939b844340 Merge branch 'sprint/zdoo18_wangyuting' into 'sprint/zdoo18'
* Add openEntry function for js class.

See merge request easycorp/zentaopms!3770
2022-06-07 08:45:37 +00:00
wangyuting2 6e05fa0cfa * Add openEntry function for js class. 2022-06-07 15:16:38 +08:00
王怡栋 8c5303788a Merge branch 'sprint/daitingting_zdoo19_56054' into 'sprint/zdoo18'
* Finish task #56054.

See merge request easycorp/zentaopms!3764
2022-06-07 02:55:43 +00:00
daitingting 2b4cbd97c4 * Finish task #56054. 2022-06-07 02:52:36 +00:00
王怡栋 0c6f4262e2 Merge branch 'sprint/daitingting_zdoo18_formatTime' into 'sprint/zdoo18'
* Return empty string when the time is empty.

See merge request easycorp/zentaopms!3751
2022-06-06 07:48:42 +00:00
daitingting 53b1eabf0e * Return empty string when the time is empty. 2022-06-06 07:46:12 +00:00
王怡栋 32fb4bc372 Merge branch 'sprint/zdoo18_wangyuting' into 'sprint/zdoo18'
* Finish task #12469.

See merge request easycorp/zentaopms!3729
2022-06-02 09:21:28 +00:00
wangyuting2 2c4c1a4779 * Finish task #12469. 2022-06-02 16:10:04 +08:00
wangyidong 644a4f1a59 * rename sql. 2022-06-02 15:13:24 +08:00
wangyidong fb786e9cf6 * remove useless flow action. 2022-06-02 15:02:38 +08:00
王怡栋 9c2ccfd8f7 Merge branch 'sprint/zdoo18_wangyuting' into 'sprint/zdoo18'
* Finish task #55566.

See merge request easycorp/zentaopms!3706
2022-06-02 03:11:53 +00:00
wangyuting2 065f5e738a * Finish task #55566. 2022-06-02 11:00:17 +08:00
wangyidong 58e50c287c * code for task #55554. 2022-06-01 17:16:45 +08:00
wangyidong 2400dfc83a * code for task #55568. 2022-06-01 14:48:35 +08:00
wangyidong 6f5689de1a * adjust for create testcase-edit link in different tab. 2022-05-31 16:16:50 +08:00
王怡栋 cf8fcb2c39 Merge branch 'sprint/193_hufangzhou_23058' into 'master'
* Fix bug #23058.

See merge request easycorp/zentaopms!3656
2022-05-30 09:15:10 +00:00
wangyidong a899fad671 * check $_SERVER['REQUEST_URI'] var. 2022-05-30 17:06:18 +08:00
hufangzhou 48b0d60744 * Fix bug #23058. 2022-05-30 10:26:37 +08:00
李玉春 ba24d53a03 Merge branch 'sprint/tianshujie_fixbug' into 'master'
Sprint/tianshujie fixbug

See merge request easycorp/zentaopms!3655
2022-05-30 02:05:18 +00:00
tianshujie 240cefb5df * Fixed kanban card style issues. 2022-05-30 09:21:39 +08:00
李玉春 a4b7149497 Merge branch 'sunhuawei_fixbug_22873' into 'master'
*Fix bug #22873.

See merge request easycorp/zentaopms!3650
2022-05-30 01:18:09 +00:00
tianshujie e037b9c102 * Fixed kanban card avatar style. 2022-05-30 09:14:58 +08:00
孙华伟 34b536605a Update action.html.php 2022-05-30 01:14:45 +00:00
李玉春 a29aa19cf6 Merge branch 'sprint/tianshujie_fixbug' into 'master'
* Fix the display style of the task card.

See merge request easycorp/zentaopms!3654
2022-05-30 01:07:30 +00:00
tianshujie 5fe9641ce9 * Fix the display style of the task card. 2022-05-30 09:04:53 +08:00
孙广明 747e83db18 Merge branch 'sprint/192_leiyong_bug_22948' into 'master'
* Fix bug#22948.

See merge request easycorp/zentaopms!3638
2022-05-29 06:01:24 +00:00
王怡栋 87ea05d48c Merge branch 'master_xieiqyu_54988' into 'master'
* Restore code for task#54988.

See merge request easycorp/zentaopms!3651
2022-05-27 07:57:56 +00:00
孙华伟 dc2ba1c238 *Fix bug #22873. 2022-05-27 15:41:16 +08:00
李玉春 5cc0364563 Merge branch 'sprint/194_tianshujie_fixbug' into 'master'
* Fix bug #23010.

See merge request easycorp/zentaopms!3649
2022-05-27 06:55:49 +00:00
tianshujie a9021ec5a3 * Fix bug #23010. 2022-05-27 14:15:59 +08:00
孙广明 f8b4af39a8 Merge branch 'sprint/194_tianshujie_issue' into 'master'
* Finish issue #649.

See merge request easycorp/zentaopms!3644
2022-05-27 05:51:37 +00:00
tianshujie bc85c85a9c * Add testcase of task module. 2022-05-27 13:50:19 +08:00
孙广明 a85512f73c Merge branch 'sprint/194_liumengyi_23012' into 'master'
* Fix bug #22533.

See merge request easycorp/zentaopms!3642
2022-05-27 05:35:39 +00:00
孙广明 9e58f8e412 Merge branch 'sprint/193_hufangzhou_23032' into 'master'
* Fix bug #23032.

See merge request easycorp/zentaopms!3645
2022-05-27 05:35:08 +00:00
朱金勇 3e53fed7b7 Merge branch 'sprint/sunhao/bug22690' into 'master'
* bug #22690, optimize style for custom pri labels.

See merge request easycorp/zentaopms!3636
2022-05-27 05:34:56 +00:00
hufangzhou 08affe0373 * Fix bug #23032. 2022-05-27 13:32:08 +08:00
王怡栋 8739de2a7f Merge branch 'sprint/193_hufangzhou_22992' into 'master'
* Fix bug #22992.

See merge request easycorp/zentaopms!3643
2022-05-27 05:27:56 +00:00
tianshujie 93943c76dc * Finish issue #649. 2022-05-27 13:26:12 +08:00
hufangzhou 02e6680d05 * Fix bug #22992. 2022-05-27 13:25:44 +08:00
王怡栋 2bdca017ca Merge branch 'sprint/189_package_lanzongjun' into 'master'
* fix bug #23002

See merge request easycorp/zentaopms!3633
2022-05-27 05:12:18 +00:00
liumengyi 6a61aa3500 * Fix bug #22533. 2022-05-27 11:08:15 +08:00
李玉春 84fe5b847e Merge branch 'sprint/194_liumengyi_23012' into 'master'
* Fix bug #23012.

See merge request easycorp/zentaopms!3641
2022-05-27 03:02:02 +00:00
liumengyi 62445ea7b0 * Code format. 2022-05-27 10:59:23 +08:00
liumengyi f889692b40 * Remove empty line. 2022-05-27 10:47:19 +08:00
liumengyi 87ef728908 * Fix bug #23012. 2022-05-27 10:46:02 +08:00
李玉春 c96ae16062 Merge branch 'sprint/194_liumengyi_23012' into 'master'
* Fix bug #23022.

See merge request easycorp/zentaopms!3637
2022-05-27 01:54:16 +00:00
liumengyi ecdbeb4e0a * Fix bug #23022. 2022-05-27 09:51:32 +08:00
leiyong 2370066590 * Fix bug#22948. 2022-05-27 01:51:14 +00:00