 zhouxudong
|
69b87ae29f
|
* Fix bug #24368.
|
2022-06-27 03:20:49 +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 |
|
|
朱金勇
|
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 |
|
|
宋辰轩
|
90f7322aeb
|
* Modify default.
|
2022-06-24 13:18:18 +08:00 |
|
|
leiyong
|
8ab031395a
|
* Adjust CSS.
|
2022-06-24 05:09:15 +00:00 |
|
|
tianshujie
|
5baf2a04fd
|
* Add tools to automatically generate German and French.
|
2022-06-24 13:03:54 +08:00 |
|
|
王怡栋
|
b57a5efddb
|
Merge branch 'master_xieqiyu_57869' into 'master'
* Finish task#57869.
See merge request easycorp/zentaopms!4135
|
2022-06-24 05:01:28 +00:00 |
|
|
leiyong
|
f7d7d7f5c6
|
* Fix bug#24192.
|
2022-06-24 03:37:18 +00:00 |
|
|
leiyong
|
fc9b7bf5ad
|
* Fix bug#24192.
|
2022-06-24 03:36:27 +00:00 |
|
|
xieqiyu
|
649633f5bc
|
* Finish task#57869.
|
2022-06-24 11:28:40 +08:00 |
|
|
tanghucheng
|
537e616a1f
|
* Fix bug #24197.
|
2022-06-24 11:13:42 +08:00 |
|
|
王怡栋
|
281c176681
|
Merge branch 'sgm_fixbug' into 'master'
Sgm fixbug
See merge request easycorp/zentaopms!4133
|
2022-06-24 03:12:17 +00:00 |
|
|
王怡栋
|
658f322367
|
Merge branch 'fixbug' into 'master'
* Fix bug #24197.
See merge request easycorp/zentaopms!4131
|
2022-06-24 03:11:16 +00:00 |
|
|
王怡栋
|
182130e2a1
|
Merge branch 'sprint/master_zhouxudong_57859' into 'master'
* Finish task #57859.
See merge request easycorp/zentaopms!4132
|
2022-06-24 03:10:53 +00:00 |
|
|
孙广明
|
4f8fc5f122
|
* Code css file.
|
2022-06-24 11:07:17 +08:00 |
|
|
tanghucheng
|
5731aa0824
|
* Fix bug #24197.
|
2022-06-24 10:56:27 +08:00 |
|
|
宋辰轩
|
1bcbbdaa68
|
* Login action are recorded by default.
|
2022-06-24 10:29:04 +08:00 |
|
|
王怡栋
|
491c882d44
|
Merge branch 'sprint205_leiyong_bug_24036' into 'master'
* Fix bug#24036.
See merge request easycorp/zentaopms!4129
|
2022-06-24 02:24:28 +00:00 |
|
|
leiyong
|
b74f79540c
|
* Fix bug#24036.
|
2022-06-24 02:22:22 +00:00 |
|
|
zhouxudong
|
463b4d0710
|
* Finish task #57859.
|
2022-06-24 02:14:08 +00:00 |
|
|
王怡栋
|
8ad9dea460
|
Merge branch 'sprint/xuan_106' into 'master'
Sprint/xuan 106
See merge request easycorp/zentaopms!4126
|
2022-06-24 01:35:58 +00:00 |
|
|
dingyongliang
|
7963845b6b
|
* mv style to x.style.css.
|
2022-06-24 01:32:03 +00:00 |
|
|
孙广明
|
00f264d26c
|
* Fix bugs.
|
2022-06-24 09:30:56 +08:00 |
|
|
王怡栋
|
f2603f143d
|
Merge branch 'spint/master_zhouxudong_57879' into 'master'
* Finish task #57879.
See merge request easycorp/zentaopms!4125
|
2022-06-24 01:30:35 +00:00 |
|
|
王怡栋
|
bbe4b01050
|
Merge branch 'sprint/206_tianshujie_23958' into 'master'
* Fix bug #23958.
See merge request easycorp/zentaopms!4128
|
2022-06-24 01:19:04 +00:00 |
|
|
tianshujie
|
77685a86df
|
* Add comment.
|
2022-06-24 09:18:32 +08:00 |
|
|
王怡栋
|
f922e4c835
|
Merge branch 'sprint/206_liumengyi_fixbug' into 'master'
* Fix bug #24246, #24214.
See merge request easycorp/zentaopms!4127
|
2022-06-24 01:17:33 +00:00 |
|
|
liumengyi
|
5b84f06092
|
* Fix bug #24214.
|
2022-06-24 09:10:05 +08:00 |
|
|
liumengyi
|
48532553f2
|
* Fix bug #24246.
|
2022-06-24 09:05:46 +08:00 |
|
|
zhouxudong
|
7db6039f4b
|
* Finish task #57879.
|
2022-06-24 00:50:19 +00:00 |
|
|
caoyanyi
|
7ce833f5ad
|
* Modify style for select.
|
2022-06-24 08:48:02 +08:00 |
|