Commit Graph
976 Commits
Author SHA1 Message Date
sunguangming 7928e46b5d * Revert file. 2023-11-27 13:55:08 +08:00
sunguangming b9b52ac28b * Remove unused code. 2023-11-27 13:08:26 +08:00
dingguodong 9c33c436e9 * Fix typo. 2023-08-07 13:31:16 +08:00
dingguodong 07411bf989 + Set $users variable if it omitted. 2023-07-12 14:51:02 +08:00
朱金勇 ad288b3f1d * Use isServing() instead of IN_USE. 2023-07-10 05:56:05 +00:00
朱金勇 ccb6a094f9 * Change constant to variable. 2023-07-10 04:31:47 +00:00
朱金勇 f390fe7bd4 * Fix ambiguity of if. 2023-05-29 05:18:23 +00:00
sunhao dcbd33482c * zin: replace vars with php var name in zin tool output 2023-05-04 18:53:33 +08:00
jukui 9da97821f6 * Modify view and editDate function todo. 2023-04-28 09:52:02 +08:00
Hao Sun ed31bffa6c Merge branch 'zin_merge'
# Conflicts:
#	framework/base/control.class.php
#	framework/control.class.php
2023-04-23 19:44:40 +08:00
Hao Sun 2bcc9bdbf4 Merge branch 'zin_dev'
# Conflicts:
#	module/common/lang/zh-cn.php
#	module/product/lang/de.php
#	module/product/lang/en.php
#	module/product/lang/fr.php
#	module/product/lang/zh-cn.php
#	module/program/js/browse.js
#	module/program/lang/de.php
#	module/program/lang/en.php
#	module/program/lang/fr.php
#	module/program/lang/zh-cn.php
#	module/project/config.php
#	module/project/lang/de.php
#	module/project/lang/en.php
#	module/project/lang/fr.php
#	module/project/lang/zh-cn.php
#	module/search/view/buildform.html.php
#	module/task/control.php
2023-04-23 19:20:45 +08:00
Hao Sun 8ad7706270 * zin: move index/app.ui.js to zin.js 2023-04-18 19:48:48 +08:00
dingyongliang 61759d7d2b * zin rm a. 2023-04-18 14:22:36 +08:00
zhaoke a64bc7d5ab * Move xmind functions to lib. 2023-04-13 13:51:34 +08:00
zhaoke 8522e6fb58 * Add scene control and view file to testcase module. 2023-03-29 16:26:59 +08:00
dingyongliang 214c010ef9 * zin: refactor. 2023-03-28 14:33:46 +08:00
王怡栋 f51c04d4fc Merge branch 'tsj_fixbug' into 'master'
* Fix bug.

See merge request easycorp/zentaopms!7252
2023-03-21 05:26:30 +00:00
caoyanyi 799b3b366f * Code for bug #33144. 2023-03-21 11:19:24 +08:00
hufangzhou fed2f109b3 * Fix bug #33117. 2023-03-21 10:44:49 +08:00
Hao Sun 8d466c52ac * zin: add zin tool to convert old views 2023-03-17 15:03:57 +08:00
caoyanyi 813021747b * Code for bug #32997, 32999. 2023-03-16 11:19:36 +08:00
Hao Sun 191d565e62 * zin: refactor 2023-03-15 17:23:19 +08:00
tianshujie 16c28d0f70 * Add skip stash class. 2023-03-13 14:30:09 +08:00
Yagami b151d1fb32 * Finish task #85459. 2023-02-24 14:50:37 +08:00
tianshujie 792f1c5a98 Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms into sprint/285 2023-02-17 08:33:25 +08:00
tianshujie ad1d1631a3 * Code for finish task #84593. 2023-02-16 14:42:27 +08:00
tianshujie be00a4a8ae * Code for finish task #84580. 2023-02-16 09:29:05 +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
tianshujie 484f34396c Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms into zentaopms_284 2023-02-16 08:59:00 +08:00
hufangzhou f3cd2e7d4d * Change the Easy Soft to ZenTao Software. 2023-02-15 17:01:22 +08:00
Yagami da62f994d9 Merge branch 'sgm_dtable' into zentaopms_284 2023-02-15 15:49:53 +08:00
Yagami 947307c349 * Fix bugs for dtable. 2023-02-15 11:14:09 +08:00
liumengyi a5807a3a68 * Hide change table mode when currentModule is execution and currentMethod is all. 2023-02-10 13:40:30 +08:00
Yagami 7d5d82693a * Add dtable. 2023-02-08 17:45:51 +08:00
tianshujie 3c4c046f5f * Delete space. 2023-02-08 10:43:38 +08:00
tianshujie c29df55df8 * Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms into sprint/285 2023-02-08 10:39:45 +08:00
chaideqing ed34ae2cae * Hide drop-down menu when click one item. 2023-01-30 09:39:55 +00:00
tanghucheng f499e9e4af * Remove init operation for zahost and zanode. 2023-01-12 13:22:03 +08:00
caoyanyi 23de8e8d4e * Update zui. 2023-01-03 17:03:46 +08:00
tianshujie 15b9176f8d Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms into zin 2023-01-03 16:52:49 +08:00
tanghucheng 5b2babca14 Merge branch 'master' into zenops_46 2022-12-20 16:36:44 +08:00
wangyidong ac9e876101 * code task #80452. 2022-12-20 13:53:37 +08:00
tanghucheng 769c65781b * Fix bug #30971. 2022-12-16 19:16:56 +08:00
tanghucheng e7a96aa7d2 * Finish task #78645. 2022-12-07 14:24:05 +08:00
mayue 94bf632389 * Fix bug #29958. 2022-11-22 10:15:33 +08:00
tianshujie f37ca78f61 * Add actions of program list. 2022-11-10 10:07:26 +08:00
tianshujie 0ad559a413 * Finish task #73291. 2022-11-09 17:16:43 +08:00
caoyanyi e593c657d4 * Adjust code. 2022-11-08 10:26:13 +08:00
caoyanyi e685316a70 * Modify zui load. 2022-11-08 10:24:55 +08:00
wangyidong 9761648d59 Merge branch 'zentaopms_239' 2022-11-08 08:41:28 +08:00