Commit Graph

67 Commits

Author SHA1 Message Date
z
bd27e5b0ed * finish task #7645. 2020-08-21 16:01:44 +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
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
89eb2e6f34 * Code for qc. 2020-08-14 11:13:53 +08:00
Yagami
575a430356 * Fix common menu and program list. 2020-08-05 11:15:26 +08:00
Yagami
5b1d63ebf5 * Fix program link. 2020-08-03 14:39:36 +08:00
Yagami
8a046b4200 * Fix program bug. 2020-08-01 11:07:12 +08:00
Yagami
dadf47b325 * Delete unuse code. 2020-07-31 15:16:51 +08:00
Yagami
17b11dd990 * Fix program link. 2020-07-31 10:47:41 +08:00
sgm0422
8e159a56e5 * Code for program project product priv. 2020-07-01 15:06:21 +08:00
sgm0422
92e05060ab * Delete program fields in list. 2020-07-01 13:16:56 +08:00
leiyong
c4fd57f4d3 * Fix cmmi bug#269. 2020-06-23 18:44:43 -07:00
leiyong
5093ded545 * Fix bug#223. 2020-06-22 18:21:13 -07:00
leiyong
4ec79ae237 * Finish cmmi task#866; 2020-06-19 01:39:58 -07:00
sgm0422
942446b521 * Finish task #939. 2020-06-19 10:00:30 +08:00
sgm0422
57500e2102 * Fix bug and add program admin. 2020-06-17 15:08:09 +08:00
sgm0422
19a1db72df * Fix user view bug. 2020-06-16 14:15:22 +08:00
sgm0422
bb92200ea5 * Add en lang. 2020-06-16 13:38:41 +08:00
sgm0422
8ecac0f6fb * Fix group error. 2020-06-16 10:49:23 +08:00
sgm0422
ca21685f4b * Fix project set menu. 2020-06-15 14:35:21 +08:00
sgm0422
5c5ef4eb0c * Fix acl and rights. 2020-06-12 16:41:40 +08:00
sgm0422
2d97663c5d * Compute program priv. 2020-06-11 17:25:36 +08:00
sgm0422
cfbba4b4bb * Code for task #7235. 2020-06-11 14:41:08 +08:00
sgm0422
c4fc2c99b1 * Fix menu and add program group. 2020-06-11 13:23:03 +08:00
sgm0422
cbe28d7e61 * Fix details. 2020-06-10 17:33:13 +08:00
sgm0422
48e0bf9043 * Change version. 2020-05-20 10:22:59 +08:00
sgm0422
f23e26cd86 * Fix program managemembers and create link. 2020-05-19 19:32:08 +08:00
sgm0422
1402d09395 * Fix program details. 2020-05-19 19:09:35 +08:00
zhaohaibo
1bad49a04f * perfect code 2020-05-19 13:23:33 +08:00
zhaohaibo
1e69c201f8 * modify function create edit finish 2020-05-19 13:11:46 +08:00
sgm0422
7cd2453f35 * Add program swapper. 2020-05-19 10:39:39 +08:00
sgm0422
5dc4fbcec8 * Fix menu and program. 2020-05-18 16:46:40 +08:00
sgm0422
7478fb8c30 * Fix details. 2020-05-18 13:54:00 +08:00
Yagami
1738363830 * Fix bug #577. 2020-05-14 16:50:39 +08:00
Yagami
9f1e075c82 * Fix program module. 2020-05-14 14:39:52 +08:00
Yagami
6fe5f81780 Merge branch '15.x' of https://github.com/easysoft/zentaopms into 15.x 2020-05-12 17:29:57 +08:00