 tanghucheng
|
c254ace351
|
* Fix btn-info background-color for zahost.
|
2023-01-03 14:35:50 +08:00 |
|
|
tanghucheng
|
bf4a0d1bd7
|
Merge branch 'master' into zenops_46
|
2023-01-03 14:17:40 +08:00 |
|
|
tanghucheng
|
bb166715ce
|
Merge remote-tracking branch 'origin/master' into zenops_46
|
2023-01-03 14:11:38 +08:00 |
|
|
王怡栋
|
62d60df7bd
|
Merge branch 'sprint/hufangzhou_newVersion' into 'master'
* Add the new version.
See merge request easycorp/zentaopms!6668
|
2023-01-03 06:09:21 +00:00 |
|
|
hufangzhou
|
b5859c7dc3
|
* Add the new version.
|
2023-01-03 13:56:27 +08:00 |
|
|
孙广明
|
c29776bbfe
|
Merge branch 'sprint/tsj_fixbug' into 'master'
Sprint/tsj fixbug
See merge request easycorp/zentaopms!6667
|
2023-01-03 05:54:09 +00:00 |
|
|
tanghucheng
|
0d4ae4ba95
|
* Fix language.
|
2023-01-03 13:42:04 +08:00 |
|
|
王怡栋
|
0a41c01b88
|
Merge branch 'cyy_bug' into 'master'
Cyy bug
See merge request easycorp/zentaopms!6666
|
2023-01-03 05:35:16 +00:00 |
|
|
王怡栋
|
08bc53afb5
|
Merge branch 'zenops_46' into 'master'
Merge branch 'zenops_46' into master
See merge request easycorp/zentaopms!6662
|
2023-01-03 05:34:51 +00:00 |
|
|
caoyanyi
|
3b5531b694
|
* Modify chosen.
|
2023-01-03 13:32:10 +08:00 |
|
|
caoyanyi
|
32fd823243
|
* Modify tutorial error.
|
2023-01-03 13:31:53 +08:00 |
|
|
caoyanyi
|
b9e1381d11
|
* Fix bug #31375.
|
2023-01-03 13:31:19 +08:00 |
|
|
zhaoke
|
0fbdc3ca87
|
Merge branch 'zenops_46' of https://gitlab.zcorp.cc/easycorp/zentaopms into zenops_46
|
2023-01-03 05:26:25 +00:00 |
|
|
zhaoke
|
f8a69684b4
|
* Fix bug 31348.
|
2023-01-03 05:26:19 +00:00 |
|
|
tanghucheng
|
f05e53043b
|
* Fix code style.
|
2023-01-03 13:03:25 +08:00 |
|
|
tanghucheng
|
584754a7f8
|
Merge branch 'master' into zenops_46
|
2023-01-03 11:04:33 +08:00 |
|
|
tanghucheng
|
6374437b91
|
* Fix bug #31360.
|
2023-01-03 11:02:00 +08:00 |
|
|
孙广明
|
47964d675f
|
Merge branch 'lyk_feedback_1322' into 'master'
* Reslve feedback #1322.
See merge request easycorp/zentaopms!6663
|
2023-01-03 02:50:42 +00:00 |
|
|
liuyongkai
|
d0db3a7e88
|
* Reslve feedback #1322.
|
2023-01-03 10:43:24 +08:00 |
|
|
tanghucheng
|
4887616389
|
* Fix issue for zanode.
|
2023-01-03 09:56:15 +08:00 |
|
|
王怡栋
|
f0e21c3f74
|
Merge branch 'cyy_bug' into 'master'
Cyy bug
See merge request easycorp/zentaopms!6661
|
2023-01-03 01:54:41 +00:00 |
|
|
王怡栋
|
aef16e3c83
|
Merge branch 'sprint/gfl_task_40825' into 'master'
* code for task #40827
See merge request easycorp/zentaopms!6659
|
2023-01-03 01:54:28 +00:00 |
|
|
tianshujie
|
b2142bed14
|
* Fix bug #30169.
|
2023-01-03 09:45:11 +08:00 |
|
|
tanghucheng
|
fe30731334
|
* Add loading style for ajaxGetServiceStatus.
|
2023-01-03 09:44:18 +08:00 |
|
|
zhaoke
|
caa5450c97
|
Merge branch 'zenops_46' of https://gitlab.zcorp.cc/easycorp/zentaopms into zenops_46
|
2023-01-03 01:32:55 +00:00 |
|
|
tianshujie
|
c7aaedcd8b
|
* Fix bug #30284.
|
2023-01-03 09:28:03 +08:00 |
|
|
tianshujie
|
12b925779c
|
* Fix bug #30285.
|
2023-01-03 09:13:36 +08:00 |
|
|
tianshujie
|
5576aaa048
|
* Fix bug #30396.
|
2023-01-03 08:58:06 +08:00 |
|
|
tanghucheng
|
3239f63739
|
* Fix bug #31351.
|
2023-01-03 08:49:28 +08:00 |
|
|
caoyanyi
|
39a6706815
|
* Fix bug #29478.
|
2023-01-03 08:46:41 +08:00 |
|
|
tianshujie
|
a2f27fe5d5
|
* Fix bug #30557.
|
2023-01-03 08:43:08 +08:00 |
|
|
wangyidong
|
ccec9bcc16
|
Merge branch 'zentaopms279'
|
2023-01-03 08:39:33 +08:00 |
|
|
caoyanyi
|
55776c105e
|
* Fix bug #30394.
|
2023-01-03 08:37:50 +08:00 |
|
|
朱金勇
|
96871c4f38
|
Merge branch 'lyk_31251' into 'master'
* Fix bug #31251.
See merge request easycorp/zentaopms!6660
|
2022-12-30 11:28:26 +00:00 |
|
|
liuyongkai
|
43e79f8809
|
* Fix bug #31251.
|
2022-12-30 19:18:38 +08:00 |
|
|
孙广明
|
8f632d7de8
|
Merge branch 'zenops_46' into 'master'
Merge zenops 46 into master
See merge request easycorp/zentaopms!6656
|
2022-12-30 09:50:44 +00:00 |
|
|
zhaoke
|
064f241de0
|
* Add clear interval.
|
2022-12-30 09:42:19 +00:00 |
|
|
tianshujie
|
e11298c33b
|
* code for task #40827
|
2022-12-30 17:32:05 +08:00 |
|
|
tianshujie
|
41dd1a0280
|
* code for task #40827
|
2022-12-30 16:47:15 +08:00 |
|
|
liugang
|
6c16d840d5
|
* Optimize the display label of story of the program statistic.
|
2022-12-30 15:41:10 +08:00 |
|
|
王怡栋
|
99470be30e
|
Merge branch 'cyy_optimize' into 'master'
* Modify text style.
See merge request easycorp/zentaopms!6658
|
2022-12-30 07:19:05 +00:00 |
|
|
caoyanyi
|
597b11524f
|
* Modify text style.
|
2022-12-30 15:09:44 +08:00 |
|
|
wangyidong
|
be81b08952
|
Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms
|
2022-12-30 14:48:49 +08:00 |
|
|
wangyidong
|
6a27d4d272
|
Merge branch 'feedback_1796'
|
2022-12-30 14:48:08 +08:00 |
|
|
wangyidong
|
f85db70c20
|
* adjust for save weekly.
|
2022-12-30 14:46:20 +08:00 |
|
|
孙广明
|
b34e312e86
|
* Fix bug #31353.
|
2022-12-30 14:18:50 +08:00 |
|
|
tanghucheng
|
d837ce9ac4
|
* Fix code style.
|
2022-12-30 14:09:00 +08:00 |
|
|
liugang
|
de8f9e6372
|
* Update the count of closed projects of each year.
|
2022-12-30 14:08:25 +08:00 |
|
|
tanghucheng
|
e6a17511b9
|
* Update button name.
|
2022-12-30 14:03:42 +08:00 |
|
|
tanghucheng
|
720365e1e2
|
Merge branch 'zenops_46' of https://gitlab.zcorp.cc/easycorp/zentaopms into zenops_46
|
2022-12-30 14:03:21 +08:00 |
|