Commit Graph

17840 Commits

Author SHA1 Message Date
z
1eb3af2a6d * fix error. 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
z
9a11ace11e * adjust for getParentPairs with template. 2020-08-25 16:38:17 +08:00
hufangzhou
943cb2a8fa * Add scrum overview block. 2020-08-25 16:37:52 +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
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
tianshujie98
8c6babfb24 Merge branch '20.x' of github.com:easysoft/zentaopms into 20.x 2020-08-25 13:33:03 +08:00
holan20180123
dfa03cf8cd Merge branch '20.x' of https://github.com/easysoft/zentaopms into 20.x 2020-08-25 13:22:32 +08:00
holan20180123
865cda58f7 * Finish task #7627. 2020-08-25 13:21:39 +08:00
tianshujie98
1efa74380e * Add group/lang/resource.php. 2020-08-25 13:21:18 +08:00
Yagami
49717ef5bd Merge branch '20.x' of https://github.com/easysoft/zentaopms into 20.x 2020-08-25 13:17:18 +08:00
Yagami
5885a75c2e * Code for program mothod. 2020-08-25 13:15:56 +08:00
holan20180123
eea72cf851 * Edit block lang. 2020-08-25 13:03:07 +08:00
Yagami
2a49dfd4d1 * Fix weekly bugs. 2020-08-25 11:27:34 +08:00
Yagami
8a418a6503 Merge branch '20.x' of https://github.com/easysoft/zentaopms into 20.x 2020-08-25 11:10:02 +08:00
Yagami
ad619c4909 * Code for story and requirement. 2020-08-25 11:09:42 +08:00
holan20180123
1af4b600af * Edit block lang 2020-08-25 10:48:54 +08:00
holan20180123
297be48bcc * Add unique field. 2020-08-25 10:06:32 +08:00
holan20180123
7f194f36ce Merge branch '20.x' of https://github.com/easysoft/zentaopms into 20.x 2020-08-25 09:40:17 +08:00
holan20180123
6abb1f2aae * Add block for program statistic. 2020-08-25 09:37:08 +08:00
z
d1f4308b36 Merge branch '20.x' of github.com:easysoft/zentaopms into 20.x 2020-08-25 09:20:41 +08:00