Commit Graph
135 Commits
Author SHA1 Message Date
caoyanyi 1de446f6ce * Merge for release branch. 2024-03-15 14:59:57 +08:00
liumengyi 4361388f21 + Fix bug #21863, replace image url. 2024-02-29 16:09:48 +08:00
tianshujie ef45d5a977 * Fix bug #42737. 2024-02-20 10:23:40 +08:00
tianshujie 6b983c0f9b * Fix bug #41634. 2024-02-19 16:29:41 +08:00
wangyidong d16ea938ab * Fix bug #41622. 2023-12-23 17:38:37 +08:00
liumengyi 9c548539d9 * Fix bug #41188, isset function cannot determine whether $this->post exists. 2023-12-08 16:18:48 +08:00
caoyanyi 8e17266f28 * Update commit link info. 2023-12-06 13:42:44 +08:00
caoyanyi a33ad4ad71 * Update copyright year. 2023-12-05 13:32:52 +08:00
tanghucheng 3d94eac50a Merge branch 'Merge184' into c07e4a71eb 2023-11-30 21:21:55 -05:00
chaideqing 057c46c21e * Merge module-action 18.8-18.x to Merge184. 2023-11-27 16:18:25 +08:00
tanghucheng ba039087af Merge branch 'master' into Merge184 2023-11-21 22:10:54 -05:00
tianshujie 2d2eb8c641 * Declare strict type. 2023-11-22 10:08:16 +08:00
chaideqing 63e7533a40 * Merge module-action 18.4-18.8 to Merge184. 2023-11-22 09:41:29 +08:00
sunhao 86c45f069c * action: fix action/comment conflict with other form. 2023-11-16 15:04:52 +08:00
sunhao 986a3dd08a + action: add new control methods: comment and editComment. 2023-11-12 21:41:25 +08:00
daitingting e72f39af1f * Display product title when type is story. 2023-11-03 07:39:52 +00:00
liumengyi 8bfe86e27a * Add table sort for action::trash. 2023-10-24 10:57:45 +08:00
wangxuepeng 34d07b4c14 * Refactor unit test for actionModel::getRepeatObject. 2023-10-12 06:32:51 +00:00
wangxuepeng 58976b6b51 * Refactor actionModel::undelete. 2023-10-09 07:45:55 +00:00
wangxuepeng 0b3339e7b2 * Refactor the undelete method of the action module. 2023-10-07 02:44:51 +00:00
wangxuepeng 2c9bbb5729 * Adjust the controller code of action module. 2023-09-27 08:27:07 +00:00
wangxuepeng bf13fbe98e * Refactor restoreStages method of the action module. 2023-09-11 08:45:24 +00:00
dingguodong bfad848bee * Rename ACTIONMODEL to actionModel. 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 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
wangxuepeng 1b8605fbed * Refactor action control undelete. 2023-08-31 01:47:43 +00: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 6cd8ac0c79 * Finish action trash list. 2023-08-02 09:22:34 +08:00
dingguodong 3ad190e9a8 * Fix typo, rename secend to second. 2023-08-01 16:27:46 +08:00
wangyuting 8e67833bd3 * delete getByList type param. 2023-07-27 09:14:33 +08:00
sunguangming e72a3c5345 * Fix bugs. 2023-07-07 09:25:32 +08:00
chentao 6e50441bf3 * Add response of action comment API for new UI with ZIN. 2023-05-25 22:13:37 +08:00
liugang b58cda66db - Remove unused code: $this->view->position. 2023-05-22 14:43:26 +08:00
xieqiyu e8123d02ec * Code for bug#33846. 2023-04-11 07:55:34 +00:00
liumengyi 61e824c548 * Fix bug #32249. 2023-02-17 07:54:54 +00: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 af5fbbab18 * Fix bug of task #84584. 2023-02-15 08:17:12 +00:00
hufangzhou 0b89cd77d5 * Fix bug of task #83954. 2023-02-14 08:49:53 +00:00
hufangzhou 56c2cdcb21 * Finish task #83954. 2023-02-14 02:46:34 +00:00
daitingting cb90a2e25b * Finish task #74176. 2022-11-02 06:30:01 +00:00
wangyuting2 951d1c2d1f * Fix bug #27807. 2022-09-26 08:11:04 +00:00
wangyidong 63e5df239e * code for task #69248. 2022-09-16 15:18:41 +08:00
dongli 98ca0e913d * Fix bug #26824. 2022-08-24 09:12:00 +00:00