Commit Graph

64 Commits

Author SHA1 Message Date
Yagami
1b9c6b0e98 * Merge code. 2020-09-23 14:54:16 +08:00
leiyong
ab6ea6f7e0 * Project add sort. 2020-09-23 13:27:18 +08:00
leiyong
3dc97e7148 * Adjust project creation and editing logic. 2020-09-23 11:03:30 +08:00
Yagami
92ee6ca3b2 * Rename program to prj. 2020-09-22 11:31:56 +08:00
Yagami
8dbfbdd6db * Fix product menu. 2020-09-22 09:29:29 +08:00
leiyong
85d698582c * Add item drop down menu. 2020-09-22 08:54:03 +08:00
Yagami
3cb892fc4e * Fix product menu. 2020-09-21 16:45:06 +08:00
leiyong
94fae1d49e * Add edit and copy method under project. 2020-09-20 23:27:06 +08:00
leiyong
3550097dc8 * Add project authority management function. 2020-09-20 22:57:24 +08:00
Yagami
99fe956e4b * Merge code. 2020-09-18 16:48:19 +08:00
leiyong
a8103fd03e * Add project creation method. 2020-09-18 14:26:27 +08:00
leiyong
dc52779039 * Improve project module. 2020-09-17 16:48:20 +08:00
Yagami
fc036c5d99 * Finish task #7850,#7854. 2020-09-17 16:39:53 +08:00
Yagami
685fbad61a * Merge code. 2020-09-16 14:53:48 +08:00
leiyong
b55e9344ee * Adjust program lang . 2020-09-16 14:49:19 +08:00
Yagami
ac8bb689b7 * Change realStarted to realBegan. 2020-09-16 08:28:47 +08:00
tianshujie98
e61eb3eca1 * Remove spaces. 2020-09-03 17:44:15 +08:00
tianshujie98
adaf912eee * Modify English language items. 2020-09-03 17:33:29 +08:00
Yagami
116a7e43b3 * Finish task #7721. 2020-08-31 13:34:32 +08:00
Yagami
1e917bcb0f Merge branch 'master' of https://github.com/easysoft/zentaopms 2020-08-27 11:17:40 +08:00
Yagami
b3e27f70b3 * Mv milestone to qc. 2020-08-27 11:17:22 +08:00
z
5674cdbae8 * finish task #7708. 2020-08-27 10:59:38 +08:00
z
518ca3027e * adjust for en lang. 2020-08-26 10:30:41 +08:00
z
8eb7358131 * adjust for check begin and end. 2020-08-26 10:10:01 +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
be2c3596a3 * Edit program lang en.php 2020-08-25 16:17:17 +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
6ee48f38f7 * adjust for change isCat field. 2020-08-24 15:30:00 +08:00
sgm0422
ecbeb7f598 * Fix code details. 2020-08-23 15:24:16 +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
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
Yagami
de3c53ec94 * Add blocks. 2020-08-20 11:09:23 +08:00
Yagami
cc7db91b5e * Add program blocks. 2020-08-19 17:34:22 +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
89eb2e6f34 * Code for qc. 2020-08-14 11:13:53 +08:00
sgm0422
8e159a56e5 * Code for program project product priv. 2020-07-01 15:06:21 +08:00
sgm0422
bb92200ea5 * Add en lang. 2020-06-16 13:38:41 +08:00
sgm0422
5c5ef4eb0c * Fix acl and rights. 2020-06-12 16:41:40 +08:00