Commit Graph
239 Commits
Author SHA1 Message Date
dingguodong e9002f78c2 Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms 2021-09-08 16:33:36 +08:00
dingguodong 47b838ddb5 * Merge code from ext to this branch for API(JIHU). 2021-09-08 16:33:05 +08:00
liyuchun 21b5e77382 * Fix bug #15004. 2021-09-08 15:52:00 +08:00
hufangzhou c47fbcc333 * Finish task #41797, task #41795, task #41796. 2021-08-26 16:07:40 +08:00
hufangzhou c18901ad6d * Finish task #41533. 2021-08-18 15:50:20 +08:00
hufangzhou 5237f1649c * Fix bug #14289. 2021-08-16 09:14:56 +08:00
hufangzhou d326a7e842 * Add the language item. 2021-08-12 18:13:02 +08:00
hufangzhou 4d0fd03c5e * Finish task #41241. 2021-08-12 15:56:07 +08:00
hufangzhou e28bf4f749 * Add the delete user dynamic action. 2021-08-11 08:22:22 +08:00
wangyidong c4d0eabcf3 * adjust for show pipeline in trash. 2021-08-05 16:03:46 +08:00
hufangzhou 15bd66d47b * Fix bug #14044. 2021-08-04 14:22:59 +08:00
holan20180123 b73608a9b3 * Add gitlib language. 2021-07-15 09:08:07 +08:00
wangyidong 9c166e59d0 * adjust for task #38876. 2021-06-06 08:32:49 +08:00
qiyu-xie 1280fab624 * Fix bug#12966,#12965. 2021-06-02 15:40:26 +08:00
hufangzhou 9fb469a9ac * Add the language item. 2021-06-01 10:53:49 +08:00
hufangzhou 2384e37658 Adjust the code. 2021-05-31 10:22:08 +08:00
hufangzhou 3bc71badd7 * Adjust the code. 2021-05-28 15:43:40 +08:00
hufangzhou 5553c101e6 * Finish task #38393. 2021-05-28 10:21:46 +08:00
tianshujie98 129448e74b Merge branch '15.0.beta3' of https://gitlab.zcorp.cc/easycorp/zentaopms into 15.0.beta3 2021-05-28 08:57:55 +08:00
tianshujie98 bcc1dc1484 * Fix dynamic issue. 2021-05-28 08:57:38 +08:00
hufangzhou ac6cabfeca * Add the lang items. 2021-05-27 17:50:45 +08:00
tianshujie98 4e87dc7970 * Add actions of opportunity. 2021-05-26 11:46:10 +08:00
hufangzhou b221f21a42 * Fix bug #12774. 2021-05-21 15:43:56 +08:00
tianshujie98 20b17a0f45 * Add dynamic view of team. 2021-05-21 11:30:45 +08:00
holan20180123 17581462f0 * Add view right of action. 2021-05-19 11:32:32 +08:00
holan20180123 729c3c4891 * Fix bug #12714. 2021-05-19 11:04:01 +08:00
holan20180123 516ea6c272 * Fix bug #12678. 2021-05-14 17:27:31 +08:00
tianshujie98 3503c5f983 * Add view right of action. 2021-05-14 17:18:39 +08:00
holan20180123 4fe31f6123 * Fix bug #12678,#12677. 2021-05-14 16:56:38 +08:00
holan20180123 f57fb51fb9 * Fix bug #12664. 2021-05-14 16:25:53 +08:00
holan20180123 a59880a890 * Finish task #38161. 2021-05-13 16:32:54 +08:00
wangyidong d80bc64add * adjust for upgrade. 2021-04-29 13:33:27 +08:00
sgm0422 7391916108 * Add en lang. 2021-04-02 21:01:35 +08:00
Yagami 5c2a4ac1f4 * Add en lang. 2021-04-02 17:53:06 +08:00
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
Yagami 0f1492cad9 * Fix bug and execution menu. 2021-03-09 10:05:34 +08:00
leiyong e133e198e3 * Adjust the language item. 2021-03-08 10:35:54 +08:00
leiyong b43b822b92 * Adjust lang file of action module. 2021-03-04 16:41:39 +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 d1f2c3cabd * Finish task #36070/#36069. 2021-02-20 16:00:16 +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
tianshujie98 b106795c08 * Modify language item. 2021-01-19 10:21:21 +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