 xieqiyu
|
132433cc92
|
* Modify language item.
|
2022-06-27 17:27:15 +08:00 |
|
|
孙广明
|
209b13aafb
|
Merge branch 'fixbug' into 'master'
* Fix bug #24340.
See merge request easycorp/zentaopms!4154
|
2022-06-27 09:20:50 +00:00 |
|
|
孙广明
|
53ce8a4560
|
Merge branch 'master_xieqiyu_57854' into 'master'
Master xieqiyu 57854
See merge request easycorp/zentaopms!4157
|
2022-06-27 09:19:58 +00:00 |
|
|
孙广明
|
342214a5ad
|
Merge branch 'master_xieqiyu_58591' into 'master'
* Finish task#58591.
See merge request easycorp/zentaopms!4147
|
2022-06-27 09:16:56 +00:00 |
|
|
xieqiyu
|
9b1c865964
|
* Code for task#57854.
|
2022-06-27 17:11:59 +08:00 |
|
|
孙广明
|
85ac450243
|
Merge branch 'sprint/207_mayue_bug#24049' into 'master'
* Fix bug #24049.
See merge request easycorp/zentaopms!4155
|
2022-06-27 08:54:19 +00:00 |
|
|
xieqiyu
|
8dd618528a
|
* Fix test bug.
|
2022-06-27 16:51:53 +08:00 |
|
|
tanghucheng
|
a8834418f1
|
* Fix bug #24340.
|
2022-06-27 16:50:39 +08:00 |
|
|
王怡栋
|
ff3052113a
|
Merge branch 'sprint/master_zhouxudong_fixbug' into 'master'
* Fix bug #24368.
See merge request easycorp/zentaopms!4146
|
2022-06-27 06:58:04 +00:00 |
|
|
王怡栋
|
ab8e6f16c3
|
Merge branch 'sprint/209_hufangzhou_58568' into 'master'
* Code for task #58568.
See merge request easycorp/zentaopms!4152
|
2022-06-27 06:57:05 +00:00 |
|
|
hufangzhou
|
f9f3b0c716
|
* Code for task #58568.
|
2022-06-27 14:52:11 +08:00 |
|
|
李玉春
|
677381331d
|
Merge branch 'gitlab_bug' into 'master'
* Modify apit params.
See merge request easycorp/zentaopms!4149
|
2022-06-27 06:46:11 +00:00 |
|
|
李玉春
|
4e34d56156
|
Merge branch 'autotest_ly' into 'master'
* Fix ztest init.
See merge request easycorp/zentaopms!4151
|
2022-06-27 06:45:40 +00:00 |
|
|
liyang
|
a257d63dea
|
* Fix ztest init.
|
2022-06-27 14:42:01 +08:00 |
|
|
朱金勇
|
9601d68cf8
|
Merge branch 'sprint/scx_bugapi' into 'master'
Sprint/scx bugapi
See merge request easycorp/zentaopms!4150
|
2022-06-27 06:33:33 +00:00 |
|
|
宋辰轩
|
e563ae4786
|
* Modify case.
|
2022-06-27 14:23:43 +08:00 |
|
|
宋辰轩
|
c02d5ad506
|
* Add case to bug.
|
2022-06-27 14:16:45 +08:00 |
|
|
朱金勇
|
4f017f5e1d
|
Merge branch 'sprint/sunhao/picker' into 'master'
* hide picker dropmenu on page scrolling.
See merge request easycorp/zentaopms!4142
|
2022-06-27 06:11:14 +00:00 |
|
|
xieqiyu
|
08faa3edff
|
* Finish task#57854.
|
2022-06-27 13:33:11 +08:00 |
|
|
caoyanyi
|
73472acf0a
|
* Modify apit params.
|
2022-06-27 13:07:22 +08:00 |
|
|
xieqiyu
|
78e86b9493
|
* Finish task#58591.
|
2022-06-27 11:25:11 +08:00 |
|
|
zhouxudong
|
69b87ae29f
|
* Fix bug #24368.
|
2022-06-27 03:20:49 +00:00 |
|
|
王怡栋
|
9cb398d47c
|
Merge branch 'sprint/wangyuting_fixbug#23595' into 'master'
* Fix bug #23595.
See merge request easycorp/zentaopms!4143
|
2022-06-27 03:20:31 +00:00 |
|
|
王怡栋
|
ac517392f4
|
Merge branch 'sprint/208_tianshujie_58551' into 'master'
Sprint/208 tianshujie 58551
See merge request easycorp/zentaopms!4145
|
2022-06-27 03:19:31 +00:00 |
|
|
李玉春
|
b4b7a1c9d3
|
Merge branch 'autotest_ly' into 'master'
* Add switch DB.
See merge request easycorp/zentaopms!4144
|
2022-06-27 02:58:17 +00:00 |
|
|
孙广明
|
66ab8da1b2
|
Merge branch 'leiyong_adjust_feishu' into 'master'
* Fix bug#24192.
See merge request easycorp/zentaopms!4136
|
2022-06-27 02:49:22 +00:00 |
|
|
孙广明
|
08b8b3557f
|
Merge branch 'sprint205_leiyong_bug_24036' into 'master'
* Adjust CSS.
See merge request easycorp/zentaopms!4138
|
2022-06-27 02:49:09 +00:00 |
|
|
孙广明
|
74eea79797
|
Merge branch 'zg_57907' into 'master'
* Code for task#57907
See merge request easycorp/zentaopms!4141
|
2022-06-27 02:49:02 +00:00 |
|
|
liyang
|
1ab22702b4
|
* Fix bug for utils.php
|
2022-06-27 10:45:02 +08:00 |
|
|
liyang
|
804fe254d0
|
* Fix format.
|
2022-06-27 10:40:57 +08:00 |
|
|
liyang
|
02589ba46c
|
* Add switch DB.
|
2022-06-27 10:32:03 +08:00 |
|
|
tianshujie
|
651d16675a
|
* Finish task #58551.
|
2022-06-27 10:19:41 +08:00 |
|
|
tianshujie
|
ba16bac74f
|
* Add permission judgment.
|
2022-06-27 10:05:18 +08:00 |
|
|
wangyuting2
|
ad87d0c7da
|
* Fix bug #23595.
|
2022-06-27 09:33:28 +08:00 |
|
|
mayue
|
35383bc86f
|
* Fix bug #24049.
|
2022-06-24 18:42:44 +08:00 |
|
|
Hao Sun
|
65f280ae66
|
* hide picker dropmenu on page scrolling.
|
2022-06-24 08:13:00 +00:00 |
|
|
朱金勇
|
88e2ca8a01
|
Merge branch 'sprint/scx_tokenlogin' into 'master'
* Login action are recorded by default.
See merge request easycorp/zentaopms!4130
|
2022-06-24 07:42:01 +00:00 |
|
|
李玉春
|
c12226f606
|
Merge branch 'cyy_style' into 'master'
* Modify style for select.
See merge request easycorp/zentaopms!4124
|
2022-06-24 06:29:55 +00:00 |
|
|
李玉春
|
45315877e2
|
Merge branch 'sprint/206_liumengyi_fixbug' into 'master'
* Code review.
See merge request easycorp/zentaopms!4140
|
2022-06-24 06:28:46 +00:00 |
|
|
liumengyi
|
b920b76042
|
* Code review.
|
2022-06-24 14:20:33 +08:00 |
|
|
liumengyi
|
3cbc219ad5
|
* Code review.
|
2022-06-24 14:18:31 +08:00 |
|
|
zenggang
|
3ea6077270
|
* Code for task#57907
|
2022-06-24 06:11:23 +00:00 |
|
|
王怡栋
|
7e264db689
|
Merge branch 'sprint/206_tianshujie_langTools' into 'master'
* Add tools to automatically generate German and French.
See merge request easycorp/zentaopms!4137
|
2022-06-24 05:38:00 +00:00 |
|
|
wangyidong
|
08be7e66fc
|
Merge branch 'fixbug'
|
2022-06-24 13:36:07 +08:00 |
|
|
王怡栋
|
fd82c8d2f1
|
Merge branch 'master' into 'fixbug'
# Conflicts:
# module/weekly/model.php
|
2022-06-24 05:35:50 +00:00 |
|
|
王怡栋
|
fa084d0117
|
Merge branch 'sprint/205_hufangzhou_dynamic' into 'master'
* Adjust the spacing of dynamic block and dynamic page.
See merge request easycorp/zentaopms!4139
|
2022-06-24 05:34:59 +00:00 |
|
|
hufangzhou
|
eebcfaad58
|
* Adjust the spacing of dynamic block and dynamic page.
|
2022-06-24 13:33:11 +08:00 |
|
|
leiyong
|
5d9ce4e512
|
* Adjust CSS.
|
2022-06-24 05:32:01 +00:00 |
|
|
caoyanyi
|
a0993d719a
|
* Modify js set error.
|
2022-06-24 13:27:15 +08:00 |
|
|
tanghucheng
|
212e495fc2
|
* Code for bug #24197.
|
2022-06-24 13:20:31 +08:00 |
|