 tianshujie
|
86ccf6cc62
|
* Add a sort selection style.
|
2022-11-14 15:45:33 +08:00 |
|
|
tianshujie
|
839110c07a
|
Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms into zin
|
2022-11-14 14:21:04 +08:00 |
|
|
tianshujie
|
7bbcbae12e
|
* Fixed issue with more button render icons.
|
2022-11-14 14:20:11 +08:00 |
|
|
孙广明
|
be14a72a9f
|
Merge branch 'sprint/master_lanzongjun_fixbug' into 'master'
* finish task #75896
See merge request easycorp/zentaopms!6129
|
2022-11-14 06:05:01 +00:00 |
|
|
孙广明
|
5f0f0362a2
|
Merge branch 'master_xieqiyu_75901' into 'master'
* Fix bug#29465.
See merge request easycorp/zentaopms!6131
|
2022-11-14 06:03:18 +00:00 |
|
|
tianshujie
|
16d055bf8d
|
* Finish task #76108.
|
2022-11-14 13:49:28 +08:00 |
|
|
xieqiyu
|
fe65019d7f
|
* Fix bug#29465.
|
2022-11-14 13:47:01 +08:00 |
|
|
Yagami
|
8d71c2615c
|
* Fix keep-login bug.
|
2022-11-14 13:40:44 +08:00 |
|
|
lanzongjun
|
e045ce8322
|
* finish task #75896
|
2022-11-14 11:24:50 +08:00 |
|
|
王怡栋
|
e4dccd020b
|
Merge branch 'zentaopms_258_wangyuting' into 'master'
* Fix bug.
See merge request easycorp/zentaopms!6128
|
2022-11-14 03:17:27 +00:00 |
|
|
wangyuting
|
def5bab5f4
|
* Fix bug.
|
2022-11-14 03:09:41 +00:00 |
|
|
tianshujie
|
1a097d73eb
|
* Finish task #75690.
|
2022-11-14 10:37:21 +08:00 |
|
|
tianshujie
|
3f45e2e6b6
|
Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms into zin
|
2022-11-14 09:00:52 +08:00 |
|
|
孙广明
|
461aa69449
|
Merge branch 'master_xieqiyu_29549' into 'master'
* Fix bug#29549,#29654.
See merge request easycorp/zentaopms!6126
|
2022-11-14 00:27:23 +00:00 |
|
|
wangyidong
|
9406625989
|
Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms
|
2022-11-11 17:35:59 +08:00 |
|
|
wangyidong
|
549290cf9d
|
* fix bug for create project release.
|
2022-11-11 17:35:34 +08:00 |
|
|
tianshujie
|
bd96bce2f1
|
* Search form of program list.
|
2022-11-11 17:20:05 +08:00 |
|
|
xieqiyu
|
fde21ff897
|
* Fix bug#29549,#29654.
|
2022-11-11 17:06:48 +08:00 |
|
|
孙广明
|
a4785c2760
|
Merge branch 'sprint/zentaopms259_mayue_task#75649' into 'master'
* Finish task #75649.
See merge request easycorp/zentaopms!6125
|
2022-11-11 09:03:28 +00:00 |
|
|
mayue
|
c92e9f119a
|
* Finish task #75649.
|
2022-11-11 17:02:17 +08:00 |
|
|
tianshujie
|
2e763aff21
|
* Add search of program list.
|
2022-11-11 16:29:50 +08:00 |
|
|
tianshujie
|
feb9f2cfa9
|
* Add table sorting function.
|
2022-11-11 15:49:49 +08:00 |
|
|
王怡栋
|
bf598b3f86
|
Merge branch 'testcase_zg' into 'master'
* Adjust code
See merge request easycorp/zentaopms!6123
|
2022-11-11 07:35:17 +00:00 |
|
|
王怡栋
|
31a84ce03c
|
Merge branch 'zentaopms_258_wangyuting' into 'master'
* Fix bug.
See merge request easycorp/zentaopms!6124
|
2022-11-11 07:34:43 +00:00 |
|
|
wangyuting
|
bec09e5a0a
|
* Adjust isFeature to canConfigFeature.
|
2022-11-11 07:28:46 +00:00 |
|
|
wangyuting
|
e94c895d51
|
* Optimize code.
|
2022-11-11 07:22:33 +00:00 |
|
|
wangyuting
|
bb49320ee7
|
* Fix bug.
|
2022-11-11 07:07:17 +00:00 |
|
|
zenggang
|
6aa84d40f4
|
* Adjust code
|
2022-11-11 06:55:59 +00:00 |
|
|
孙广明
|
f59a0d4ade
|
Merge branch 'sprint/master_lanzongjun_fixbug' into 'master'
* finish bug #29448#29404
See merge request easycorp/zentaopms!6120
|
2022-11-11 06:51:06 +00:00 |
|
|
孙广明
|
be11caa710
|
Merge branch 'master_xieqiyu_29618' into 'master'
* Fix bug#29618.
See merge request easycorp/zentaopms!6122
|
2022-11-11 06:50:47 +00:00 |
|
|
孙广明
|
ca3de7cc84
|
Merge branch 'lyk_feedback_1411' into 'master'
* Resolve feedback #1411.
See merge request easycorp/zentaopms!6121
|
2022-11-11 06:50:22 +00:00 |
|
|
zenggang
|
9a3ee4027f
|
* Adjust code
|
2022-11-11 06:49:04 +00:00 |
|
|
tianshujie
|
718817d9fa
|
Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms into zin
|
2022-11-11 14:48:03 +08:00 |
|
|
xieqiyu
|
38dd19a6c3
|
* Fix bug#29551.
|
2022-11-11 14:34:51 +08:00 |
|
|
lanzongjun
|
0d07d33818
|
* finish bug #29404
|
2022-11-11 14:04:25 +08:00 |
|
|
lanzongjun
|
3965d9a40f
|
Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms into sprint/master_lanzongjun_fixbug
|
2022-11-11 14:03:09 +08:00 |
|
|
tianshujie
|
eaa13a4fbf
|
* Add an delay icon to the program list.
|
2022-11-11 13:22:41 +08:00 |
|
|
xieqiyu
|
6263f5a84f
|
* Fix bug#29618.
|
2022-11-11 13:12:34 +08:00 |
|
|
liuyongkai
|
dd519c7587
|
* Resolve feedback #1411.
|
2022-11-11 13:02:26 +08:00 |
|
|
王怡栋
|
f758694397
|
Merge branch 'zentaopms_258_optimize_code' into 'master'
* Rename config->custom->feature.
See merge request easycorp/zentaopms!6119
|
2022-11-11 03:31:24 +00:00 |
|
|
lanzongjun
|
3fe8a0b6ad
|
* finish bug #29448
|
2022-11-11 11:25:51 +08:00 |
|
|
王怡栋
|
ea0f94ca47
|
Merge branch 'sprint/wangzemei/theme' into 'master'
* fix bug 29464 29473
See merge request easycorp/zentaopms!6117
|
2022-11-11 02:54:43 +00:00 |
|
|
王怡栋
|
88253aa6d5
|
Merge branch 'zentaopms_258_bug#29562' into 'master'
* Finish task #29562.
See merge request easycorp/zentaopms!6116
|
2022-11-11 02:53:47 +00:00 |
|
|
daitingting
|
be40637a66
|
* Rename config->custom->feature.
|
2022-11-11 02:52:58 +00:00 |
|
|
wangyidong
|
8c3c3bc660
|
Merge branch 'zentaopms258_wyd'
|
2022-11-11 10:51:20 +08:00 |
|
|
王怡栋
|
66b9e6b116
|
Merge branch 'master' into 'zentaopms258_wyd'
# Conflicts:
# framework/base/router.class.php
|
2022-11-11 02:49:32 +00:00 |
|
|
wangyidong
|
8a178c72fe
|
* adjust for project release link story and bug.
|
2022-11-11 10:47:01 +08:00 |
|
|
wangzemei
|
44f35e9827
|
* fix green
|
2022-11-11 10:45:12 +08:00 |
|
|
wangzemei
|
bd32b35659
|
* fix bug 29464 29473
|
2022-11-11 10:24:45 +08:00 |
|
|
wangyuting
|
152364d338
|
* Finish task #29562.
|
2022-11-11 02:12:03 +00:00 |
|