Commit Graph

18569 Commits

Author SHA1 Message Date
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
z
d64667dc99 * adjust for get parent pairs. 2020-08-25 09:19:54 +08:00
tianshujie98
485eb371fe Merge branch '20.x' of github.com:easysoft/zentaopms into 20.x 2020-08-25 08:58:20 +08:00
tianshujie98
d62d93baa7 * Finish task #7628. 2020-08-25 08:57:39 +08:00
tianshujie98
7f4c8ac9ac * Finish task #7628. 2020-08-25 08:19:53 +08:00
leiyong
74bfa68346 * Adjust block lang. 2020-08-25 08:13:31 +08:00
Catouse
907261749e * task #7664, improve UI of cmmiprogress block. 2020-08-24 19:14:18 +08:00
leiyong
d7e9aa82f7 * Block add operation button. 2020-08-24 17:59:08 +08:00
Yagami
1cadda2706 * Fix program link and weekly bug. 2020-08-24 17:21:59 +08:00
Yagami
a5c739d8cd Merge branch '20.x' of https://github.com/easysoft/zentaopms into 20.x 2020-08-24 16:33:57 +08:00
Yagami
3603ff2623 * Add story and requirement. 2020-08-24 16:33:37 +08:00
leiyong
9e95b1bb78 * Fix bug. 2020-08-24 15:39:16 +08:00
Yagami
74d5aa7981 Merge branch '20.x' of https://github.com/easysoft/zentaopms into 20.x 2020-08-24 15:34:55 +08:00
Yagami
5d75ef450c * Add new block set method and more link. 2020-08-24 15:33:30 +08:00
z
a6937ad5bf Merge branch '20.x' of github.com:easysoft/zentaopms into 20.x 2020-08-24 15:30:26 +08:00
z
6ee48f38f7 * adjust for change isCat field. 2020-08-24 15:30:00 +08:00
hufangzhou
56e7d2f7ce * Finish task#7656,task#7653. 2020-08-24 15:21:12 +08:00
leiyong
beb18250c4 * Highlight the dynamic. 2020-08-24 14:52:55 +08:00
z
afb11b19de Merge branch '20.x' of github.com:easysoft/zentaopms into 20.x 2020-08-24 13:21:56 +08:00
z
d7ba21e035 * finish task #7648. 2020-08-24 13:16:54 +08:00
Yagami
fe575297f0 Merge branch '20.x' of https://github.com/easysoft/zentaopms into 20.x 2020-08-24 11:45:10 +08:00
z
0b06025c15 Merge branch '20.x' of github.com:easysoft/zentaopms into 20.x 2020-08-24 11:34:08 +08:00
z
1a9c007fec * finish task #7648. 2020-08-24 11:33:37 +08:00
Yagami
1ad65ade80 * Fix progress error. 2020-08-24 11:32:02 +08:00
leiyong
da40782404 * Finish task#7658. 2020-08-24 11:31:36 +08:00
tianshujie98
7d44ad86a6 * Finish task #7628. 2020-08-24 11:11:35 +08:00
Yagami
82f771c4af Merge branch '20.x' of https://github.com/easysoft/zentaopms into 20.x 2020-08-24 10:58:09 +08:00
Yagami
4925070808 Merge branch '20.x' of https://github.com/easysoft/zentaopms into 20.x 2020-08-24 10:56:44 +08:00
holan20180123
6257a82bf8 * Edit isClickable for program model. 2020-08-24 10:56:39 +08:00
Yagami
b12aef4e0f * Code for task #7640. 2020-08-24 10:53:59 +08:00
holan20180123
6c8c7255f0 Merge branch '20.x' of https://github.com/easysoft/zentaopms into 20.x 2020-08-24 10:52:24 +08:00
holan20180123
33666bc545 * Add risk list for assign to me block. 2020-08-24 10:50:52 +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