Commit Graph
122 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 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
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
liyuchun 9b5a28392b * Finish task #42854. 2021-09-28 12:31:59 +08:00
holan20180123 4caf65064c * Fix product,project error. 2021-03-08 15:47:09 +08:00
leiyong 9434ea0860 * Fix bug. 2021-02-01 16:26:31 +08:00
tianshujie98 88f6dc6e10 * Modify language items. 2020-12-25 16:01:50 +08:00
tianshujie98 59ede325e6 * Finish task #8783. 2020-12-25 14:25:00 +08:00
Yagami 66747a8069 * Rename project common to execution common. 2020-12-18 10:04:30 +08:00
tianshujie98 b9c52535ad * Fix bug #3249. 2020-07-02 15:44:08 +08:00
wangyidong 95c2e3b810 * finish story #4411. 2019-11-13 09:09:51 +08:00
wangyidong 2a83351760 * add en and zh-tw lang. 2019-08-22 17:34:55 +08:00
Yagami d8f65cf55f * Add lang file to productplan. 2019-07-30 10:26:19 +08:00
wangyidong 3a2c9e1e1b * finish task #5710. 2019-07-11 16:43:59 +08:00
wangyidong 23922ac917 * finish task #5993. 2019-07-10 12:15:19 +08:00
reneeteng 04c138ba06 * Lang file update. 2019-06-11 11:30:44 +08:00
reneeteng e5e51fa82f + add en lang. 2019-06-11 11:29:50 +08:00
reneeteng d4b7a9ac4c Merge branch 'master' of https://github.com/easysoft/zentaopms 2019-06-11 11:16:22 +08:00
reneeteng 520d121bdf * Lang file optimized. 2019-06-11 09:53:11 +08:00
wangyidong 3b54364860 * code for task #5673. 2019-06-11 08:20:49 +08:00
reneeteng 01cf64b4d9 * Lang file update. 2019-06-10 10:46:22 +08:00
reneeteng de2725da3b * Lang file update. 2019-06-05 17:22:34 +08:00