 孙广明
|
38e842991c
|
Merge branch 'master' into 'sunhuawei_bug_18295'
# Conflicts:
# module/tree/lang/en.php
|
2022-04-14 02:36:40 +00:00 |
|
|
孙华伟
|
d5f6c531d9
|
*An error has been reported on other pages.
|
2022-04-14 10:32:28 +08:00 |
|
|
王怡栋
|
a56b295aa7
|
Merge branch 'sprint/fixbug_hufangzhou_21708' into 'master'
* Fix bug #21708.
See merge request easycorp/zentaopms!2928
|
2022-04-14 02:24:13 +00:00 |
|
|
王怡栋
|
21d5d53603
|
Merge branch 'sprint/fixbug_hufangzhou_20174' into 'master'
* Fix bug #20174.
See merge request easycorp/zentaopms!2927
|
2022-04-14 02:23:49 +00:00 |
|
|
王怡栋
|
e70d494cbe
|
Merge branch 'sprint/master_zhouxudong_12358' into 'master'
* Fix bug #12358.
See merge request easycorp/zentaopms!2929
|
2022-04-14 02:22:53 +00:00 |
|
|
hufangzhou
|
6b4822862d
|
* Fix bug #21708.
|
2022-04-14 10:14:49 +08:00 |
|
|
zhouxudong
|
95f8bfa4ee
|
* Fix bug #12358.
|
2022-04-14 10:13:56 +08:00 |
|
|
hufangzhou
|
b79247398e
|
* Fix bug #20174.
|
2022-04-14 10:04:48 +08:00 |
|
|
songchenxuan
|
7de520a748
|
* Fix json_decode twice image data(url) not found.
|
2022-04-14 09:18:12 +08:00 |
|
|
王怡栋
|
fb5f45f7a3
|
Merge branch 'sunhuawei_bug_18295' into 'master'
Sunhuawei bug 18295
See merge request easycorp/zentaopms!2925
|
2022-04-14 00:42:31 +00:00 |
|
|
孙华伟
|
37c8352c47
|
Update control.php
|
2022-04-14 00:39:40 +00:00 |
|
|
孙华伟
|
a3ac51ed0d
|
Update en.php
|
2022-04-14 00:38:55 +00:00 |
|
|
孙华伟
|
93beba2f03
|
*Fix bug#18295.
|
2022-04-14 08:32:47 +08:00 |
|
|
李玉春
|
50e153d0df
|
Merge branch 'devops26_52602' into 'master'
Fix bug#15760，12963
See merge request easycorp/zentaopms!2910
|
2022-04-13 09:36:30 +00:00 |
|
|
孙广明
|
ec238a9b4e
|
Merge branch 'master_xieqiyu_20006' into 'master'
* Fix bug#20006.
See merge request easycorp/zentaopms!2917
|
2022-04-13 08:22:44 +00:00 |
|
|
孙广明
|
96aac66684
|
Merge branch 'master_xieqiyu_13127' into 'master'
* Fix bug#13127.
See merge request easycorp/zentaopms!2914
|
2022-04-13 08:22:07 +00:00 |
|
|
孙广明
|
ec3d957536
|
Merge branch 'master_xieqiyu_21382' into 'master'
* Fix bug#21382.
See merge request easycorp/zentaopms!2911
|
2022-04-13 08:21:38 +00:00 |
|
|
王怡栋
|
97f9ee3297
|
Merge branch 'fixbugs_zhouxin_21374' into 'master'
* Fix bug #21374.
See merge request easycorp/zentaopms!2922
|
2022-04-13 08:05:44 +00:00 |
|
|
zhouxin
|
6e6deaa462
|
* Fix bug #21374.
|
2022-04-13 07:59:57 +00:00 |
|
|
王怡栋
|
fb96e23a7f
|
Merge branch 'sprint/master_zhouxudong_14189' into 'master'
* Fix bug #14189.
See merge request easycorp/zentaopms!2919
|
2022-04-13 07:53:28 +00:00 |
|
|
王怡栋
|
a8983445c8
|
Merge branch 'master' into 'sprint/master_zhouxudong_17994'
# Conflicts:
# module/bug/model.php
# module/task/model.php
|
2022-04-13 07:52:03 +00:00 |
|
|
zhouxudong
|
61198c8486
|
* Fix bug #14189.
|
2022-04-13 15:40:09 +08:00 |
|
|
周旭东
|
e9e20ffae0
|
Update control.php
|
2022-04-13 07:24:55 +00:00 |
|
|
王怡栋
|
c273c3aefe
|
Merge branch 'sprint/master_zhouxudong_21700' into 'master'
* Fix bug #21700.
See merge request easycorp/zentaopms!2904
|
2022-04-13 07:19:18 +00:00 |
|
|
xieqiyu
|
f5b55eecfe
|
* Fix bug#20006.
|
2022-04-13 15:03:57 +08:00 |
|
|
王怡栋
|
ac0f89247c
|
Merge branch 'sprint/tianshujie_bug17551' into 'master'
Sprint/tianshujie bug17551
See merge request easycorp/zentaopms!2916
|
2022-04-13 07:02:40 +00:00 |
|
|
tianshujie
|
d41521bbcc
|
* Fix bug #21699.
|
2022-04-13 14:53:33 +08:00 |
|
|
王怡栋
|
6e9c3a8afc
|
Merge branch 'sprint/master_lanzongjun_fixbug' into 'master'
* fix bug *21293
See merge request easycorp/zentaopms!2915
|
2022-04-13 06:49:48 +00:00 |
|
|
zenggang
|
0ed499a6d0
|
* Fix bug#12963
|
2022-04-13 06:48:32 +00:00 |
|
|
tianshujie
|
b9670165ab
|
* Fix bug #21653.
|
2022-04-13 14:44:01 +08:00 |
|
|
Zongjun Lan
|
0aa1cc9ad9
|
* fix bug *21293
|
2022-04-13 14:39:33 +08:00 |
|
|
tianshujie
|
f612dcd079
|
* Fix bug 17551.
|
2022-04-13 14:27:53 +08:00 |
|
|
tianshujie
|
e681135a3a
|
* Fix bug #21643.
|
2022-04-13 14:22:32 +08:00 |
|
|
xieqiyu
|
573fa80df6
|
* Fix bug#13127.
|
2022-04-13 14:00:25 +08:00 |
|
|
王怡栋
|
940659bc12
|
Merge branch 'sprint/master_fixbug' into 'master'
* Fix bug #21576.
See merge request easycorp/zentaopms!2913
|
2022-04-13 05:57:24 +00:00 |
|
|
王怡栋
|
fd4e6bc2bc
|
Merge branch 'sprint/fixbug_hufangzhou_15656' into 'master'
* Fix bug #15656.
See merge request easycorp/zentaopms!2907
|
2022-04-13 05:39:42 +00:00 |
|
|
tianshujie
|
90a1fea2d8
|
* Fix bug #17551.
|
2022-04-13 13:35:02 +08:00 |
|
|
zenggang
|
2628e119bb
|
* Fix bug#15760
|
2022-04-13 05:27:40 +00:00 |
|
|
xieqiyu
|
22b629b707
|
* Fix bug#21382.
|
2022-04-13 13:15:08 +08:00 |
|
|
zhouxudong
|
20a9051148
|
* Fix bug #14891.
|
2022-04-13 11:23:29 +08:00 |
|
|
hufangzhou
|
18293e3e0d
|
* Fix bug #15656.
|
2022-04-13 11:19:20 +08:00 |
|
|
周旭东
|
4e7fcd1ad1
|
Update model.php
|
2022-04-13 03:08:48 +00:00 |
|
|
zhouxudong
|
dcdbf60bdf
|
* Fix bug #17994.
|
2022-04-13 11:07:22 +08:00 |
|
|
zhouxudong
|
37337bdb68
|
* Fix bug #17994.
|
2022-04-13 10:59:25 +08:00 |
|
|
tanghucheng
|
0c2c898c01
|
* Fix bug #21576.
|
2022-04-13 10:46:44 +08:00 |
|
|
zhouxudong
|
19f499e121
|
* Fix bug #17994.
|
2022-04-13 10:36:39 +08:00 |
|
|
zhouxudong
|
7ac526401d
|
* Fix bug #21700.
|
2022-04-13 10:08:53 +08:00 |
|
|
孙广明
|
64df7ac5c0
|
Merge branch 'sunhuawei_fixbug_21668' into 'master'
*Fix bug#21668
See merge request easycorp/zentaopms!2903
|
2022-04-13 02:07:02 +00:00 |
|
|
王怡栋
|
f6b236aed7
|
Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms
|
2022-04-13 10:02:05 +08:00 |
|
|
王怡栋
|
a9809c35aa
|
* code for bug #20823.
|
2022-04-13 10:01:36 +08:00 |
|