Commit Graph
631 Commits
Author SHA1 Message Date
zhujinyong 8749c2983d Merge branch '15.0.beta3' of http://gitlab.zcorp.cc/easycorp/zentaopms into 15.0.beta3 2021-03-18 16:19:35 +08:00
Yagami 0d5bd902f4 * Code for task #36465. 2021-03-16 14:24:32 +08:00
holan20180123 940d9cbed3 * Fix get dynamic error. 2021-03-10 11:16:49 +08:00
holan20180123 8f294074bb * Finish task #36496. 2021-03-10 09:12:07 +08:00
holan20180123 032b89aaed * Adjust all executions lanague. 2021-03-09 15:15:28 +08:00
hufangzhou 1a75c3c3e1 * Finish task #36433. 2021-03-09 13:25:16 +08:00
leiyong 86b18553a7 * Adjust block module code. 2021-03-09 12:30:23 +08:00
Yagami 0f1492cad9 * Fix bug and execution menu. 2021-03-09 10:05:34 +08:00
qiyu-xie 38ee1e1fd6 * Finish task#36458. 2021-03-09 09:01:03 +08:00
holan20180123 4caf65064c * Fix product,project error. 2021-03-08 15:47:09 +08:00
leiyong e133e198e3 * Adjust the language item. 2021-03-08 10:35:54 +08:00
qiyu-xie b970a5fb09 * Fix bug. 2021-03-08 09:52:39 +08:00
leiyong 2cedf63ee2 * Adjust code. 2021-03-08 09:15:42 +08:00
leiyong 1dfda97a43 * Adjust action module. 2021-03-05 18:12:21 +08:00
qiyu-xie 2275de3a13 * Fix logout bug. 2021-03-05 13:49:46 +08:00
zhujinyong c17cc14081 * Adjust getDynamic function of action. 2021-03-04 17:10:43 +08:00
leiyong b43b822b92 * Adjust lang file of action module. 2021-03-04 16:41:39 +08:00
Yagami 294058ddcd * Finish task #36358 and rename mode. 2021-03-02 10:13:51 +08:00
Yagami 5c5bdc213e * Adjust code style. 2021-02-24 15:02:43 +08:00
Yagami 93421b3e4c * Remove unused code. 2021-02-24 14:40:02 +08:00
holan20180123 7a0a05259c * Finish task #36069. 2021-02-24 11:37:22 +08:00
Yagami f6c0564234 * Code for task #36042. 2021-02-23 13:59:53 +08:00
leiyong 0882f35bc6 * Finish task#36037. 2021-02-22 16:28:02 +08:00
Yagami d1f2c3cabd * Finish task #36070/#36069. 2021-02-20 16:00:16 +08:00
holan20180123 6bfcb89c36 * Finish task #36000. 2021-02-19 15:39:04 +08:00
wangyidong 6bf40e474d Merge branch '12.x' 2021-02-19 13:17:23 +08:00
leiyong fa8ac71eee * Add version. 2021-01-29 17:10:24 +08:00
hufangzhou db56b2920a * Finish task#9061. 2021-01-27 16:53:55 +08:00
leiyong 66ef1c6fa3 * Finish task#9005. 2021-01-19 11:13:23 +08:00
tianshujie98 b106795c08 * Modify language item. 2021-01-19 10:21:21 +08:00
tianshujie98 029c157cc6 * Finish task #9048. 2021-01-19 09:39:53 +08:00
holan20180123 70e59fa27c * Modify the param of the link when module is user. 2021-01-14 14:52:51 +08:00
Yagami c6ab1d3809 * Code for task #9028. 2021-01-14 10:48:37 +08:00
Yagami 66747a8069 * Rename project common to execution common. 2020-12-18 10:04:30 +08:00
leiyong 8e6d6bad63 * Adjust executionCommon to execution->common. 2020-12-18 10:03:32 +08:00
leiyong ea3300acf4 * Replace ->planCommon. 2020-12-17 17:20:12 +08:00
leiyong b7e12099f6 * Fix bug. 2020-12-17 15:15:30 +08:00
Yagami 915b7533cf * Fix bug. 2020-12-17 13:28:16 +08:00
leiyong ec3ffde99c * Use the defined sprintcommon. 2020-12-17 13:23:52 +08:00
Yagami 58faa489a1 * Adjust code. 2020-12-17 11:18:14 +08:00
tianshujie98 46fb8e19ec * Change variable name. 2020-12-17 09:55:16 +08:00
tianshujie98 9cc53ca106 * Fix bug. 2020-12-17 09:14:47 +08:00
leiyong 47cebcb39b * Fix bug. 2020-12-17 09:14:13 +08:00
tianshujie98 1a245d7229 * Finish task #8686. 2020-12-16 16:55:11 +08:00
tianshujie98 8967a97964 * Finish task #8686. 2020-12-16 16:29:21 +08:00
hufangzhou 0d1b376fcf * Adjust the code. 2020-12-16 08:59:44 +08:00
hufangzhou 129b727375 * Fix a bug. 2020-12-14 14:10:56 +08:00
hufangzhou 6a00a09817 * Fix bug#3740. 2020-12-14 11:19:43 +08:00
wangyidong c858ae19e3 * fix for undelete project. 2020-12-11 15:48:30 +08:00
leiyong b734e39844 * Fix bug. 2020-12-09 11:43:58 +08:00