 孔令茂
|
45fd5e6a53
|
* Resolved feedback #1355.
|
2022-11-07 06:45:21 +00:00 |
|
|
李玉春
|
9030b0e194
|
Merge branch 'cyy_bug' into 'master'
* Fix bug #29355.
See merge request easycorp/zentaopms!6059
|
2022-11-07 06:35:30 +00:00 |
|
|
李玉春
|
04794398fa
|
Merge branch 'sprint/wangzemei/29345' into 'master'
* fix bug 29345
See merge request easycorp/zentaopms!6060
|
2022-11-07 06:32:47 +00:00 |
|
|
wangzemei
|
261eb124ae
|
* fix bug 29345
|
2022-11-07 13:51:53 +08:00 |
|
|
caoyanyi
|
dcdc7bd58a
|
* Adjust code.
|
2022-11-07 13:49:12 +08:00 |
|
|
caoyanyi
|
e6cbdb8182
|
* Fix bug #28992.
|
2022-11-07 13:44:11 +08:00 |
|
|
caoyanyi
|
43ca7832f9
|
* Fix bug #29355.
|
2022-11-07 13:16:57 +08:00 |
|
|
孙广明
|
0b501483ef
|
Merge branch 'sprint/tianshujie_css' into 'master'
Sprint/tianshujie css
See merge request easycorp/zentaopms!6058
|
2022-11-07 03:14:03 +00:00 |
|
|
tianshujie
|
8e67ec5de9
|
* Optimize the form for recording work hours for multi-person tasks.
|
2022-11-07 11:04:45 +08:00 |
|
|
王怡栋
|
36fa636926
|
Merge branch 'fixbug' into 'master'
* Set memory_limit and max_execution_time for import.
See merge request easycorp/zentaopms!6055
|
2022-11-07 02:55:19 +00:00 |
|
|
Yagami
|
b631288454
|
Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms
|
2022-11-07 10:54:28 +08:00 |
|
|
Yagami
|
d35791bde0
|
* Fix keep login bug.
|
2022-11-07 10:54:15 +08:00 |
|
|
孙广明
|
e22839b687
|
Merge branch 'feedback_zhouxin_1277' into 'master'
* Resolve feedback #1277.
See merge request easycorp/zentaopms!6057
|
2022-11-07 02:54:01 +00:00 |
|
|
王怡栋
|
0d32989630
|
Merge branch 'sprint/ZUI_guofeilong_updateIcon_ticket_and_gantt1' into 'master'
+ ZUI add icon ticket and gantt1
See merge request easycorp/zentaopms!6053
|
2022-11-07 02:52:54 +00:00 |
|
|
孙广明
|
af5c2c5845
|
Merge branch 'sprint/master_lanzongjun_fixbug' into 'master'
* fix bug ticket count show
See merge request easycorp/zentaopms!6056
|
2022-11-07 02:52:21 +00:00 |
|
|
lanzongjun
|
30bae3ed2d
|
* fix bug ticket count show
|
2022-11-07 10:51:18 +08:00 |
|
|
tianshujie
|
4ee897dc0d
|
* Fix bug #27494.
|
2022-11-07 10:50:32 +08:00 |
|
|
zhouxin
|
d6a2fcd325
|
* Resolve feedback #1277.
|
2022-11-07 10:44:27 +08:00 |
|
|
tanghucheng
|
76f830aad6
|
* Set memory_limit and max_execution_time for import.
|
2022-11-07 10:12:28 +08:00 |
|
|
李玉春
|
e8b42deef3
|
Merge branch 'sprint/tianshujie_fixbug' into 'master'
Sprint/tianshujie fixbug
See merge request easycorp/zentaopms!6054
|
2022-11-07 02:06:22 +00:00 |
|
|
李玉春
|
9a5c92a275
|
Merge branch 'cyy_bug' into 'master'
* Fix bug #27589.
See merge request easycorp/zentaopms!6052
|
2022-11-07 02:05:01 +00:00 |
|
|
tianshujie
|
280a37559e
|
* Fix bug #29293.
|
2022-11-07 10:03:47 +08:00 |
|
|
tianshujie
|
91f6d1b9f0
|
* Fix bug #29293.
|
2022-11-07 09:54:41 +08:00 |
|
|
guofeilong
|
f71df9fefc
|
+ ZUI add icon ticket and gantt1
|
2022-11-07 01:52:11 +00:00 |
|
|
caoyanyi
|
ddfade7db2
|
* Fix bug #27589.
|
2022-11-07 09:50:00 +08:00 |
|
|
tianshujie
|
5ea7567745
|
* Fix bug #27975.
|
2022-11-07 09:39:52 +08:00 |
|
|
tianshujie
|
0c3e7b8c70
|
* Fix bug #27978.
|
2022-11-07 09:33:24 +08:00 |
|
|
tianshujie
|
2176378af6
|
* Fix bug #29339.
|
2022-11-07 09:11:40 +08:00 |
|
|
孙广明
|
9f87785a72
|
Merge branch 'sprint/fixbug_liumengyi_29272' into 'master'
* Fix bug #29272.
See merge request easycorp/zentaopms!6051
|
2022-11-07 01:10:11 +00:00 |
|
|
liumengyi
|
0159cabcff
|
* Fix bug #29272.
|
2022-11-07 09:05:56 +08:00 |
|
|
朱金勇
|
591cc27bb5
|
Merge branch 'sprint/xuanxuan' into 'master'
* Fix die error for xuanxuan.
See merge request easycorp/zentaopms!6048
|
2022-11-07 00:13:25 +00:00 |
|
|
Lufei
|
35ef023439
|
* Fix die error for xuanxuan.
|
2022-11-04 17:17:49 +08:00 |
|
|
李玉春
|
e0459b13cb
|
Merge branch 'sprint/tianshujie_fixbug' into 'master'
* Fix bug #29293.
See merge request easycorp/zentaopms!6047
|
2022-11-04 07:57:59 +00:00 |
|
|
tianshujie
|
26efc38fbb
|
* Fix bug #29293.
|
2022-11-04 15:54:29 +08:00 |
|
|
孙广明
|
9d89b58f5d
|
Merge branch 'fixbug' into 'master'
* Update picker select style for showimport.
See merge request easycorp/zentaopms!6045
|
2022-11-04 07:53:40 +00:00 |
|
|
tanghucheng
|
48cc91b414
|
* Update picker select style for showimport.
|
2022-11-04 15:52:03 +08:00 |
|
|
孙广明
|
12063da05e
|
Merge branch 'master_bug_29290' into 'master'
* Fix bug #29290.
See merge request easycorp/zentaopms!6046
|
2022-11-04 07:48:01 +00:00 |
|
|
liuhong
|
1b7c9a9897
|
* Fix bug #29290.
|
2022-11-04 07:32:00 +00:00 |
|
|
孙广明
|
e153767b48
|
Merge branch 'liyuchun_fixbug' into 'master'
* Fix bug #27253.
See merge request easycorp/zentaopms!6043
|
2022-11-04 07:20:44 +00:00 |
|
|
liyuchun
|
7e02324b22
|
* Fix bug #27253.
|
2022-11-04 15:17:49 +08:00 |
|
|
王怡栋
|
c5891b05c4
|
Merge branch 'fixbug' into 'master'
* Fix bug #29282.
See merge request easycorp/zentaopms!6040
|
2022-11-04 06:10:00 +00:00 |
|
|
tanghucheng
|
bdf77c8831
|
* Fix bug #29282.
|
2022-11-04 13:57:51 +08:00 |
|
|
李玉春
|
7e1c52a0a7
|
Merge branch 'sprint/tianshujie_fixbug' into 'master'
* Fix bug #29260.
See merge request easycorp/zentaopms!6039
|
2022-11-04 05:41:42 +00:00 |
|
|
tianshujie
|
f7c06e9935
|
* Fix bug #29260.
|
2022-11-04 13:36:00 +08:00 |
|
|
李玉春
|
7ed6f3a5fb
|
Merge branch 'tianshujie_fixbug' into 'master'
Tianshujie fixbug
See merge request easycorp/zentaopms!6037
|
2022-11-04 05:05:55 +00:00 |
|
|
tianshujie
|
9363788155
|
* Fix bug #29280.
|
2022-11-04 11:31:32 +08:00 |
|
|
tianshujie
|
d9ea15f286
|
* Fix bug #29276.
|
2022-11-04 11:26:54 +08:00 |
|
|
tianshujie
|
cf7a678b9b
|
* Fix bug #29280.
|
2022-11-04 11:25:06 +08:00 |
|
|
王怡栋
|
586eeb073c
|
Merge branch 'sprint/master_lanzongjun_fixbug' into 'master'
* fix bug #26290#29273
See merge request easycorp/zentaopms!6036
|
2022-11-04 03:14:03 +00:00 |
|
|
lanzongjun
|
d1b7c675ba
|
* fix bug #29273
|
2022-11-04 11:12:51 +08:00 |
|