z
|
48929ce58b
|
* set recPerPage to 50 in program-browse page.
|
2020-08-27 14:03:46 +08:00 |
|
z
|
d51ab5893b
|
Merge branch 'master' of github.com:easysoft/zentaopms
|
2020-08-27 13:03:02 +08:00 |
|
z
|
04508fa14c
|
* adjust code.
|
2020-08-27 13:02:33 +08:00 |
|
leiyong
|
f0276c001b
|
* Finish task#7705.
|
2020-08-27 11:18:30 +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 |
|
Catouse
|
6c9c62f233
|
* improve UI of program list.
|
2020-08-27 11:03:39 +08:00 |
|
z
|
5674cdbae8
|
* finish task #7708.
|
2020-08-27 10:59:38 +08:00 |
|
Catouse
|
a5f004beab
|
Merge branch '20.x'
# Conflicts:
# module/program/view/create.html.php
|
2020-08-27 09:33:00 +08:00 |
|
Catouse
|
88a70977e6
|
* task #7641, support show projects in nested list.
|
2020-08-27 09:03:43 +08:00 |
|
Catouse
|
b10f3686a8
|
* fix cannot submit form without parentprogram data on create one.
|
2020-08-27 09:02:38 +08:00 |
|
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 |
|