Commit Graph
2395 Commits
Author SHA1 Message Date
胡方舟 ca8f702765 Merge branch 'zenops_69' into 'master'
* getXmindImport,showXmindImport,saveXmindImport use importXmind permission.

See merge request easycorp/zentaopms!7458
2023-04-18 07:44:26 +00:00
zhaoke 186d901af7 * getXmindImport,showXmindImport,saveXmindImport use importXmind permission. 2023-04-18 15:41:38 +08:00
朱金勇 68559a8cb8 * Fix bug#34248. 2023-04-17 05:49:33 +00:00
zhaoke 4bcd11acd3 * Update commits. 2023-04-13 16:38:59 +08:00
zhaoke e6faec7ba6 * Update commits. 2023-04-13 16:34:05 +08:00
zhaoke 3f3e644e70 * Add commit to testcase model. 2023-04-13 16:18:42 +08:00
zhaoke d94b0041d7 * Format css file. 2023-04-13 15:34:13 +08:00
zhaoke 9a7ade5b64 * Fix formatting issues. 2023-04-13 15:22:20 +08:00
zhaoke a64bc7d5ab * Move xmind functions to lib. 2023-04-13 13:51:34 +08:00
zhaoke eb833be4e5 Merge branch 'zenops_66' into zenops_69 2023-04-13 09:31:12 +08:00
zhaoke d401a87812 Merge branch 'master' into zenops_69 2023-04-13 09:09:49 +08:00
zhaoke 2b1ee45b2b Merge branch 'master' into zenops_66 2023-04-13 09:06:59 +08:00
zhaoke c596d736e7 - Remove syncToZentao checkbox. 2023-04-13 09:06:48 +08:00
zhaoke 5d0cc84425 * Fix case drag sort error. 2023-04-12 17:28:31 +08:00
zhaoke 290cd3f882 Merge branch 'zenops_66' into zenops_69 2023-04-07 11:19:27 +08:00
zhaoke 026897ad09 * Fix php notice. 2023-04-07 10:42:29 +08:00
zhaoke 1cd8eda1a1 * Fix bug #33845. 2023-04-07 09:59:55 +08:00
朱金勇 22f9f1d087 Merge branch 'db' 2023-04-05 14:30:11 +00:00
朱金勇 7f9d638d28 * Fix sql for dmdb. 2023-04-05 14:18:24 +00:00
zhaoke 94e840b5ce * Update testcase lang. 2023-04-03 14:36:37 +08:00
zhaoke e7119d4217 Merge remote-tracking branch 'origin/master' into zenops_66 2023-04-03 09:36:20 +08:00
zhaoke 8f76c455ee * Add import/export xmind to testcase module. 2023-03-31 10:14:51 +08:00
zhaoke e41d40afa7 Merge remote-tracking branch 'origin/master' into zenops_69 2023-03-31 09:58:36 +08:00
Yagami 7e54b48e64 * Fix bug https://www.zentao.net/thread/293693/p1.html?rand=62#106742. 2023-03-31 09:39:19 +08:00
zhaoke 8522e6fb58 * Add scene control and view file to testcase module. 2023-03-29 16:26:59 +08:00
liumengyi f06b94926e * Fix bug #32166. 2023-03-21 01:32:36 +00:00
zhaoke 7d47a91b98 Merge branch 'feature/42500' into zenops_66 2023-03-20 17:36:15 +08:00
guofeilong d063eb85db * Code for bug #32969 2023-03-20 13:57:38 +08:00
zhaoke 8631c957cf * Add sync button in testcase view. 2023-03-17 15:09:36 +08:00
caoyanyi 43f40e327f - Remove unused file. 2023-03-17 14:03:36 +08:00
zhaoke ddf2052721 Merge remote-tracking branch 'origin/zenops_zg' into zenops_66 2023-03-13 11:19:33 +08:00
tianshujie 1502801e71 * Fix bug #29497. 2023-03-09 13:19:40 +08:00
caoyanyi a951a96350 * Update project common lang. 2023-03-07 16:12:53 +08:00
tianshujie 903c858cf1 * Implement custom use case filter tags. 2023-03-06 16:36:06 +08:00
tianshujie cd7cd91673 * Modify language items for product common. 2023-03-06 15:30:33 +08:00
zenggang 00ab26727a * Finish task#85878,85879,85880,85881 2023-03-03 05:32:02 +00:00
caoyanyi 86c6968243 Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms into zentaopms_289 2023-03-03 08:48:41 +08:00
liuhong 6aaea2823e * Fix bug for testcase create view 2023-03-02 06:09:51 +00:00
caoyanyi a576a06b3f Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms into zentaopms_289 2023-02-27 09:05:16 +08:00
Yagami 6f8ec51731 Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms 2023-02-27 08:38:37 +08:00
Yagami d5c132ba12 * Remove unused code. 2023-02-27 08:38:27 +08:00
wangxuepeng 45ac0f5699 * Fix bug #32166. 2023-02-23 07:56:02 +00:00
wangxuepeng 8564f6fe0e * Fix bug #32166. 2023-02-23 07:52:27 +00:00
wangxuepeng 7f420cd374 * Fix bug #32166. 2023-02-23 07:32:36 +00:00
wangyidong 9ef211ef57 * code for task #84544. 2023-02-21 15:32:37 +08:00
tianshujie b20bcae852 Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms into sprint/285 2023-02-16 16:33:45 +08:00
xieqiyu 7ceb69b370 * Code for bug#25082. 2023-02-16 13:57:39 +08:00
tianshujie 2a388d06a7 Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms into sprint/285 2023-02-16 09:00:16 +08:00
hufangzhou f3cd2e7d4d * Change the Easy Soft to ZenTao Software. 2023-02-15 17:01:22 +08:00
孙广明 bd7084c8b5 Merge branch 'zenops_61' into 'master'
Zenops 61

See merge request easycorp/zentaopms!6951
2023-02-15 00:35:50 +00:00