Commit Graph
1400 Commits
Author SHA1 Message Date
wangxuepeng 08929417bd * Refactor method editComment of the action module. 2023-09-06 09:03:41 +00:00
wangxuepeng 7866b0d853 * Refactor method comment of the action module. 2023-09-06 07:32:48 +00:00
dingguodong 5859a354ea * Rename checkTopStage to isTopStage for balance. 2023-09-06 14:37:18 +08:00
wangxuepeng 5a6ce289a4 * Refactor method hideAll of the action module. 2023-09-05 08:28:57 +00:00
wangxuepeng 26be65927e * Refactor method hideOne of the action module. 2023-09-05 07:37:02 +00:00
wangxuepeng f7d50b3630 * Refactor method undelte of the action module. 2023-09-05 07:29:28 +00:00
zhaoke f2d090c00a * Fix bug #38242. 2023-09-05 15:24:14 +08:00
wangxuepeng a22bc8802b * Recover the create method of the module layer of the action module. 2023-08-31 07:54:51 +00:00
wangxuepeng 1b8605fbed * Refactor action control undelete. 2023-08-31 01:47:43 +00:00
dingguodong b1c5342cd4 * Refactor this function. 2023-08-30 14:51:36 +08:00
wangxuepeng 7bb8f8e624 * Editor uploadUrl default value. 2023-08-30 02:05:59 +00:00
wangxuepeng 6a892e2c11 * Refactor action control create method. 2023-08-29 08:07:59 +00:00
wangxuepeng 482fafb2cb * Refactor action trash method. 2023-08-29 05:50:54 +00:00
zenggang c6f9390f8d * Finish task#100970,100969,100974 2023-08-24 09:09:59 +00:00
朱金勇 e663e207bd * Fix english. 2023-08-16 04:15:20 +00:00
wangyuting 0b4a034adb * Finish mergeprogram. 2023-08-16 10:26:13 +08:00
wangyuting 74a9bcb4da * Adjust actions on action trash. 2023-08-02 09:25:51 +08:00
wangyuting 6cd8ac0c79 * Finish action trash list. 2023-08-02 09:22:34 +08:00
wangyuting 03c8ba06ae * Add action trash zin page. 2023-08-01 16:58:21 +08:00
dingguodong 3ad190e9a8 * Fix typo, rename secend to second. 2023-08-01 16:27:46 +08:00
zhaoke 1ac7493bd3 * Add upgrade log of instance module. 2023-07-28 14:18:09 +08:00
zhaoke 2690255ee0 * Adjust lang file. 2023-07-27 09:50:32 +08:00
wangyuting 8e67833bd3 * delete getByList type param. 2023-07-27 09:14:33 +08:00
zhaoke 5c4cb46b14 * Refactor upgrade view of instance,adjust lang file of instance. 2023-07-26 19:44:51 +08:00
zhaoke 1e63391ebc * Finish task #98672,#98671. 2023-07-26 15:01:32 +08:00
zhaoke d12a6b5aef * Adjust action desc and add actions of instance. 2023-07-26 10:08:06 +08:00
zhaoke 2b92cf5881 * Finish task #98673,#98677. 2023-07-25 20:10:44 +08:00
liumengyi 2b680458c8 * Refactor ui of my::dynamic. 2023-07-19 13:51:46 +08:00
tianshujie 8ecebc79cd * Change Chinese period to English period. 2023-07-19 13:06:24 +08:00
tianshujie 024d4715c3 * Change the action lang. 2023-07-19 11:26:38 +08:00
zhaoke 61c17823e5 * Finish task #98033. 2023-07-18 18:42:31 +08:00
zhaoke bac4a54ca1 * Finish task #98026. 2023-07-18 14:44:45 +08:00
朱金勇 ccb6a094f9 * Change constant to variable. 2023-07-10 04:31:47 +00:00
sunguangming e72a3c5345 * Fix bugs. 2023-07-07 09:25:32 +08:00
liugang 2b8de4e86d + action: display pivot in trash. 2023-07-06 16:55:21 +08:00
wangyuting 46b92f7b1d * Adjust idvalue to objectID. 2023-06-12 15:48:53 +08:00
chentao 6e50441bf3 * Add response of action comment API for new UI with ZIN. 2023-05-25 22:13:37 +08:00
sunguangming 2777ec9622 * Rename recordEstimate to recordWorkhour. 2023-05-25 15:53:00 +08:00
zhouxin abdc53f20a * Batch fix illegal comment. 2023-05-25 15:38:56 +08:00
zhouxin 77a2da90d9 * Batch modify quote for unit test. 2023-05-25 13:43:27 +08:00
liugang b58cda66db - Remove unused code: $this->view->position. 2023-05-22 14:43:26 +08:00
hufangzhou dc8fcc9484 * Merge 18.4 into master. 2023-05-05 09:26:04 +08:00
liumengyi cb591f23fc * Code for manage priv package. 2023-04-25 08:42:06 +08:00
wangyidong 61bf3f9d4a * fix bug #34761. 2023-04-25 08:36:29 +08:00
wangyidong 88fa8fc839 * fix bug #34750. 2023-04-24 18:56:38 +08:00
管西迎 bdffadde69 Merge pull request 'unit_test' (#7) from unit_test into master
Reviewed-on: https://git.zcorp.cc/easycorp/zentaopms/pulls/7
2023-04-24 16:48:51 +08:00
zhouxin 4efea42989 + Move unit test from test directory to each module. 2023-04-24 02:16:47 +00:00
wangyidong b52f1da1bf * fix for php8.1 2023-04-24 09:05: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
王怡栋 e0d163f5fd Merge branch 'zentaopms_304' into 'master'
Zentaopms 304

See merge request easycorp/zentaopms!7518
2023-04-20 09:31:13 +00:00