Commit Graph

102 Commits

Author SHA1 Message Date
z
89a542e350 * finish task #7697. 2020-08-26 16:46:12 +08:00
z
6b93c993aa * set default isCat in edit program. 2020-08-26 13:10:05 +08:00
z
518ca3027e * adjust for en lang. 2020-08-26 10:30:41 +08:00
z
e6879f283d * adjust code for update. 2020-08-26 10:19:39 +08:00
z
b55ef50a46 Merge branch '20.x' of github.com:easysoft/zentaopms into 20.x 2020-08-26 10:11:25 +08:00
z
8eb7358131 * adjust for check begin and end. 2020-08-26 10:10:01 +08:00
Catouse
413a53019e * refactor. 2020-08-26 09:56:55 +08:00
Yagami
ed353f7ebd * Fix en menu. 2020-08-26 09:47:58 +08:00
Catouse
f73b816280 * improve UI of program cards view. 2020-08-26 08:26:50 +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
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
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
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
z
d64667dc99 * adjust for get parent pairs. 2020-08-25 09:19:54 +08:00
Yagami
1cadda2706 * Fix program link and weekly bug. 2020-08-24 17:21:59 +08:00
z
6ee48f38f7 * adjust for change isCat field. 2020-08-24 15:30:00 +08:00
holan20180123
6257a82bf8 * Edit isClickable for program model. 2020-08-24 10:56:39 +08:00
Yagami
ec46bb7bcc Merge branch '20.x' of https://github.com/easysoft/zentaopms into 20.x 2020-08-24 10:47:48 +08:00
Yagami
865d311df2 * Fix block details. 2020-08-24 10:45:30 +08:00
z
ccfe5c5ada Merge branch '20.x' of github.com:easysoft/zentaopms into 20.x 2020-08-24 10:19:56 +08:00
z
23d070d622 * finish task #7643, 2020-08-24 10:18:53 +08:00
sgm0422
ecbeb7f598 * Fix code details. 2020-08-23 15:24:16 +08:00
sgm0422
1ecc8c4644 * Fix code style. 2020-08-22 23:42:46 +08:00
z
23055c1ed6 Merge branch '20.x' of github.com:easysoft/zentaopms into 20.x 2020-08-21 16:02:26 +08:00
z
bd27e5b0ed * finish task #7645. 2020-08-21 16:01:44 +08:00
Yagami
bc831b9e94 * Add program statistic. 2020-08-21 15:39:39 +08:00
z
648f5e84f8 Merge branch '20.x' of github.com:easysoft/zentaopms into 20.x 2020-08-21 11:05:30 +08:00
z
463a7c24a8 * code for task #7644. 2020-08-21 11:04:41 +08:00
Yagami
c09e27a568 Merge branch '20.x' of https://github.com/easysoft/zentaopms into 20.x 2020-08-21 10:57:30 +08:00
Yagami
9c24b069d6 * Add new block. 2020-08-21 10:56:19 +08:00
z
20d3cab272 * code for task #7646. 2020-08-21 10:31:07 +08:00
z
cd364590d5 * add lang item. 2020-08-21 09:47:49 +08:00
z
90b6f05859 Merge branch '20.x' of github.com:easysoft/zentaopms into 20.x 2020-08-20 15:56:55 +08:00
z
09cfff0dbc * finish task #7644,7642. 2020-08-20 15:52:07 +08:00
leiyong
a39e00876e * Merger code. 2020-08-20 11:13:07 +08:00
Yagami
de3c53ec94 * Add blocks. 2020-08-20 11:09:23 +08:00
Yagami
2ccfb0d29c Merge branch '20.x' of https://github.com/easysoft/zentaopms into 20.x 2020-08-19 17:34:49 +08:00
Yagami
cc7db91b5e * Add program blocks. 2020-08-19 17:34:22 +08:00
z
2d59fe5555 * finish task #7646. 2020-08-19 16:41:58 +08:00
Yagami
06e0452d78 * Code for program index. 2020-08-19 14:51:57 +08:00