Commit Graph
1723 Commits
Author SHA1 Message Date
zhaoke ef669fa3d1 Merge branch 'master' of git.zcorp.cc:easycorp/zentaopms 2023-04-28 17:08:44 +08:00
liuhong 788487718c Merge branch 'master' of https://git.zcorp.cc/easycorp/zentaopms 2023-04-28 17:07:00 +08:00
liuhong 12844991fe * Adjust code. 2023-04-28 17:06:37 +08:00
caoyanyi 982d14d3f1 * Modify function file. 2023-04-28 17:04:50 +08:00
liuhong 2bbae38f23 * Split the delete method into the zen layer 2023-04-28 16:00:48 +08:00
chaideqing a4fe2faf4f * Refactor model->unlinkmember. 2023-04-28 15:59:40 +08:00
zhaoke f6c570d551 * Modify ajaxGetDropMenu. 2023-04-28 15:59:21 +08:00
caoyanyi f05e7bd17e * Add testcase for function getbyshadowproduct. 2023-04-28 14:24:28 +08:00
sunguangming aeb8874921 Merge branch 'master' of https://git.zcorp.cc/easycorp/zentaopms 2023-04-28 14:04:40 +08:00
sunguangming 562ded136e Merge branch 'master' of https://git.zcorp.cc/easycorp/zentaopms 2023-04-28 14:04:35 +08:00
guofeilong 45af6d2fbb * Code for function getBudgetWithUnit . 2023-04-28 14:04:15 +08:00
sunguangming 0fe9030349 * Refactor project-create method. 2023-04-28 14:02:55 +08:00
liuhong c1375ea72f * Split closed methods into Zen and Tao layers and output unit tests 2023-04-28 12:26:51 +08:00
sunguangming 434572eefd Merge branch 'master' of https://git.zcorp.cc/easycorp/zentaopms 2023-04-27 19:29:24 +08:00
sunguangming e6586c84a2 * Refactor project-create method. 2023-04-27 19:29:00 +08:00
caoyanyi 8456512566 * Split getByID method. 2023-04-27 19:09:37 +08:00
chaideqing bfaf11e74d - Delete puoff. 2023-04-27 19:04:21 +08:00
liuhong b7ae9f389e Merge branch 'master' of git.zcorp.cc:easycorp/zentaopms 2023-04-27 15:42:56 +08:00
liuhong fb81f84310 * Adjust suspend function code with model and tao unit test 2023-04-27 15:41:44 +08:00
guofeilong 412ea9d60d * Code for function activate test. 2023-04-27 15:13:21 +08:00
guofeilong 6df3a2952f * Code for func project start . 2023-04-27 13:34:28 +08:00
guofeilong 422c5f1683 * Code for function activate . 2023-04-27 13:23:49 +08:00
sunguangming 861e195891 * Adjust code-review opinions. 2023-04-27 09:07:40 +08:00
sunguangming 7fb41fcc09 * Add default type to param. 2023-04-26 18:55:01 +08:00
guofeilong 4dc811b7dc * Code for project activate . 2023-04-26 18:46:33 +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
tianshujie da3ce6e392 * Fix bug #34762. 2023-04-24 20:05:06 +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
caoyanyi e266ad301a * Fix bug #34473. 2023-04-21 11:29:00 +08:00
liumengyi 7fe3662ea7 Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms into zentaopms_304 2023-04-19 14:09:20 +08:00
tianshujie 1fe920f873 * Compatible with Quick Edition project dropdown issues. 2023-04-18 15:04:09 +08:00
liumengyi b8e8c3d788 Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms into zentaopms_304 2023-04-18 13:16:42 +08:00
wangyidong 0d31625643 * code for task #91388. 2023-04-18 13:05:14 +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
朱金勇 bb531cfd2c * Fix bugs in dmdb. 2023-04-13 05:10:17 +00: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
朱金勇 58f458f6d0 * Fix bugs of program action. 2023-04-11 05:28:42 +00:00
朱金勇 0dde8ad3ed Fix default value of db. 2023-04-10 09:19:01 +00:00
朱金勇 75a3485f47 * Fix order in dmdb. 2023-04-10 03:13:24 +00:00
caoyanyi e90e7b9160 * Mofify api struct page locate. 2023-04-07 16:07:28 +08:00
tianshujie e6591f64d8 * Fix bug #33759. 2023-04-06 08:57:42 +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
liumengyi b873f07eb0 * Main lib's acl is default. 2023-03-29 14:39:38 +08:00
liumengyi 00f30608bc * Fix bug #33102. 2023-03-20 08:29:19 +00:00