Commit Graph
1463 Commits
Author SHA1 Message Date
chaideqing 7b39fba095 - Reveme debug info. 2023-04-27 19:14:58 +08:00
caoyanyi 8456512566 * Split getByID method. 2023-04-27 19:09:37 +08:00
liuhong fb81f84310 * Adjust suspend function code with model and tao unit test 2023-04-27 15:41:44 +08:00
sunguangming abf11bed48 * Adjust for code-review. 2023-04-27 09:13:12 +08:00
sunguangming 2b22c6a337 Merge branch 'master' of https://git.zcorp.cc/easycorp/zentaopms 2023-04-27 09:10:21 +08:00
sunguangming 861e195891 * Adjust code-review opinions. 2023-04-27 09:07:40 +08:00
liuhong 99ae0f47a2 * submit suspend control and zen func code. 2023-04-26 19:15:56 +08:00
liuhong a385f48df8 * submit suspend function code. 2023-04-26 18:43:09 +08:00
sunguangming 516988dfe0 * Remove postData param from start function. 2023-04-26 18:25:19 +08:00
sunguangming a979d68ee6 * Refactor project-create method. 2023-04-26 18:17:52 +08:00
sunguangming bf759ade76 * Refactor project-start. 2023-04-26 16:15:18 +08:00
wangyidong b2b588adb4 * fix bug #34689. 2023-04-25 08:41:02 +08:00
wangyidong 2cd5d74fec * fix bug #34689. 2023-04-24 19:30:09 +08:00
wangyidong 901fc68f3c * adjust for change bizVersion to edition. 2023-04-24 17:00:52 +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
hufangzhou 438c55d059 * Merge code. 2023-04-19 16:18:56 +08:00
wangyidong d9e21d706a * fix bug #34362,34365,34361. 2023-04-19 14:50:43 +08:00
liumengyi 98e1cf39f0 Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms into zentaopms_304 2023-04-17 13:21:13 +08:00
朱金勇 a35c6f8dd8 * Fix bug#34268. 2023-04-17 04:52:55 +00:00
liumengyi 648dc288ca Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms into zentaopms_304 2023-04-14 15:15:03 +08:00
liumengyi bd6ada9429 - Delete the privilege of project-manageRepo. 2023-04-13 14:47:06 +08:00
liumengyi 07430ea118 - Delete the privilege of project-qa. 2023-04-13 14:32:38 +08:00
wangyidong 548a0c453c * fix bug #33700. 2023-04-13 13:03:42 +08:00
陈涛 b99d48fb65 * zin: refine project list page. 2023-04-12 15:48:43 +08:00
liumengyi 2397c644f5 * Finish task #91011. 2023-04-11 15:30:05 +08:00
王怡栋 f1bc3b73cc Merge branch 'tsj_doc' into 'master'
* Code for task #90792.

See merge request easycorp/zentaopms!7343
2023-04-11 00:35:16 +00:00
wangyidong 1a32c02940 * fix bug #33914. 2023-04-10 17:36:53 +08:00
tianshujie c99fed9fe9 * Code for task #90792. 2023-04-10 14:31:21 +08:00
wangyidong e24a70f5b7 * code for task #89150. 2023-03-31 10:46:52 +08:00
wangxuepeng bd0979b334 * Fix bug 33045. 2023-03-17 07:17:07 +00:00
陈涛 4499c9cc11 * zin: implements search form of project list page. 2023-03-14 15:50:10 +08:00
陈涛 e2c9cfcc3b + zin: implements project list page 2023-03-07 16:29:01 +08:00
liumengyi b25022e3b0 * Fix bug #31827. 2023-03-07 06:52:09 +00:00
mayue 772ec30c37 * Resolve feedback #2132. 2023-02-23 06:46:06 +00:00
tianshujie af76befb02 * Resolve issue #756. 2023-02-22 15:15:34 +08:00
hufangzhou f3800e9e38 * Code for task #85049. 2023-02-21 01:38:01 +00:00
wangyidong 36150659f7 * adjst code. 2023-02-21 09:35:47 +08:00
hufangzhou d4701a82f3 * Fix bug for project-execution feature bar active. 2023-02-20 09:14:32 +00:00
孙广明 a2dd5323ca Merge branch 'sprint/hufangzhou_task_85049' into 'master'
* Finish task #85049.

See merge request easycorp/zentaopms!7003
2023-02-20 08:26:46 +00:00
hufangzhou 2c1995d4a9 * Finish task #85049. 2023-02-20 07:23:49 +00:00
liuhong bdac3f1ffa * Resolved feedback 2099 2023-02-20 02:27:03 +00:00
hufangzhou 75b5b2562c * Finish task #84583. 2023-02-18 16:04:53 +00:00
Yagami f6dfccc9cd Merge branch 'zentaopms_284' 2023-02-16 17:22:15 +08:00
chaideqing b3eeb70b26 * Fix feedback feedback2204. 2023-02-16 11:59:17 +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
liumengyi 7ea51e54b5 * Finish task #84584. 2023-02-14 13:13:46 +08:00
tianshujie ec0078c708 Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms into zentaopms_284 2023-02-13 14:03:58 +08:00
xieqiyu e260ad29a0 * Code for bug#31948. 2023-02-07 14:43:20 +08:00
孙广明 57dbacf882 * Code for task #83937. 2023-02-06 19:03:55 +08:00