 tianshujie
|
e82f1f6d6a
|
Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms into sprint/241_tianshujie_bug
|
2022-09-26 08:12:31 +08:00 |
|
|
朱金勇
|
d3911c77e6
|
Merge branch 'sprint/241_tianshujie_fixbug' into 'master'
Sprint/241 tianshujie fixbug
See merge request easycorp/zentaopms!5518
|
2022-09-23 16:05:19 +00:00 |
|
|
dingyongliang
|
b708b328ee
|
* hidden all projects.
|
2022-09-23 08:48:17 +00:00 |
|
|
tianshujie
|
e553730c29
|
* Finish task #70202.
|
2022-09-23 16:33:56 +08:00 |
|
|
dingyongliang
|
41672b5107
|
* add icon for program.
|
2022-09-23 08:26:53 +00:00 |
|
|
tianshujie
|
5bfe67480a
|
* Fix bug #27547.
|
2022-09-23 13:07:34 +08:00 |
|
|
曹延义
|
7488846987
|
* Modify budget calc.
|
2022-09-23 13:01:45 +08:00 |
|
|
wangzemei
|
20ccc81a8a
|
* fix bug 27863
|
2022-09-23 10:52:47 +08:00 |
|
|
王怡栋
|
504e24ffff
|
Merge branch 'sprint/241_dyl_70023' into 'master'
* task #70023, adjust danger label position.
See merge request easycorp/zentaopms!5482
|
2022-09-23 01:04:31 +00:00 |
|
|
李玉春
|
749463b85b
|
Merge branch 'sprint/241_dyl_70026' into 'master'
* task #70026, replace more icon.
See merge request easycorp/zentaopms!5481
|
2022-09-22 08:39:23 +00:00 |
|
|
dingyongliang
|
7416757b1d
|
* task #70023, adjust danger label position.
|
2022-09-22 06:40:37 +00:00 |
|
|
dingyongliang
|
6f8533ae78
|
* task #70026, replace more icon.
|
2022-09-22 06:17:09 +00:00 |
|
|
dingyongliang
|
455aa2b0a8
|
* task #70025, set program title bold.
|
2022-09-22 01:18:01 +00:00 |
|
|
王怡栋
|
5c39464bc6
|
Merge branch 'sprint/241_dyl_70021' into 'master'
* task #70021, rm showClose btn.
See merge request easycorp/zentaopms!5457
|
2022-09-21 09:14:45 +00:00 |
|
|
王怡栋
|
2b39a8f8f6
|
Merge branch 'sprint/241_dyl_70027' into 'master'
* task #70027, rm project icon.
See merge request easycorp/zentaopms!5456
|
2022-09-21 09:14:24 +00:00 |
|
|
dingyongliang
|
f311f9d411
|
* task #70027, rm project icon.
|
2022-09-21 06:34:20 +00:00 |
|
|
tianshujie
|
23f5c939ae
|
* Finish task #68934.
|
2022-09-21 10:10:14 +08:00 |
|
|
dingyongliang
|
b435a95dd7
|
* task #70021, rm showClose btn.
|
2022-09-20 08:58:13 +00:00 |
|
|
tianshujie
|
29bd1d6588
|
* Update test case of program module.
|
2022-09-14 10:37:05 +08:00 |
|
|
tianshujie
|
73f3a6d80a
|
* Finish task #68925.
|
2022-09-13 16:53:52 +08:00 |
|
|
liumengyi
|
2bb576415a
|
* Fix bug #26298.
|
2022-09-05 11:22:12 +08:00 |
|
|
王怡栋
|
6376b09468
|
Merge branch 'sprint/235_dongli_bug27225' into 'master'
* Fix bug #27225.
See merge request easycorp/zentaopms!5249
|
2022-09-02 05:02:51 +00:00 |
|
|
dongli
|
36389ce51e
|
* Fix bug #27225.
|
2022-09-02 04:29:10 +00:00 |
|
|
李玉春
|
0bc581b21c
|
Merge branch 'sprint/235' into 'master'
Sprint/235
See merge request easycorp/zentaopms!5216
|
2022-08-31 08:19:32 +00:00 |
|
|
zenggang
|
6c48f5ec97
|
* Finish task#67260
|
2022-08-30 06:39:36 +00:00 |
|
|
孙广明
|
1e1ddeb0b0
|
Merge branch 'sprint/235_tianshujie_26758' into 'sprint/235'
* Fix bug #26758, #25942., #23957.
See merge request easycorp/zentaopms!5176
|
2022-08-29 06:53:31 +00:00 |
|
|
tianshujie
|
a072b794e5
|
* Fix bug #26936.
|
2022-08-29 14:51:21 +08:00 |
|
|
tianshujie
|
0d4b77197f
|
* Fix bug #26936.
|
2022-08-29 14:49:33 +08:00 |
|
|
liumengyi
|
44e42e9fd1
|
* Fix bug #25942.
|
2022-08-29 13:10:11 +08:00 |
|
|
liumengyi
|
7e60d43f6e
|
* Finish task #66938.
|
2022-08-29 10:45:50 +08:00 |
|
|
liumengyi
|
fac28b389a
|
* Fix bug #26724.
|
2022-08-26 16:12:07 +08:00 |
|
|
tanghucheng
|
24dab5df38
|
* Fix bug #26906.
|
2022-08-26 11:30:14 +08:00 |
|
|
王怡栋
|
2a49655e2d
|
Merge branch 'sprint/master_zhouxudong_update64888' into 'master'
* Optimization task #64888.
See merge request easycorp/zentaopms!5037
|
2022-08-23 01:49:31 +00:00 |
|
|
xieqiyu
|
99e4534f38
|
Merge branch 'master' into master_xieqiyu_draftStory
|
2022-08-22 17:29:21 +08:00 |
|
|
zhouxudong
|
faf66f2d63
|
* Optimization task #64888.
|
2022-08-19 07:51:38 +00:00 |
|
|
王怡栋
|
e75b9b4b5f
|
Merge branch 'sprint/228_tianshujie_api' into 'master'
* Get the execution list.
See merge request easycorp/zentaopms!5029
|
2022-08-19 05:13:29 +00:00 |
|
|
tianshujie
|
b47cd1b77b
|
* Fixed an issue where the admin could not click on the program.
|
2022-08-19 11:36:05 +08:00 |
|
|
zhouxudong
|
6312af0dea
|
* Fix bug #26612.
|
2022-08-19 03:11:05 +00:00 |
|
|
zhouxudong
|
b058344542
|
* Fix bug #26612.
|
2022-08-19 03:07:13 +00:00 |
|
|
周旭东
|
b2026b22af
|
Update de.php
|
2022-08-19 00:47:54 +00:00 |
|
|
zhouxudong
|
49d654cabc
|
* Finish task #64888.
|
2022-08-16 05:37:22 +00:00 |
|
|
xieqiyu
|
17773dee90
|
* Code for story of add draft status.
|
2022-08-12 16:00:00 +08:00 |
|
|
zhouxudong
|
837a32960f
|
* Fix bug #26294.
|
2022-08-11 01:46:07 +00:00 |
|
|
王怡栋
|
7c2d2b54eb
|
Merge branch 'master' into 'master_liuhong_63787'
# Conflicts:
# module/program/css/browse.css
# module/project/css/browse.css
|
2022-08-11 01:22:50 +00:00 |
|
|
liuhong
|
f713f01ee7
|
*Finish task #63787.
|
2022-08-11 00:49:21 +00:00 |
|
|
王怡栋
|
de30066a3b
|
Merge branch 'master_liuhong_63787' into 'master'
Master liuhong 63787
See merge request easycorp/zentaopms!4902
|
2022-08-10 08:11:31 +00:00 |
|
|
xieqiyu
|
4c01aec006
|
* Code for task#63787.
|
2022-08-10 15:51:23 +08:00 |
|
|
wangyidong
|
901d2b95a0
|
Merge branch 'sprint/master_zhouxudong_code'
|
2022-08-10 15:29:23 +08:00 |
|
|
xieqiyu
|
bd18594c80
|
* Code for task#63579.
|
2022-08-10 15:09:57 +08:00 |
|
|
xieqiyu
|
2f6d225550
|
* Code for task#62851.
|
2022-08-10 13:55:03 +08:00 |
|