Commit Graph

33 Commits

Author SHA1 Message Date
z
9a11ace11e * adjust for getParentPairs with template. 2020-08-25 16:38:17 +08:00
Yagami
5885a75c2e * Code for program mothod. 2020-08-25 13:15:56 +08:00
z
d64667dc99 * adjust for get parent pairs. 2020-08-25 09:19:54 +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
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
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
09cfff0dbc * finish task #7644,7642. 2020-08-20 15:52:07 +08:00
z
2d59fe5555 * finish task #7646. 2020-08-19 16:41:58 +08:00
Yagami
a86cb31895 * Add holiday and fix project and product menu. 2020-08-19 10:58:29 +08:00
Yagami
bfd9f8e5d1 * Code for task #7625. 2020-08-18 14:36:39 +08:00
Yagami
5b1d63ebf5 * Fix program link. 2020-08-03 14:39:36 +08:00
sgm0422
8e159a56e5 * Code for program project product priv. 2020-07-01 15:06:21 +08:00
sgm0422
57500e2102 * Fix bug and add program admin. 2020-06-17 15:08:09 +08:00
sgm0422
8ecac0f6fb * Fix group error. 2020-06-16 10:49:23 +08:00
sgm0422
5c5ef4eb0c * Fix acl and rights. 2020-06-12 16:41:40 +08:00
sgm0422
c4fc2c99b1 * Fix menu and add program group. 2020-06-11 13:23:03 +08:00
sgm0422
1402d09395 * Fix program details. 2020-05-19 19:09:35 +08:00
sgm0422
7cd2453f35 * Add program swapper. 2020-05-19 10:39:39 +08:00
sgm0422
7478fb8c30 * Fix details. 2020-05-18 13:54:00 +08:00
Yagami
9f1e075c82 * Fix program module. 2020-05-14 14:39:52 +08:00
Catouse
8b45bf767d * refactor. 2020-05-07 14:50:59 +08:00
Yagami
9c7b057c43 * Finish task #7123. 2020-05-07 11:29:42 +08:00
Yagami
ef44299d7e * Finish task #7117/7125/7124. 2020-05-06 15:42:56 +08:00
Yagami
6d1a047b02 * Finish task #7119. 2020-05-06 11:13:13 +08:00