Commit Graph
257 Commits
Author SHA1 Message Date
孙广明 c42cca1249 Merge branch 'sprint/168' 2021-11-30 14:38:32 +08:00
liumengyi b264aa3199 * Fix bug 16807,16892. 2021-11-30 09:46:30 +08:00
zhouxin 02c028365b Modified language. 2021-11-19 15:27:52 +08:00
zhouxin b7e3fe9003 Finis task #44486,44487,44488. 2021-11-17 15:49:24 +08:00
hufangzhou 9f77cc6fb6 * Finish task #43898. 2021-11-09 17:16:30 +08:00
xieqiyu e53d644169 * Fix bug#16058. 2021-11-08 19:13:09 +08:00
qiyu-xie f22b3ea149 * Code for task#43902. 2021-11-07 18:12:57 +08:00
qiyu-xie 8f902ccf2d * Code fot task#44028. 2021-11-07 13:44:24 +08:00
liyuchun 245d8ef65f * Fix bug #15933. 2021-11-03 09:40:21 +08:00
hufangzhou 200801ebee * Add the dynamic for moving swimlane. 2021-11-01 15:51:30 +08:00
liyuchun d0b9dda4d7 * Finish task #43519,#43503. 2021-10-27 15:41:36 +08:00
hufangzhou e3fc0a1bf5 * Adjust the lang file. 2021-10-19 21:00:11 +08:00
tianshujie 0b7c4c5f1c * Fix bug #15638. 2021-10-19 20:18:42 +08:00
朱金勇 cf2f61ddb3 Merge branch 'sprint/167_xiawenlong' into 'sprint/167'
Sprint/167 xiawenlong

See merge request easycorp/zentaopms!109
2021-10-19 10:18:18 +00:00
xiawenlong e872c187cf fix group en language. 2021-10-19 18:09:48 +08:00
zhujinyong 3653106d27 + Add action name of api. 2021-10-19 17:14:30 +08:00
tianshujie 04fce5278b * Fix bug #15500. 2021-10-14 09:37:41 +08:00
tianshujie 4f977efaeb * Finish task #42854. 2021-09-28 13:14:32 +08:00
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