Commit Graph
1013 Commits
Author SHA1 Message Date
朱金勇 1eae54c17b * Migrate admin of qucheng. 2023-06-09 03:31:44 +00:00
朱金勇 8d27ad86a2 * Migrate frontend of qucheng. 2023-06-09 00:59:40 +00:00
Guanxiying 69620350ea * Add definition of tables about meas. 2023-05-25 16:56:04 +08:00
孔令茂 472b8e44a2 * Add paramter rule for block's method printBlock. 2023-05-09 15:36:26 +08:00
hufangzhou dc8fcc9484 * Merge 18.4 into master. 2023-05-05 09:26:04 +08:00
liuchenglong d01ed35779 - Delete difine table. 2023-05-04 11:14:33 +00:00
liuchenglong 644ca03cd1 * Optimize getCount,getTodoProjects functions. 2023-05-04 08:47:27 +00:00
liuruogu 220e9fe30f * Do task #91972. 2023-04-26 19:02:33 +08:00
zhaoke a0c035343e * Fix bug #34826,34821,34815. 2023-04-26 15:30:50 +08:00
liyang 753ca8b04f * Fix untest db config. 2023-04-26 10:37:24 +08:00
dingguodong f8d08dd5a9 * Turn on the strict mode od MySQL. 2023-04-25 13:07:04 +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
王怡栋 fa40f834ac Merge branch 'sprint/hufangzhou_newVersion' into 'master'
* Add the new version.

See merge request easycorp/zentaopms!7542
2023-04-21 05:40:52 +00:00
hufangzhou e0d28390ab * Add the new version. 2023-04-21 13:35:49 +08:00
caoyanyi 25a88c88f0 * Adjust code. 2023-04-21 11:19:49 +08:00
caoyanyi 83cf8d0972 * Modify install and story report error. 2023-04-21 11:18:02 +08:00
王怡栋 b540679939 Merge branch 'tsj_fixbug' into 'master'
* Add a field default.

See merge request easycorp/zentaopms!7519
2023-04-20 09:32:43 +00:00
caoyanyi 59e5ce1d2f * Modify table name escape. 2023-04-20 17:22:13 +08:00
hufangzhou b7bbb9cb16 * Adjst the code. 2023-04-20 17:12:19 +08:00
hufangzhou e18b37128f Merge branch 'master' into zentaopms_304 2023-04-20 13:03:30 +08:00
caoyanyi 658b918897 * Modify api view page style. 2023-04-19 16:16:30 +08:00
hufangzhou 103cde4dae * Merge code. 2023-04-18 15:51:03 +08:00
胡方舟 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
liumengyi 648dc288ca Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms into zentaopms_304 2023-04-14 15:15:03 +08:00
朱金勇 e6b2ea4a04 Merge branch 'zenops_69' 2023-04-14 04:41:28 +00:00
tianshujie e5bcb8b2f9 * The ID of the last accessed object is retained. 2023-04-13 16:58:25 +08:00
liumengyi 825600f1fe - Delete the privilege of custom-index. 2023-04-13 16:01:32 +08:00
liumengyi 89f6632540 - Delete the privilege of user-cropAvatar. 2023-04-13 15:26:44 +08:00
liumengyi f5f9dd32e7 - Delete the privilege of company-index. 2023-04-13 15:25:30 +08:00
liumengyi e71c6b1548 - Delete the privilege of caselib-index. 2023-04-13 15:22:21 +08:00
liumengyi 452aa7cad3 - Delete the privilege of testsuite-index. 2023-04-13 15:19:39 +08:00
liumengyi 6e770918f2 - Delete the privilege of testcase-showImport. 2023-04-13 15:17:26 +08:00
liumengyi 8ed99bdf49 - Delete the privilege of execution-browse. 2023-04-13 14:50:36 +08:00
zhaoke a64bc7d5ab * Move xmind functions to lib. 2023-04-13 13:51:34 +08:00
zhaoke d401a87812 Merge branch 'master' into zenops_69 2023-04-13 09:09:49 +08:00
liumengyi ebbb87d900 * Fix bug of task #91011, and modify projectbuild to projectplan. 2023-04-12 17:15:02 +08:00
liumengyi 9fadd45264 Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms into zentaopms_304 2023-04-11 14:19:00 +08:00
caoyanyi 13a7efb50c Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms into release/zentaopms_18.3 2023-04-07 11:22:34 +08:00
wangyidong 38898d1a13 * code for task #89914. 2023-04-07 10:53:53 +08:00
liugang adc8d2d267 + Move the config of bi from biz version to open source version. 2023-04-06 10:11:42 +00:00
hufangzhou 3c83d94e09 * Merge code. 2023-04-06 09:01:30 +08:00
zhaoke 91af62ac48 Merge remote-tracking branch 'origin/master' into zenops_69 2023-04-04 13:46:52 +08:00
王怡栋 aa919a2021 Merge branch 'release/zentaopms_18.3' into 'master'
Release/zentaopms 18.3

See merge request easycorp/zentaopms!7298
2023-04-03 09:16:18 +00:00
liumengyi 25bb508e77 Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms into zentaopms_304 2023-04-03 17:10:36 +08:00
zhaoke 49d18cf72c Merge remote-tracking branch 'origin/master' into zenops_69 2023-04-03 16:46:41 +08:00
hufangzhou 932a524e8d * Init data for priv package. 2023-04-03 16:39:19 +08:00
tianshujie 978ded6788 * Code for task #89927. 2023-04-03 16:12:48 +08:00
daitingting de50c7f922 * Revert version. 2023-04-03 10:25:37 +08:00
liumengyi d3cf4b54f4 Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms into zentaopms_295 2023-04-03 09:58:23 +08:00