Commit Graph
784 Commits
Author SHA1 Message Date
dingguodong bfad848bee * Rename ACTIONMODEL to actionModel. 2023-09-07 09:35:38 +08:00
dingguodong 3598c0cc00 * Allow extra field can be integer then to string before use. 2023-09-07 09:35:38 +08:00
wangxuepeng 08929417bd * Refactor method editComment of the action module. 2023-09-06 09:03:41 +00: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
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
wangyuting 0b4a034adb * Finish mergeprogram. 2023-08-16 10:26:13 +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 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
朱金勇 ccb6a094f9 * Change constant to variable. 2023-07-10 04:31:47 +00:00
wangyuting 46b92f7b1d * Adjust idvalue to objectID. 2023-06-12 15:48:53 +08:00
hufangzhou dc8fcc9484 * Merge 18.4 into master. 2023-05-05 09:26:04 +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
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
hufangzhou b7bbb9cb16 * Adjst the code. 2023-04-20 17:12:19 +08:00
tianshujie 205327d891 * Fixed dynamic error reporting. 2023-04-20 15:28:45 +08:00
hufangzhou e18b37128f Merge branch 'master' into zentaopms_304 2023-04-20 13:03:30 +08:00
朱金勇 532ff84269 * Fix bug#34446. 2023-04-20 03:50:25 +00:00
tianshujie 0f2a2b7bc3 * Fixed the interface details style problem. 2023-04-19 17:14:32 +08:00
liumengyi d971d4b4b7 Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms into zentaopms_304 2023-04-18 08:38:14 +08:00
朱金勇 c76fa5317e * Fix bug#34204. 2023-04-17 06:12:22 +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
朱金勇 e6b2ea4a04 Merge branch 'zenops_69' 2023-04-14 04:41:28 +00:00
tianshujie e279e91070 * Resolve issue #775. 2023-04-13 16:22:45 +08:00
zhaoke eb833be4e5 Merge branch 'zenops_66' into zenops_69 2023-04-13 09:31:12 +08:00
zhaoke d401a87812 Merge branch 'master' into zenops_69 2023-04-13 09:09:49 +08:00
liumengyi ca9c565982 Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms into zentaopms_304 2023-04-12 16:39:44 +08:00
tianshujie b8fc22feee * Fix bug #34066. 2023-04-12 10:57:08 +08:00
tianshujie ab05c059eb * Code for task #90780. 2023-04-12 09:28:15 +08:00
liumengyi e3c6375224 Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms into zentaopms_304 2023-04-12 08:58:39 +08:00
xieqiyu e8123d02ec * Code for bug#33846. 2023-04-11 07:55:34 +00:00
liumengyi 9fadd45264 Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms into zentaopms_304 2023-04-11 14:19:00 +08:00
tianshujie 1ce64ff3c9 * Fix bug #33985. 2023-04-11 08:47:05 +08:00
tianshujie c99fed9fe9 * Code for task #90792. 2023-04-10 14:31:21 +08:00
hufangzhou 3c83d94e09 * Merge code. 2023-04-06 09:01:30 +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
tianshujie e1eaf74466 * Add space. 2023-04-04 15:16:29 +08:00
tianshujie 49666e311e * Code for task #89927. 2023-04-04 13:24:18 +08:00