朱金勇
|
6948740e1d
|
* Migrate changes from 18.x to master.
|
2023-10-12 08:42:59 +00:00 |
|
dingguodong
|
15b228263b
|
* Fix typo and reindent.
|
2023-08-21 14:01:15 +08:00 |
|
zhouxin
|
935cfe96ff
|
* Add lang of story point.
|
2023-06-10 13:55:59 +08:00 |
|
caoyanyi
|
6d4d57ab92
|
* Update product common lang.
|
2023-03-08 10:15:08 +08:00 |
|
caoyanyi
|
9ffce9d8a7
|
* Modify project lang to variable.
|
2023-03-06 10:19:48 +08:00 |
|
hufangzhou
|
f3cd2e7d4d
|
* Change the Easy Soft to ZenTao Software.
|
2023-02-15 17:01:22 +08:00 |
|
liuhong
|
970dc71b2e
|
* Finish task 81189.
|
2022-12-28 01:33:35 +00:00 |
|
xieqiyu
|
a46ddf8ee7
|
* Code for task#79663.
|
2022-12-12 16:40:23 +08:00 |
|
xieqiyu
|
8472e0a191
|
* Finish task#78699.
|
2022-12-08 10:34:46 +08:00 |
|
xieqiyu
|
6f8dd9e186
|
* Code for task#78669. Add branch name in tips.
|
2022-12-06 14:27:17 +08:00 |
|
孙广明
|
9eb0117eae
|
Merge branch 'sprint/zentaopms268_mayue_task#77795' into 'zentaopms_256'
* Finish task #77795.
See merge request easycorp/zentaopms!6420
|
2022-12-01 00:44:30 +00:00 |
|
xieqiyu
|
7c51a7f992
|
* Code for task#77802.
|
2022-11-30 22:18:27 +08:00 |
|
mayue
|
fe91c3e210
|
* Finish task #77795.
|
2022-11-30 17:22:39 +08:00 |
|
tianshujie
|
2c75eaf8f6
|
* Modify the statistics of the plan list.
|
2022-11-11 09:04:31 +08:00 |
|
tianshujie
|
d2568442eb
|
* Finish task #70494.
|
2022-09-29 16:54:35 +08:00 |
|
tianshujie
|
57df99f43e
|
* Finish task #70494.
|
2022-09-29 16:34:40 +08:00 |
|
tianshujie
|
04d06bb2b5
|
* Finish task #70494.
|
2022-09-29 14:48:09 +08:00 |
|
孙广明
|
b896377846
|
* Change zentao license.
|
2022-06-08 10:02:29 +08:00 |
|
孙广明
|
b528156589
|
* Change license.
|
2022-06-08 09:34:46 +08:00 |
|
liumengyi
|
2561c857b7
|
* Fix bug #22800.
|
2022-05-24 16:14:00 +08:00 |
|
tianshujie
|
4bd3e1ba3e
|
* Finish task #54353.
|
2022-05-17 09:21:23 +08:00 |
|
zhouxin
|
5dc91f9a30
|
Finish task #49886#49883.
|
2022-02-28 09:14:19 +00:00 |
|
zhouxudong
|
bf002dcd83
|
* Finish task #49289.
|
2022-02-23 14:11:38 +08:00 |
|
zhouxin
|
751fec28e8
|
Finish task #49302.
|
2022-02-21 08:53:25 +00:00 |
|
hufangzhou
|
d0cfa7531e
|
* Add the new version.
|
2022-01-11 09:19:47 +08:00 |
|
xieqiyu
|
af54ab16c6
|
* Fix bug#18242,18241,18240,18239.
|
2022-01-07 08:35:18 +08:00 |
|
tianshujie
|
ac03f67bdb
|
* Fix problems in code review.
|
2022-01-05 11:02:34 +08:00 |
|
tianshujie
|
39a8417b61
|
* Modify the batch editing plan logic.
|
2021-12-31 15:49:44 +08:00 |
|
李玉春
|
2bb6bb8825
|
Merge branch 'refactor' into 'master'
Refactor
See merge request easycorp/zentaopms!1229
|
2021-12-31 04:25:42 +00:00 |
|
李玉春
|
b0d7ba1708
|
Merge branch 'sgm_46671' into 'master'
* Finish task #46671.
See merge request easycorp/zentaopms!1222
|
2021-12-31 04:19:26 +00:00 |
|
liumengyi
|
3dd747f40a
|
* Modify judgment for split chid plan.
|
2021-12-31 10:59:37 +08:00 |
|
tianshujie
|
839d71137a
|
* Fix the error of product dashboard block.
|
2021-12-31 10:19:25 +08:00 |
|
孙广明
|
101be0c103
|
* Finish task #46671.
|
2021-12-31 09:53:32 +08:00 |
|
孙广明
|
9b2df17e26
|
Merge branch 'sprint/181_liumengyi_addDynamic' into 'master'
* Add dynamic for parent plan status flow.
See merge request easycorp/zentaopms!1191
|
2021-12-30 03:53:41 +00:00 |
|
孙广明
|
d6296cf071
|
Merge branch 'sprint/181_tianshujie_46672' into 'master'
*Finish task #46672.
See merge request easycorp/zentaopms!1188
|
2021-12-30 03:30:11 +00:00 |
|
liumengyi
|
53aa300744
|
* Add dynamic for parent plan status flow.
|
2021-12-30 11:25:57 +08:00 |
|
孙广明
|
d4d7ef1074
|
Merge branch 'master' into 'sprint/181_zhengrunyu_46662'
# Conflicts:
# module/productplan/lang/en.php
# module/productplan/lang/zh-cn.php
# module/productplan/view/browse.html.php
|
2021-12-30 01:17:44 +00:00 |
|
zhengrunyu
|
d28dcd7d63
|
*Finish task 46662 46665 46669.
|
2021-12-30 09:01:44 +08:00 |
|
tianshujie
|
137281f8fb
|
Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms into sprint/181_tianshujie_46672
|
2021-12-30 08:40:26 +08:00 |
|
tianshujie
|
cc81db0ddc
|
* Finish task #46667.
|
2021-12-30 08:24:38 +08:00 |
|
孙广明
|
7b23296aa0
|
Merge branch 'sprint/181_liumengyi_fixbug' into 'master'
* Modify plan status flow judgment method.
See merge request easycorp/zentaopms!1180
|
2021-12-29 09:16:30 +00:00 |
|
liumengyi
|
ba9f61de07
|
* Modify plan status flow judgment method.
|
2021-12-29 16:31:46 +08:00 |
|
tianshujie
|
f9f726270e
|
* Finish task #46667.
|
2021-12-29 14:35:09 +08:00 |
|
liumengyi
|
2c8db966ea
|
* Finish task #46656.
|
2021-12-28 17:14:14 +08:00 |
|
liumengyi
|
36e9b91ba0
|
* Finish task #46660.
|
2021-12-28 15:11:27 +08:00 |
|
tianshujie
|
27319feba9
|
* Finish task #46657.
|
2021-12-27 17:11:29 +08:00 |
|
朱金勇
|
161233a64f
|
Merge branch 'sprint/176_xieqiyu_45536' into 'master'
Sprint/176 xieqiyu 45536
See merge request easycorp/zentaopms!884
|
2021-12-10 06:15:15 +00:00 |
|
xieqiyu
|
c33000b578
|
* Code for task#45536.
|
2021-12-10 13:11:37 +08:00 |
|
孙广明
|
13f162edd2
|
* Merge 169 untrack file to master.
|
2021-12-08 11:07:06 +08:00 |
|
孙广明
|
69304124b5
|
* Change for upgrade.
|
2021-12-06 10:58:52 +08:00 |
|