Commit Graph
17855 Commits
Author SHA1 Message Date
qiyu-xie 11b3c29bb2 * Add en.php. 2020-08-25 17:25:42 +08:00
tianshujie98 1b1ad2a384 * Fix Bug #3400. 2020-08-25 17:24:32 +08:00
tianshujie98 356ced18f5 Merge branch '20.x' of github.com:easysoft/zentaopms into 20.x 2020-08-25 17:00:21 +08:00
tianshujie98 dbba92d084 * Fix Bug #3401. 2020-08-25 16:59:54 +08:00
Catouse 267ac8f0b7 * task #7651, improve UI of programteam block. 2020-08-25 16:54:58 +08:00
tianshujie98 17242608fe Merge branch '20.x' of github.com:easysoft/zentaopms into 20.x 2020-08-25 16:43:15 +08:00
tianshujie98 a3cb36f6e3 * Modified design/lang/en.php 2020-08-25 16:42:25 +08:00
leiyong cc901f28ee Merge branch '20.x' of github.com:easysoft/zentaopms into 20.x 2020-08-25 16:42:03 +08:00
leiyong 22ab2f9599 * Adjust code. 2020-08-25 16:41:40 +08:00
Yagami 05b1ffeb32 Merge branch '20.x' of https://github.com/easysoft/zentaopms into 20.x 2020-08-25 16:41:03 +08:00
z 1eb3af2a6d * fix error. 2020-08-25 16:40:31 +08:00
Yagami 639cd3ad87 Merge branch '20.x' of https://github.com/easysoft/zentaopms into 20.x 2020-08-25 16:40:31 +08:00
z 8667908ce3 Merge branch '20.x' of github.com:easysoft/zentaopms into 20.x 2020-08-25 16:39:02 +08:00
Yagami 6831c27236 Merge branch '20.x' of https://github.com/easysoft/zentaopms into 20.x 2020-08-25 16:38:35 +08:00
z 9a11ace11e * adjust for getParentPairs with template. 2020-08-25 16:38:17 +08:00
Yagami 7e73b340d6 Merge branch '20.x' of https://github.com/easysoft/zentaopms into 20.x 2020-08-25 16:38:02 +08:00
hufangzhou 943cb2a8fa * Add scrum overview block. 2020-08-25 16:37:52 +08:00
Yagami 58c0bc19a0 * Fix menu. 2020-08-25 16:37:42 +08:00
tianshujie98 8fcccc4604 Merge branch '20.x' of github.com:easysoft/zentaopms into 20.x 2020-08-25 16:35:01 +08:00
tianshujie98 fb263a1152 * Add lang/en.php 2020-08-25 16:27:11 +08:00
tianshujie98 62d11a4516 * Add lang/en.php 2020-08-25 16:26:33 +08:00
holan20180123 843e2f8579 Merge branch '20.x' of https://github.com/easysoft/zentaopms into 20.x 2020-08-25 16:18:02 +08:00
holan20180123 be2c3596a3 * Edit program lang en.php 2020-08-25 16:17:17 +08:00
Catouse e908c152cb * fix status filter not work in program/browse in grid view. 2020-08-25 16:07:21 +08:00
Catouse 648934425c * task #7660, fix progress error in cmmigantt block. 2020-08-25 16:02:14 +08:00
Catouse 57df12b6d1 * refactor. 2020-08-25 15:52:13 +08:00
Catouse 27a76f92cd * updage zui.js. 2020-08-25 15:52:13 +08:00
Catouse 79c2decff2 * task #7660, add UI for cmmigantt block. 2020-08-25 15:52:13 +08:00
Catouse eae8fae1f1 * task #7664, improve UI of cmmiprogress block. 2020-08-25 15:50:48 +08:00
holan20180123 b837b742ab * Edit program statistic block. 2020-08-25 15:43:21 +08:00
Yagami fee6de0fd3 * Fix risk lang. 2020-08-25 15:39:54 +08:00
tianshujie98 0e82809798 Merge branch '20.x' of github.com:easysoft/zentaopms into 20.x 2020-08-25 15:31:15 +08:00
tianshujie98 1011f0cb0e * Checkout module/group/lang/resource.php xuanxuan/module/group/ext/lang/zh-cn/xuanxuan.php 2020-08-25 15:30:10 +08:00
holan20180123 02794ed5c4 Merge branch '20.x' of https://github.com/easysoft/zentaopms into 20.x 2020-08-25 15:12:28 +08:00
holan20180123 c2f4b9a9fb * Edit Programstatistic block. 2020-08-25 15:11:09 +08:00
Yagami e94501758c Merge branch '20.x' of https://github.com/easysoft/zentaopms into 20.x 2020-08-25 15:00:16 +08:00
Yagami 4e0a3d0da5 * Fix block details. 2020-08-25 14:59:24 +08:00
tianshujie98 60fcf05741 * Delete empty line. 2020-08-25 14:53:50 +08:00
tianshujie98 73c08aa197 Merge branch '20.x' of github.com:easysoft/zentaopms into 20.x 2020-08-25 14:52:27 +08:00
tianshujie98 36ca024811 * Add stdclass. 2020-08-25 14:51:07 +08:00
holan20180123 cdcb944cbb Merge branch '20.x' of https://github.com/easysoft/zentaopms into 20.x 2020-08-25 14:14:04 +08:00
holan20180123 8a403a5f3b * Add field in Assigned to me block. 2020-08-25 14:13:29 +08:00
leiyong cf5c7e507c * Finish task#7654. 2020-08-25 14:12:35 +08:00
holan20180123 ee92307425 * Fix bug Assigned to me block. 2020-08-25 14:06:08 +08:00
holan20180123 80a20fa5de Merge branch '20.x' of https://github.com/easysoft/zentaopms into 20.x 2020-08-25 13:58:42 +08:00
holan20180123 2af996af25 * Fix bug Assigned to me block. 2020-08-25 13:57:58 +08:00
tianshujie98 669d6c31e8 Merge branch '20.x' of github.com:easysoft/zentaopms into 20.x 2020-08-25 13:41:26 +08:00
Yagami 78c467722a Merge branch '20.x' of https://github.com/easysoft/zentaopms into 20.x 2020-08-25 13:40:39 +08:00
Yagami 115612570d * Fix sql. 2020-08-25 13:40:25 +08:00
tianshujie98 4e03358c25 * Add group/lang/resource.php. 2020-08-25 13:39:50 +08:00