Commit Graph
1055 Commits
Author SHA1 Message Date
tianshujie 7372f7f936 * Finish story #32623. 2022-06-22 08:51:05 +08:00
tianshujie 33cecbfcd3 * Optimize the code. 2022-06-17 13:14:55 +08:00
zhouxin 68b8268391 * Finish task #55258. 2022-06-13 01:25:38 +00:00
tianshujie 5dff5c5eb4 * Resolve issue #674. 2022-06-10 16:01:51 +08:00
tianshujie 9162162212 * Fix bug #23573. 2022-06-10 15:14:43 +08:00
tianshujie 01c135440b * Fix bug #23455. 2022-06-10 09:31:44 +08:00
tianshujie 6825ac20c4 * Fix bug #23421. 2022-06-10 09:31:00 +08:00
王怡栋 196b78a0aa Merge branch 'sprint/201_tianshujie_56476' into 'master'
Sprint/201 tianshujie 56476

See merge request easycorp/zentaopms!3794
2022-06-08 06:48:46 +00:00
tianshujie 9cb0df56c6 * Finish task #56453. 2022-06-08 11:05:32 +08:00
孙广明 b896377846 * Change zentao license. 2022-06-08 10:02:29 +08:00
孙广明 b528156589 * Change license. 2022-06-08 09:34:46 +08:00
李玉春 6fe727b009 Update model.php 2022-06-06 02:13:20 +00:00
宋辰轩 8f4cc42550 * Modify function return. 2022-06-06 10:09:48 +08:00
宋辰轩 6af617ec3b Merge branch 'master' into sprint/scx_zaction 2022-06-06 08:30:30 +08:00
Wenrui LI b627bab5a0 * filter out all xuan actions. 2022-05-29 13:46:24 +08:00
宋辰轩 53c84c3480 * Delete /tmp/patch and patch actions after upgrade. 2022-05-26 17:10:33 +08:00
宋辰轩 e7b5dcec09 * Create action for ztools. 2022-05-26 11:22:43 +08:00
hufangzhou 27ec156f88 * Add the new version. 2022-05-26 09:52:33 +08:00
zenggang 430209e92b * Fix bug#22554,22673 2022-05-19 03:23:35 +00:00
李玉春 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