 Zongjun Lan
|
7add528024
|
* fix bug 19496
|
2022-03-07 15:37:27 +08:00 |
|
|
Zongjun Lan
|
812f676b3a
|
* fix bug 19464
|
2022-03-07 14:09:57 +08:00 |
|
|
Zongjun Lan
|
bbd580c373
|
* fix bug 19010
|
2022-03-07 13:44:17 +08:00 |
|
|
Zongjun Lan
|
b4ac6f00e3
|
Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms into sprint/master_lanzongjun_fixbug
|
2022-03-07 08:37:54 +08:00 |
|
|
孙广明
|
47cdcb88b1
|
Merge branch 'sprint/sunhao/kanban_lib' into 'master'
* update kanban lib to fix columns layout.
See merge request easycorp/zentaopms!2085
|
2022-03-04 09:20:06 +00:00 |
|
|
孙广明
|
7fb38998d7
|
Merge branch 'sprint/186_liumengyi_20323' into 'master'
* Fix bug #20323.
See merge request easycorp/zentaopms!2087
|
2022-03-04 09:19:46 +00:00 |
|
|
孙广明
|
4134eeb07a
|
Merge branch 'sprint/186_tianshujie_20367' into 'master'
* Fix bug #20367.
See merge request easycorp/zentaopms!2089
|
2022-03-04 09:19:29 +00:00 |
|
|
孙广明
|
49721dfb68
|
Merge branch 'sprint/186_tianshujie_20328' into 'master'
* Fix bug #20328.
See merge request easycorp/zentaopms!2088
|
2022-03-04 09:19:03 +00:00 |
|
|
Zongjun Lan
|
cc54fde953
|
* fix bug 18600
|
2022-03-04 17:08:45 +08:00 |
|
|
tianshujie
|
b83835f077
|
* Fix bug #20367.
|
2022-03-04 16:44:58 +08:00 |
|
|
tianshujie
|
5b2b646db3
|
* Fix bug #20328.
|
2022-03-04 16:29:56 +08:00 |
|
|
liumengyi
|
3885b28344
|
* Fix bug #20323.
|
2022-03-04 16:29:49 +08:00 |
|
|
Hao Sun
|
5669a45ac1
|
* update kanban lib to fix columns layout.
|
2022-03-04 16:24:26 +08:00 |
|
|
Zongjun Lan
|
eb3c8ac56d
|
Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms into sprint/master_lanzongjun_fixbug
|
2022-03-04 16:04:16 +08:00 |
|
|
孙广明
|
8b250b7e37
|
Merge branch 'sprint/fix_bug_leiyong' into 'master'
* Remove the rebuild index logic when upgrading.
See merge request easycorp/zentaopms!2066
|
2022-03-04 08:01:54 +00:00 |
|
|
孙广明
|
36cb5bd3d0
|
Merge branch 'sprint/186_tianshujie_20353' into 'master'
* Fix bug #20353.
See merge request easycorp/zentaopms!2083
|
2022-03-04 07:48:20 +00:00 |
|
|
tianshujie
|
69bd684cd3
|
* Fix bug #20353.
|
2022-03-04 15:47:17 +08:00 |
|
|
Zongjun Lan
|
4ceee5419d
|
Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms into sprint/master_lanzongjun_fixbug
|
2022-03-04 15:24:47 +08:00 |
|
|
孙广明
|
90ea53bc9c
|
Merge branch 'sprint/186_tianshujie_20351'
|
2022-03-04 15:11:31 +08:00 |
|
|
孙广明
|
a0c7a4d19f
|
Merge branch 'master' into 'sprint/186_tianshujie_20351'
# Conflicts:
# framework/control.class.php
|
2022-03-04 07:10:59 +00:00 |
|
|
王怡栋
|
ebb6c3be60
|
Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms
|
2022-03-04 15:06:01 +08:00 |
|
|
王怡栋
|
b19ff4c180
|
* adjust for flow.
|
2022-03-04 15:05:34 +08:00 |
|
|
Zongjun Lan
|
47adf87fc2
|
* fix bug 20022
|
2022-03-04 15:05:14 +08:00 |
|
|
tianshujie
|
0569c26792
|
* Fix bug #20351.
|
2022-03-04 15:03:48 +08:00 |
|
|
王怡栋
|
6a3af094fe
|
Merge branch 'sprint/master_lanzongjun_fixbug' into 'master'
* fix bug 20234,20022
See merge request easycorp/zentaopms!2072
|
2022-03-04 06:38:10 +00:00 |
|
|
王怡栋
|
b89e417cb3
|
Merge branch 'sgm_upgrade' into 'master'
* Code for force upgrade.
See merge request easycorp/zentaopms!2069
|
2022-03-04 06:37:32 +00:00 |
|
|
Zongjun Lan
|
a2e18288cf
|
* fix bug 20022
|
2022-03-04 14:31:27 +08:00 |
|
|
Zongjun Lan
|
23d699311d
|
* fix bug 20022
|
2022-03-04 14:27:25 +08:00 |
|
|
孙广明
|
fef8743594
|
Merge branch 'sprint/186_liumengyi_20339' into 'master'
* Fix bug #20339.
See merge request easycorp/zentaopms!2078
|
2022-03-04 06:12:32 +00:00 |
|
|
孙广明
|
478dc223a7
|
Merge branch 'sprint/186_tianshujie_20301' into 'master'
* Fix bug #20301.
See merge request easycorp/zentaopms!2076
|
2022-03-04 06:10:05 +00:00 |
|
|
tianshujie
|
162b015ae5
|
* Modify the code.
|
2022-03-04 14:09:12 +08:00 |
|
|
孙广明
|
e1ff2c617f
|
Merge branch 'sprint/186_tianshujie_20260' into 'master'
* Fix bug #20260.
See merge request easycorp/zentaopms!2077
|
2022-03-04 06:05:17 +00:00 |
|
|
liumengyi
|
c237c59b5e
|
* Fix bug #20339.
|
2022-03-04 13:57:01 +08:00 |
|
|
tianshujie
|
85f96e6489
|
* Fix bug #20260.
|
2022-03-04 13:49:58 +08:00 |
|
|
孙广明
|
a04f62b97e
|
Merge branch 'sprint/186_liumengyi_20318' into 'master'
* Fix bug #20318.
See merge request easycorp/zentaopms!2075
|
2022-03-04 05:30:54 +00:00 |
|
|
liumengyi
|
33d7610a06
|
* Fix bug #20303.
|
2022-03-04 13:27:53 +08:00 |
|
|
tianshujie
|
5b5213c761
|
* Fix bug #20301.
|
2022-03-04 13:21:09 +08:00 |
|
|
liumengyi
|
5ccacc2138
|
* Fix bug #20318.
|
2022-03-04 13:05:01 +08:00 |
|
|
孙广明
|
a72689a828
|
Merge branch 'sprint/186_tianshujie_20307' into 'master'
* Fix bug #20307,18089.
See merge request easycorp/zentaopms!2073
|
2022-03-04 03:19:19 +00:00 |
|
|
tianshujie
|
ae154aea0c
|
* Modify the code logic.
|
2022-03-04 11:18:03 +08:00 |
|
|
tianshujie
|
fc2bd0bbdc
|
* Fix bug #20307,18089.
|
2022-03-04 11:00:58 +08:00 |
|
|
Zongjun Lan
|
a603cb92b9
|
* fix bug 20234
|
2022-03-04 11:00:54 +08:00 |
|
|
孙广明
|
43b873f7ae
|
Merge branch 'sprint/186_tianshujie_upgrade' into 'master'
* Adjust the project field of the zt_task.
See merge request easycorp/zentaopms!2065
|
2022-03-04 02:40:52 +00:00 |
|
|
孙广明
|
ba96e4c4a2
|
Merge branch 'sprint/186_liumengyi_20255' into 'master'
* Fix bug #20255.
See merge request easycorp/zentaopms!2071
|
2022-03-04 02:26:57 +00:00 |
|
|
liumengyi
|
0358331dc9
|
* Fix bug #20255.
|
2022-03-04 10:18:55 +08:00 |
|
|
孙广明
|
8a17464384
|
Merge branch 'sprint/186_tianshujie_20269' into 'master'
* Fix bug #20269.
See merge request easycorp/zentaopms!2070
|
2022-03-04 02:08:59 +00:00 |
|
|
孙广明
|
eded70ec2b
|
Merge branch 'sprint/186_liumengyi_20255' into 'master'
* Fix bug #20314.
See merge request easycorp/zentaopms!2068
|
2022-03-04 02:08:14 +00:00 |
|
|
tianshujie
|
b8adb47787
|
* Modify the code logic.
|
2022-03-04 10:02:52 +08:00 |
|
|
tianshujie
|
35d1bc80dd
|
* Fix bug #20269.
|
2022-03-04 09:58:49 +08:00 |
|
|
孙广明
|
202df229b0
|
* Code for force upgrade.
|
2022-03-04 09:42:19 +08:00 |
|