 wangyidong
|
9f2fcd4dcd
|
Merge branch '18.4' of https://git.zcorp.cc/easycorp/zentaopms into 18.4
|
2023-04-25 08:58:46 +08:00 |
|
|
wangyidong
|
a6a329df2c
|
* code for bug #34761.
|
2023-04-25 08:58:05 +08:00 |
|
|
daitingting
|
4002be4633
|
* Fix bug.
|
2023-04-25 08:54:08 +08:00 |
|
|
caoyanyi
|
a6a1bb8b3d
|
Merge branch 'cyy_fixbug' into 18.4
|
2023-04-25 08:45:37 +08:00 |
|
|
wangyidong
|
b2b588adb4
|
* fix bug #34689.
|
2023-04-25 08:41:02 +08:00 |
|
|
wangyidong
|
61bf3f9d4a
|
* fix bug #34761.
|
2023-04-25 08:36:29 +08:00 |
|
|
caoyanyi
|
44a0d56a01
|
* Fix bug #34753.
|
2023-04-24 23:30:35 +08:00 |
|
|
caoyanyi
|
c4b3b74a78
|
Merge branch '18.4' of https://git.zcorp.cc/easycorp/zentaopms into cyy_fixbug
|
2023-04-24 23:19:42 +08:00 |
|
|
caoyanyi
|
4d12147600
|
* Modify database field.
|
2023-04-24 23:17:42 +08:00 |
|
|
wangyidong
|
e7aa31d68e
|
Merge branch '18.4' of https://git.zcorp.cc/easycorp/zentaopms into 18.4
|
2023-04-24 21:01:04 +08:00 |
|
|
宋辰轩
|
18f0a9e65c
|
* Modify dataview -> chart.
|
2023-04-24 20:41:18 +08:00 |
|
|
tianshujie
|
5de561dc41
|
* Fix bug #34760.
|
2023-04-24 20:31:52 +08:00 |
|
|
tianshujie
|
99956b799d
|
Merge branch '18.4' of https://git.zcorp.cc/easycorp/zentaopms into 18.4
|
2023-04-24 20:05:19 +08:00 |
|
|
tianshujie
|
da3ce6e392
|
* Fix bug #34762.
|
2023-04-24 20:05:06 +08:00 |
|
|
wangyidong
|
076dcc7364
|
Merge branch '18.4' of https://git.zcorp.cc/easycorp/zentaopms into 18.4
|
2023-04-24 20:01:03 +08:00 |
|
|
liugang
|
d8a1234ecd
|
* Fix error the type of chart was overwritten.
|
2023-04-24 11:51:51 +00:00 |
|
|
liugang
|
3a7ba8e58f
|
* Change lang items to upper case.
|
2023-04-24 11:51:21 +00:00 |
|
|
tianshujie
|
df9d4cc61e
|
Merge branch '18.4' of https://git.zcorp.cc/easycorp/zentaopms into 18.4
|
2023-04-24 19:44:54 +08:00 |
|
|
tianshujie
|
0ac0f009ec
|
* Fix bug #34642.
|
2023-04-24 19:44:41 +08:00 |
|
|
綦新志
|
53fd3d604a
|
Merge pull request '* Fix bug#34665.' (#13) from fix_bug_qxz into 18.4
Reviewed-on: https://git.zcorp.cc/easycorp/zentaopms/pulls/13
|
2023-04-24 19:35:41 +08:00 |
|
|
tianshujie
|
9ed9817f98
|
Merge branch '18.4' of https://git.zcorp.cc/easycorp/zentaopms into 18.4
|
2023-04-24 19:32:00 +08:00 |
|
|
tianshujie
|
bb97a080a4
|
* Fix bug #34731.
|
2023-04-24 19:31:43 +08:00 |
|
|
wangyidong
|
2cd5d74fec
|
* fix bug #34689.
|
2023-04-24 19:30:09 +08:00 |
|
|
qixinzhi
|
a9f7c36692
|
* Fix bug#34665.
|
2023-04-24 11:26:05 +00:00 |
|
|
wangyidong
|
dd0a0009ae
|
Merge branch '18.4' of https://git.zcorp.cc/easycorp/zentaopms into 18.4
|
2023-04-24 19:23:58 +08:00 |
|
|
wangyidong
|
6a77ce5c6d
|
* fix bug #34713.
|
2023-04-24 19:23:26 +08:00 |
|
|
tianshujie
|
78ef7e88c4
|
Merge branch '18.4' of https://git.zcorp.cc/easycorp/zentaopms into 18.4
|
2023-04-24 19:19:36 +08:00 |
|
|
tianshujie
|
ec88bdf34a
|
* Error modifying jump link.
|
2023-04-24 19:19:17 +08:00 |
|
|
wangyidong
|
75e4b26c52
|
* fix bug #34717.
|
2023-04-24 19:07:05 +08:00 |
|
|
hufangzhou
|
c553bc549a
|
* Code for bug #34647.
|
2023-04-24 19:00:08 +08:00 |
|
|
wangyidong
|
88fa8fc839
|
* fix bug #34750.
|
2023-04-24 18:56:38 +08:00 |
|
|
hufangzhou
|
0b2ecad0f3
|
* Rename the privilege of todo-import2Today.
|
2023-04-24 18:49:09 +08:00 |
|
|
tianshujie
|
0c22ac5614
|
Merge branch '18.4' of https://git.zcorp.cc/easycorp/zentaopms into 18.4
|
2023-04-24 18:37:45 +08:00 |
|
|
tianshujie
|
bf7cdc1ee1
|
* Fix bug #34725.
|
2023-04-24 18:37:32 +08:00 |
|
|
liugang
|
dcd6b98583
|
- Don't delete blockreportlist.html.php.
|
2023-04-24 10:36:04 +00:00 |
|
|
tianshujie
|
f979e6f672
|
Merge branch '18.4' of https://git.zcorp.cc/easycorp/zentaopms into 18.4
|
2023-04-24 18:18:04 +08:00 |
|
|
tianshujie
|
c2c7cf380a
|
* Fix bug #34722.
|
2023-04-24 18:17:49 +08:00 |
|
|
wangyidong
|
759fc09b04
|
Merge branch '18.4' of https://git.zcorp.cc/easycorp/zentaopms into 18.4
|
2023-04-24 17:01:41 +08:00 |
|
|
wangyidong
|
901fc68f3c
|
* adjust for change bizVersion to edition.
|
2023-04-24 17:00:52 +08:00 |
|
|
liumengyi
|
8d6cc429af
|
* Fix bug #34711.
|
2023-04-24 16:43:00 +08:00 |
|
|
chaideqing
|
10c7ddac8f
|
* Remove check workflow.
|
2023-04-24 16:40:55 +08:00 |
|
|
刘刚
|
cd47db15c8
|
Merge pull request '* Fix bug #33665.' (#11) from daitingting_bug_#33665 into 18.4
Reviewed-on: https://git.zcorp.cc/easycorp/zentaopms/pulls/11
|
2023-04-24 16:38:53 +08:00 |
|
|
liumengyi
|
f8b23f567c
|
* Fix bug #34711.
|
2023-04-24 16:21:42 +08:00 |
|
|
tianshujie
|
9b0ed2a7bf
|
Merge branch '18.4' of https://git.zcorp.cc/easycorp/zentaopms into 18.4
|
2023-04-24 16:07:35 +08:00 |
|
|
tianshujie
|
000c800196
|
* Fix bug #34702.
|
2023-04-24 16:07:21 +08:00 |
|
|
daitingting
|
b38747f700
|
* Fix bug #33665.
|
2023-04-24 16:03:11 +08:00 |
|
|
赵珂
|
1c5516d4bf
|
Merge pull request 'zenops_69' (#10) from zenops_69 into 18.4
Reviewed-on: https://git.zcorp.cc/easycorp/zentaopms/pulls/10
|
2023-04-24 16:00:20 +08:00 |
|
|
zhaoke
|
ace0416ea3
|
* Adjust testcase for php5.3.
|
2023-04-24 15:53:11 +08:00 |
|
|
tianshujie
|
5cb292635a
|
* Fix bug #34691.
|
2023-04-24 15:51:40 +08:00 |
|
|
caoyanyi
|
45ad85eec2
|
Merge branch '18.4' of https://git.zcorp.cc/easycorp/zentaopms into cyy_fixbug
|
2023-04-24 15:49:27 +08:00 |
|