Commit Graph
1036 Commits
Author SHA1 Message Date
李玉春 579391bd84 Merge branch 'sprint/191_liumengyi_54350' into 'master'
* Finish task #54350.

See merge request easycorp/zentaopms!3506
2022-05-19 03:18:38 +00:00
liumengyi d2f30493a3 * Code format for task#54350. 2022-05-19 11:17:15 +08:00
liumengyi ff4e5ba635 * Fix bug for task#54350. 2022-05-19 10:24:14 +08:00
tianshujie 45e4fcdfab * Fix bug #22636. 2022-05-18 16:51:09 +08:00
liumengyi b8c091aa27 * Finish task #54350. 2022-05-18 15:17:51 +08:00
wangyidong 8aad51ace3 Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms 2022-05-18 10:29:11 +08:00
wangyidong d6cf08b9d7 Merge branch 'tid' 2022-05-18 10:20:48 +08:00
tianshujie c0d9625c1d * Add testcase of kanban module. 2022-05-17 17:07:36 +08:00
tianshujie e2e88e4952 * Finish task #54391. 2022-05-17 14:53:43 +08:00
hufangzhou 7cc75bf80a * Fix bug #22250. 2022-05-16 13:43:36 +08:00
hufangzhou b9a60485c3 * Fix bug #22439. 2022-05-13 09:33:37 +08:00
王怡栋 57b96215b3 Merge branch 'sprint/189_hufangzhou_issue' into 'master'
* Resolve issue #634.

See merge request easycorp/zentaopms!3369
2022-05-12 08:48:06 +00:00
tianshujie 85469bca87 * Fix bug #22436. 2022-05-12 16:34:23 +08:00
hufangzhou 60f8ffd05e * Resolve issue #634. 2022-05-12 16:24:09 +08:00
王怡栋 125a97d530 Merge branch 'sprint/189_hufangzhou_22429' into 'master'
* Fix bug #22429.

See merge request easycorp/zentaopms!3366
2022-05-12 07:55:10 +00:00
hufangzhou a8ce3a757d * Fix bug #22399. 2022-05-12 15:51:02 +08:00
hufangzhou 4c7619bcb9 * Fix bug #22429. 2022-05-12 15:46:49 +08:00
sunjun 276ddada57 *Fixbug_sunjun_22394 2022-05-12 07:07:42 +00:00
hufangzhou d99acc8cf8 * Remove the unused code. 2022-05-12 13:37:11 +08:00
hufangzhou 80124c681e * Fix bug #22364. 2022-05-12 13:29:39 +08:00
hufangzhou 0657b7bb99 * Code for task #53673. 2022-05-11 14:34:15 +08:00
hufangzhou 3680af6833 * Finish task #53673. 2022-05-11 10:05:09 +08:00
hufangzhou 90265f93d8 * Add the new version. 2022-05-06 13:48:21 +08:00
孙广明 c7c2c75870 Merge branch 'sprint/master_zhouxudong_22032' into 'master'
Sprint/master zhouxudong 22032

See merge request easycorp/zentaopms!3197
2022-04-28 10:31:22 +00:00
zhouxudong 8ac71d35c5 * Fix bug #22032. 2022-04-28 09:25:28 +00:00
zhouxudong aa0e8579cf * Fix bug #22032. 2022-04-28 09:21:47 +00:00
zhouxudong 2dd822a1f7 * Fix bug #22032. 2022-04-28 07:42:14 +00:00
zhouxudong b8880f493e * Fix bug #22023. 2022-04-28 07:02:37 +00:00
zhouxudong a2d0d3d6cd * Fix bug #22023. 2022-04-28 07:01:02 +00:00
zhouxudong 3ca8412a84 * Fix bug #22032. 2022-04-28 06:50:09 +00:00
zhouxudong 66648d3722 * Fix bug #22027. 2022-04-27 08:03:08 +00:00
lanzongjun 9b3b3b1e1a * fix bug #21988 2022-04-27 13:50:25 +08:00
wangyidong 47b07058f1 * code for bug #15453. 2022-04-26 13:54:55 +08:00
liumengyi 0c3aa457ce * Fix bug #3079. 2022-04-22 13:12:02 +08:00
王怡栋 6c46a39ca1 Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms 2022-04-20 11:27:06 +08:00
王怡栋 eec155064a * fix bug #20933. 2022-04-20 11:26:32 +08:00
zenggang 217cc71960 * Fix bug#14478,19305 2022-04-19 09:21:02 +00:00
zhouxudong 36946a8fb1 * Fix bug #20178. 2022-04-18 14:47:04 +08:00
zhouxudong c449b53e4b * Fix bug #20178. 2022-04-18 13:59:09 +08:00
zhouxudong 532920579e * Fix bug #20178. 2022-04-18 13:20:44 +08:00
xieqiyu f5b55eecfe * Fix bug#20006. 2022-04-13 15:03:57 +08:00
hufangzhou 18293e3e0d * Fix bug #15656. 2022-04-13 11:19:20 +08:00
hufangzhou baf4a67ed8 * Fix bug #15633. 2022-04-12 09:51:09 +08:00
王怡栋 4b8ed58692 Merge branch 'sprint/fixbug_hufangzhou_doclibaction' into 'master'
* Fix the bug of doc lib related actions don't show.

See merge request easycorp/zentaopms!2755
2022-04-07 08:21:03 +00:00
tianshujie 0530b892e4 * Fix bug #18710. 2022-04-06 15:22:15 +08:00
hufangzhou 87a515c803 * Fix the bug of doc lib related actions don't show. 2022-04-06 09:53:13 +08:00
Wenrui LI c96c0140a5 * add comment. 2022-04-01 08:59:44 +08:00
Wenrui LI 0a843861bf * fix case. 2022-04-01 08:58:35 +08:00
Chenjianyu dfc34f44bc * Fix bug #18041, discard xuanxuan login actions from getDynamic. 2022-03-29 14:53:51 +08:00
tanghucheng 7b09af074b * Fix bug #21008. 2022-03-28 14:37:44 +08:00