Commit Graph
195 Commits
Author SHA1 Message Date
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 50efcdf342 * Finish task #46661. 2021-12-28 15:59:57 +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
hufangzhou 4b2890c766 * Add the new version. 2021-12-24 15:01:04 +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
xieqiyu 821fd3644c * Code for task#45536. 2021-12-08 18:48:33 +08:00
孙广明 13f162edd2 * Merge 169 untrack file to master. 2021-12-08 11:07:06 +08:00
hufangzhou d876550d96 * Add the traditional Chinese language item. 2021-12-07 09:22:58 +08:00
孙广明 69304124b5 * Change for upgrade. 2021-12-06 10:58:52 +08:00
孙广明 c42cca1249 Merge branch 'sprint/168' 2021-11-30 14:38:32 +08:00
liumengyi dc807a53a5 * Fix bug #16390,#16388. 2021-11-17 17:29:08 +08:00
liumengyi 3e93ba664b * Fix bug #16390. 2021-11-17 16:33:42 +08:00
hufangzhou 8b1b92bdfc * Add the version. 2021-11-02 12:37:51 +08:00
zhengrunyu 4f5c9691a3 *Finish task #43708. 2021-11-01 14:12:39 +08:00
zhengrunyu d7418db734 *Finish task #43708. 2021-11-01 14:07:11 +08:00
zhengrunyu 594eae2a3f * Finish task #43708. 2021-11-01 10:33:20 +08:00
zhengrunyu bd765c6881 * Finish task #43708. 2021-11-01 10:27:34 +08:00
zhengrunyu da27ff9c06 * Finish task #43708 2021-11-01 10:08:36 +08:00
zhengrunyu 0ae939a806 1 2021-11-01 09:52:09 +08:00
孙广明 0a8de60c4e Merge branch 'sprint/169_zhouxin_43617' into 'sprint/169'
Finish task #43617.

See merge request easycorp/zentaopms!229
2021-10-29 07:17:58 +00:00
zhouxin 4f1126ada7 Finish task #43617. 2021-10-29 11:28:41 +08:00
tanghucheng 8d1e5cd785 * Finish task #43619,43620. 2021-10-29 09:17:57 +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
leiyong e97e88f0c5 * Adjust language items. 2021-04-01 12:52:15 +03:00
holan20180123 4caf65064c * Fix product,project error. 2021-03-08 15:47:09 +08:00