 liyuchun
|
26cf62842d
|
Merge branch 'cyy_repo'
|
2022-07-27 00:32:59 +00:00 |
|
|
李玉春
|
8fe00ca4cd
|
Merge branch 'master' into 'cyy_repo'
# Conflicts:
# db/update17.3.sql
|
2022-07-27 00:31:56 +00:00 |
|
|
王怡栋
|
6b9c9c4893
|
Merge branch 'sprint/master_zhouxudong_25696' into 'master'
* Fix bug #25696.
See merge request easycorp/zentaopms!4664
|
2022-07-27 00:28:49 +00:00 |
|
|
caoyanyi
|
3b3bf589f9
|
* Adjust codes.
|
2022-07-27 08:27:57 +08:00 |
|
|
王怡栋
|
a62fc93df6
|
Merge branch 'sprint/hufangzhou_doc' into 'master'
* Finish task #62132, #62133, #62134, #62135, #62136.
See merge request easycorp/zentaopms!4668
|
2022-07-27 00:27:50 +00:00 |
|
|
caoyanyi
|
abd4b2aa6f
|
* Update sql.
|
2022-07-27 08:25:37 +08:00 |
|
|
caoyanyi
|
9c7ed724cc
|
* Adjust codes.
|
2022-07-27 08:24:21 +08:00 |
|
|
hufangzhou
|
8883ac8e77
|
* Finish task #62132, #62133, #62134, #62135, #62136.
|
2022-07-26 18:14:09 +08:00 |
|
|
王怡栋
|
82ff63f607
|
Merge branch 'sprint/ZUI_guofeilong_add_icon_ZTF' into 'master'
* Add Icon ZTF and sub-review
See merge request easycorp/zentaopms!4667
|
2022-07-26 09:26:43 +00:00 |
|
|
王怡栋
|
f56ba3313d
|
Merge branch 'sprint/220_tianshujie_burn' into 'master'
*Fix bug #25712.
See merge request easycorp/zentaopms!4666
|
2022-07-26 09:26:31 +00:00 |
|
|
guofeilong
|
91de8f2459
|
* Add Icon ZTF and sub-review
|
2022-07-26 09:22:44 +00:00 |
|
|
tianshujie
|
a84a4098e9
|
* Fix bug #25721.
|
2022-07-26 17:18:35 +08:00 |
|
|
wangyidong
|
ba89545efb
|
* fix bug.
|
2022-07-26 17:11:33 +08:00 |
|
|
tianshujie
|
a2f203990e
|
* Fixed burnout chart display in execution list.
|
2022-07-26 17:05:13 +08:00 |
|
|
zhouxudong
|
3e842a6316
|
* Fix bug #25696.
|
2022-07-26 08:53:24 +00:00 |
|
|
caoyanyi
|
3e484a6087
|
* Modify code pull.
|
2022-07-26 16:33:10 +08:00 |
|
|
caoyanyi
|
228898dd1b
|
* Modify repo url.
|
2022-07-26 16:22:10 +08:00 |
|
|
王怡栋
|
f4b971d877
|
Merge branch 'sprint/220_liumengyi_25699' into 'master'
* Fix bug #25699, #25700.
See merge request easycorp/zentaopms!4661
|
2022-07-26 08:16:38 +00:00 |
|
|
caoyanyi
|
c10c25b84d
|
* Modify branch get.
|
2022-07-26 16:16:17 +08:00 |
|
|
王怡栋
|
a83f7c629a
|
Merge branch 'sprint/220_liumengyi_24009' into 'master'
* Fix bug #24009.
See merge request easycorp/zentaopms!4660
|
2022-07-26 08:16:08 +00:00 |
|
|
王怡栋
|
8456a1da21
|
Merge branch 'sprint/220_liumengyi_62026' into 'master'
* Fix bug #23200.
See merge request easycorp/zentaopms!4659
|
2022-07-26 08:13:44 +00:00 |
|
|
liumengyi
|
cc459683b1
|
* Fix bug #25699.
|
2022-07-26 16:07:11 +08:00 |
|
|
liumengyi
|
1284608659
|
* Fix bug #25700.
|
2022-07-26 16:06:57 +08:00 |
|
|
liumengyi
|
30b7ecbee7
|
* Fix bug #24009.
|
2022-07-26 16:02:47 +08:00 |
|
|
caoyanyi
|
91a99a6cdb
|
* Modify mr diff.
|
2022-07-26 15:21:03 +08:00 |
|
|
王怡栋
|
649950fa21
|
Merge branch 'sprint/master_zhouxudong_25672' into 'master'
* Fix bug #25672.
See merge request easycorp/zentaopms!4657
|
2022-07-26 07:14:19 +00:00 |
|
|
caoyanyi
|
542156de2a
|
* Add actions.
|
2022-07-26 14:54:48 +08:00 |
|
|
liumengyi
|
174d226f86
|
* Fix bug #62026.
|
2022-07-26 14:53:15 +08:00 |
|
|
caoyanyi
|
a1ec9e1d9f
|
* Modify css.
|
2022-07-26 14:40:39 +08:00 |
|
|
caoyanyi
|
4c8474d335
|
* Modify gitea use git command.
|
2022-07-26 14:40:17 +08:00 |
|
|
caoyanyi
|
ee213327b3
|
Merge branch 'master' into cyy_repo
|
2022-07-26 14:35:40 +08:00 |
|
|
孙广明
|
c17740b7c4
|
Merge branch 'sprint/220_liumengyi_25688' into 'master'
* Fix bug #25688.
See merge request easycorp/zentaopms!4658
|
2022-07-26 06:27:48 +00:00 |
|
|
liumengyi
|
26b412ef35
|
* Fix bug #25688.
|
2022-07-26 14:23:46 +08:00 |
|
|
孙广明
|
fd876ef22b
|
Merge branch 'sprint/220_tianshujie_62022' into 'master'
* Fix bug #25185.
See merge request easycorp/zentaopms!4656
|
2022-07-26 06:20:04 +00:00 |
|
|
tianshujie
|
4078ed9068
|
* Fix bug #25185.
|
2022-07-26 13:59:09 +08:00 |
|
|
tianshujie
|
bf5495565f
|
* Fix bug #25185.
|
2022-07-26 13:47:56 +08:00 |
|
|
zhouxudong
|
b0351e7036
|
* Fix bug #25672.
|
2022-07-26 05:27:05 +00:00 |
|
|
孙广明
|
867f5467d9
|
* Fix bug #25678.
|
2022-07-26 13:20:41 +08:00 |
|
|
李玉春
|
0ae6d0440f
|
Merge branch 'cyy_optimize' into 'master'
Cyy optimize
See merge request easycorp/zentaopms!4648
|
2022-07-26 05:06:07 +00:00 |
|
|
王怡栋
|
f16edca7bf
|
Merge branch 'sprint/220_tianshujie_61965' into 'master'
Sprint/220 tianshujie 61965
See merge request easycorp/zentaopms!4655
|
2022-07-26 05:04:41 +00:00 |
|
|
王怡栋
|
284aea9aac
|
Merge branch 'sprint/220_liumengyi_61971' into 'master'
* Finish task #61971,#61972,#61973,#61974,#61975,#61976.
See merge request easycorp/zentaopms!4651
|
2022-07-26 05:01:29 +00:00 |
|
|
liumengyi
|
a0a9d5e765
|
* Optimize for task #61971.
|
2022-07-26 12:02:28 +08:00 |
|
|
tianshujie
|
1f9d835e39
|
* Finish task #61965.
|
2022-07-26 11:36:18 +08:00 |
|
|
liumengyi
|
7afb73fabe
|
* Fix bug for task #61976.
|
2022-07-26 11:19:10 +08:00 |
|
|
liumengyi
|
e3d090d917
|
* Fix bug for task #61975.
|
2022-07-26 11:18:34 +08:00 |
|
|
tianshujie
|
cac6216a09
|
* Finish task #61967.
|
2022-07-26 10:50:16 +08:00 |
|
|
tianshujie
|
52dccd78bc
|
Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms into sprint/220_tianshujie_61965
|
2022-07-26 10:49:03 +08:00 |
|
|
王怡栋
|
6ca980c93c
|
Merge branch 'sprint/220_tianshujie_navigation' into 'master'
Sprint/220 tianshujie navigation
See merge request easycorp/zentaopms!4654
|
2022-07-26 02:46:19 +00:00 |
|
|
tianshujie
|
807c168fa9
|
* Finish task #61967.
|
2022-07-26 10:38:11 +08:00 |
|
|
王怡栋
|
2f742dbaab
|
Merge branch 'sprint/master_zhouxudong_61906' into 'master'
* Finish task #61906.
See merge request easycorp/zentaopms!4653
|
2022-07-26 02:34:12 +00:00 |
|