Commit Graph

196 Commits

Author SHA1 Message Date
孙广明
25f71e0a51 Merge branch 'sprint/185' into 'sprint/186_liumengyi_modify'
# Conflicts:
#   module/task/model.php
2022-02-25 00:41:58 +00:00
liumengyi
e0814cd74b * Change maxVersion bizVersion proVersion to edition. 2022-02-24 16:15:08 +08:00
王怡栋
189158dabd Merge branch 'sprint/185_fixbug_wangyidong' of https://gitlab.zcorp.cc/easycorp/zentaopms into sprint/185_fixbug_wangyidong 2022-02-23 17:01:24 +08:00
王怡栋
f34bce05bf * code for task #49401. 2022-02-23 17:00:55 +08:00
zhujinyong
408f8d4d91 * Move die to return. 2022-02-22 14:15:00 +08:00
zhujinyong
5bd64d9312 Merge branch 'lite' into sprint/185 2022-02-17 08:56:40 +08:00
tanghucheng
02fde213b0 * fix bug #18977. 2022-01-27 13:07:00 +08:00
Wenrui LI
91ec8b687b * filter todo by vision, task #47905. 2022-01-25 14:08:31 +08:00
Wenrui LI
30f61c2acc * add vision for todo and tweak todo create to set vision, part of task #47905. 2022-01-25 14:03:24 +08:00
hufangzhou
7cd0246265 * Code for task #47991. 2022-01-24 13:52:49 +08:00
孙广明
13f162edd2 * Merge 169 untrack file to master. 2021-12-08 11:07:06 +08:00
zenggang
d3ffc97d41 * Fix bug#14927 and Finish task#42423,42420,42419 2021-09-08 13:52:53 +08:00
zhujinyong
489a87e0ec * Adjust response of api. 2021-09-08 10:40:25 +08:00
zenggang
4ee76f3b82 * Fix bug#14923 2021-09-07 08:57:59 +08:00
zenggang
1a31ff468a * Fix bug#14578 2021-09-03 15:14:05 +08:00
zenggang
97e6ea501a * Fix bug#14578 2021-09-03 09:57:12 +08:00
zenggang
fbb71c24c6 + add todos api 2021-08-20 15:36:54 +08:00
wangyidong
fa4fa5941e Merge branch '15.0' 2021-07-06 19:28:30 +08:00
guanxiying
bc3bd8316c * Fix bug #12828. 2021-07-05 14:47:15 +08:00
tianshujie98
4369c928d8 * Fix the problem of batch creation todo. 2021-06-21 13:17:24 +08:00
tianshujie98
8004b37132 * Fix bug #13257. 2021-06-18 15:51:25 +08:00
wangyidong
b6676572f0 * merge from 15.0.beta3. 2021-06-06 09:05:34 +08:00
tianshujie98
fe58d5f20e * Fix bug #13082. 2021-06-05 21:09:16 +08:00
wangyidong
769e6b433b * merge from 15.0.beta3. 2021-06-05 13:01:53 +08:00
tianshujie98
f3921abf0a * Finish task #38922. 2021-06-04 22:41:29 +08:00
tianshujie98
0eb60e6129 * Finish task #38921. 2021-06-04 21:55:57 +08:00
tianshujie98
80b876383c * Finish task #38920. 2021-06-04 17:30:09 +08:00
tianshujie98
add67a9039 * Fix the priority issue of creating todo. 2021-06-01 09:38:58 +08:00
tianshujie98
3d1e94daa1 * Finish task #38381. 2021-05-27 17:37:34 +08:00
holan20180123
51af4491d9 * Return id when create object by API. 2021-05-12 17:33:59 +08:00
Yagami
53951d0a38 * Fix todo bug. 2021-04-25 13:14:26 +08:00
leiyong
6556a4f6ba * Fix bug#12078. 2021-04-16 05:46:14 +00:00
leiyong
d74f255057 * Fix bug#12078. 2021-04-16 05:38:49 +00:00
wangyidong
e0e999b4ac * fix bug #11726. 2021-04-01 20:07:59 +08:00
Yagami
81e67145b6 * Fix bug #11388. 2021-04-01 09:23:07 +08:00
wangyidong
faf5134ab3 * fix bug #11064. 2021-03-31 13:41:37 +08:00
holan20180123
922dddcaa6 * Fix create todo error. 2021-03-18 11:06:32 +08:00
leiyong
86b18553a7 * Adjust block module code. 2021-03-09 12:30:23 +08:00
wangyidong
361af39093 * adjust code for todo module. 2021-03-05 09:25:26 +08:00
hufangzhou
8070ae60b7 * Finish task #36349. 2021-03-03 09:32:20 +08:00
Yagami
4b7a9427a2 * Reviewing code fix details. 2021-03-02 09:04:34 +08:00
leiyong
5e1ae62b5f * Add comments. 2021-01-22 09:01:58 +08:00
leiyong
f4d9fc7c17 * Adjust code. 2021-01-08 16:27:31 +08:00
leiyong
19717ee532 * Fix bug. 2021-01-08 15:27:06 +08:00
leiyong
65870829ed * Adjust code, 2021-01-08 14:07:16 +08:00
holan20180123
b7db818a89 * Add todo comments. 2020-12-29 11:24:58 +08:00
leiyong
db18b9b3e9 * Finish task#8781. 2020-12-24 22:16:49 +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
hufangzhou
70864b85e0 * Batch create the todos which type is story. 2020-12-17 10:00:02 +08:00