Commit Graph
235 Commits
Author SHA1 Message Date
tianshujie d498b40d17 * Finish task #71890. 2022-10-11 10:55:21 +08:00
tianshujie 02b9139e86 * Finish task #61965. 2022-07-26 10:01:25 +08:00
hufangzhou cb49804253 * Add the new version. 2022-06-29 13:18:20 +08:00
王怡栋 f72b89a56e Merge branch 'sprint/master_zhouxudong_57848' into 'master'
Sprint/master zhouxudong 57848

See merge request easycorp/zentaopms!4085
2022-06-23 00:39:59 +00:00
zhouxudong 666be69169 * Finish task #57848. 2022-06-23 00:33:03 +00:00
zhouxudong 8c4cd735e5 * Finish task #57848. 2022-06-22 10:00:49 +00:00
zhouxudong 3c091e8281 * Finish task #57848. 2022-06-22 09:46:26 +00:00
王怡栋 9ffdc942c2 Merge branch 'master' into 'sprint/205'
# Conflicts:
#   module/execution/lang/en.php
#   module/execution/lang/zh-cn.php
2022-06-22 09:21:12 +00:00
tianshujie 7372f7f936 * Finish story #32623. 2022-06-22 08:51:05 +08:00
zhouxudong 32c34c35e9 * Finish task #57880 #57881 #57866. 2022-06-20 07:43:08 +00:00
孙广明 b896377846 * Change zentao license. 2022-06-08 10:02:29 +08:00
孙广明 b528156589 * Change license. 2022-06-08 09:34:46 +08:00
zhouxudong 7fe4729a58 * Fix bug #17353. 2022-04-14 16:58:37 +08:00
zenggang 654da8565f * Fix bug#21649,21512 2022-04-12 03:15:39 +00:00
zhangzilong 590c56d6fc * Fix bug #18305. 2022-02-08 09:43:38 +08:00
hufangzhou 6d03387d4b * Add the new version. 2021-11-22 16:48:28 +08:00
王怡栋 076f328914 * add lang for zentaoapp and adjust api. 2021-10-27 19:58:50 +08:00
hufangzhou bf78fe9be4 * Add the 15.6 version and upgrade. 2021-10-12 09:35:39 +08:00
liyuchun 9b5a28392b * Finish task #42854. 2021-09-28 12:31:59 +08:00
dingguodong 5b9332cfff * Remove mrapprove from todo type list due to incomplete implementation. 2021-09-09 14:47:27 +08:00
王怡栋 d2403a6b8e * add new version and upgrade. 2021-09-08 16:00:42 +08:00
zenggang d3ffc97d41 * Fix bug#14927 and Finish task#42423,42420,42419 2021-09-08 13:52:53 +08:00
dingguodong 314c3c593e Merge branch 'jihuMR' 2021-09-07 20:47:10 +08:00
zenggang 1a31ff468a * Fix bug#14578 2021-09-03 15:14:05 +08:00
lichengjun 7f71a63468 * Sync GitLab Todo ZenTao Todo. 2021-09-01 07:02:17 +00:00
wangyidong fd8d02c7df * add new version and upgrade. 2021-08-04 14:18:09 +08:00
Yagami 048ec8020b * Code for bug #13766. 2021-07-22 14:57:15 +08:00
wangyidong 9a0512f334 * add zh-tw lang. 2021-06-06 09:46:11 +08:00
wangyidong 769e6b433b * merge from 15.0.beta3. 2021-06-05 13:01:53 +08:00
sgm0422 7391916108 * Add en lang. 2021-04-02 21:01:35 +08:00
leiyong e97e88f0c5 * Adjust language items. 2021-04-01 12:52:15 +03:00
wangyidong 94045515a0 * fix bug #11064. 2021-04-01 10:26:52 +08:00
Yagami 0d5bd902f4 * Code for task #36465. 2021-03-16 14:24:32 +08:00
holan20180123 60922b9eb4 * Remove issue and risk to max. 2021-02-25 11:02:06 +08:00
tianshujie98 f91b227e02 * Fix bug #3849. 2021-02-01 10:32:19 +08:00
leiyong fa8ac71eee * Add version. 2021-01-29 17:10:24 +08:00
Yagami c6ab1d3809 * Code for task #9028. 2021-01-14 10:48:37 +08:00
leiyong 8ad9c0c245 * Adjust todo module lang file. 2020-12-24 16:21:11 +08:00
holan20180123 66a6cba93e * Finish task #8776. 2020-12-23 15:40:38 +08:00
tianshujie98 1a79fda207 Merge branch 'master' of https://git.zcorp.cc/zentaopms 2020-12-22 15:04:28 +08:00
tianshujie98 556bd939c7 * Adjust code style. 2020-12-22 15:04:09 +08:00
Yagami 312c39129a * Finish task #8806. 2020-12-22 14:40:39 +08:00
tianshujie98 d661c3d5b0 * Finish task #8775. 2020-12-22 09:37:43 +08:00
Yagami 830a63c705 * Add lang file. 2020-12-18 11:08:50 +08:00
Yagami 66747a8069 * Rename project common to execution common. 2020-12-18 10:04:30 +08:00
holan20180123 44c7bcbd59 * Finish task #8678. 2020-12-16 14:46:05 +08:00
Yagami 90446d239a * Merge code and finish task #8475. 2020-11-25 10:36:44 +08:00
z b42d47e257 Merge branch '12.x' 2020-11-23 20:42:59 +08:00
qiyu-xie 50561f9777 * Finish task#8421. 2020-11-18 16:30:58 +08:00
qiyu-xie 4ea3dc9f67 * Finish task#8198. 2020-11-12 10:35:07 +08:00