 王怡栋
|
6aadc5a77d
|
Merge branch 'sprint/master_zhouxudong_24894' into 'master'
* Fix bug #24894.
See merge request easycorp/zentaopms!4583
|
2022-07-15 07:10:34 +00:00 |
|
|
王怡栋
|
393a7466a1
|
Merge branch 'master_xieqiyu_25038' into 'master'
* Fix bug#25038.
See merge request easycorp/zentaopms!4580
|
2022-07-15 07:10:20 +00:00 |
|
|
王怡栋
|
9fbcd9113c
|
Merge branch 'sprint/215_liumengyi_25386' into 'master'
* Fix bug #25386.
See merge request easycorp/zentaopms!4587
|
2022-07-15 07:09:55 +00:00 |
|
|
liumengyi
|
3c974558c1
|
* Fix bug #25386.
|
2022-07-15 15:03:01 +08:00 |
|
|
孙广明
|
2a50a5dc72
|
Merge branch 'sprint/tianshujie_fixbug' into 'master'
* Fix bug #25321.
See merge request easycorp/zentaopms!4584
|
2022-07-15 06:40:49 +00:00 |
|
|
tianshujie
|
c0c21bc75d
|
* Fix bug #25321.
|
2022-07-15 14:39:35 +08:00 |
|
|
xieqiyu
|
ea5c5c760d
|
* Delete future width when create project.
|
2022-07-15 14:38:17 +08:00 |
|
|
孙广明
|
cb01084a13
|
Merge branch 'sprint/215_liumengyi_25230' into 'master'
* Fix bug #25230, #25200,#24929.
See merge request easycorp/zentaopms!4579
|
2022-07-15 06:17:32 +00:00 |
|
|
孙广明
|
900e2342a2
|
Merge branch 'sprint/tianshujie_fixbug' into 'master'
Sprint/tianshujie fixbug
See merge request easycorp/zentaopms!4582
|
2022-07-15 06:16:50 +00:00 |
|
|
liumengyi
|
67772332b5
|
* Fix bug #24929.
|
2022-07-15 14:16:27 +08:00 |
|
|
liumengyi
|
c38e03a604
|
* Fix bug #25200.
|
2022-07-15 14:07:49 +08:00 |
|
|
tianshujie
|
656cc5f060
|
* Fix bug #25321.
|
2022-07-15 14:07:32 +08:00 |
|
|
xieqiyu
|
12d9c215ee
|
* Fix bug#25038.
|
2022-07-15 13:58:53 +08:00 |
|
|
zhouxudong
|
95dba9297d
|
* Fix bug #24894.
|
2022-07-15 05:43:51 +00:00 |
|
|
liumengyi
|
7b9c5e6d52
|
* Fix bug #25230.
|
2022-07-15 13:42:13 +08:00 |
|
|
孙广明
|
824c6f5aee
|
Merge branch 'sprint/216_mayue_fixbug' into 'master'
* Fix bug .
See merge request easycorp/zentaopms!4577
|
2022-07-15 05:14:06 +00:00 |
|
|
mayue
|
a8dc623084
|
* Fix bug .
|
2022-07-15 13:13:28 +08:00 |
|
|
tianshujie
|
5e464f8b85
|
* Fix bug #25375.
|
2022-07-15 13:09:24 +08:00 |
|
|
王怡栋
|
849eafbe36
|
Merge branch 'sprint/master_zhouxudong_fixbug' into 'master'
* Fix bug.
See merge request easycorp/zentaopms!4576
|
2022-07-15 05:04:56 +00:00 |
|
|
zhouxudong
|
56c1339fbe
|
* Fix bug.
|
2022-07-15 03:36:57 +00:00 |
|
|
王怡栋
|
21bc4a5a5f
|
Merge branch 'bugfix/liwenrui/kanbanheader' into 'master'
* fix toolbar position for zentaoclient.
See merge request easycorp/zentaopms!4574
|
2022-07-15 03:23:51 +00:00 |
|
|
Wenrui LI
|
d3351f941c
|
* adjust toolbar position.
|
2022-07-15 11:23:25 +08:00 |
|
|
王怡栋
|
7e682c99c2
|
Merge branch 'sprint/xuanxuan_110' into 'master'
Sprint/xuanxuan 110
See merge request easycorp/zentaopms!4563
|
2022-07-15 03:17:39 +00:00 |
|
|
王怡栋
|
e399056cee
|
Merge branch 'master_xieqiyu_25365' into 'master'
* Fix bug#25365.
See merge request easycorp/zentaopms!4575
|
2022-07-15 03:16:28 +00:00 |
|
|
孙广明
|
ba6798198f
|
Merge branch 'sprint216_zg_gaijin' into 'master'
* Remove productplan die
See merge request easycorp/zentaopms!4572
|
2022-07-15 03:15:09 +00:00 |
|
|
孙广明
|
aedab5c784
|
Merge branch 'sprint/216_mayue_bug#25358' into 'master'
* Fix bug #25358.
See merge request easycorp/zentaopms!4571
|
2022-07-15 03:14:57 +00:00 |
|
|
孙广明
|
bcf080f6b7
|
Merge branch 'liyuchun_fixbug' into 'master'
Liyuchun fixbug
See merge request easycorp/zentaopms!4570
|
2022-07-15 03:14:43 +00:00 |
|
|
李玉春
|
51b2242326
|
Liyuchun fixbug
|
2022-07-15 03:14:43 +00:00 |
|
|
孙广明
|
c468dd6c63
|
Merge branch 'zg_bugs' into 'master'
* Fix batchadd user ajax error
See merge request easycorp/zentaopms!4566
|
2022-07-15 03:13:52 +00:00 |
|
|
xieqiyu
|
311436573a
|
* Fix bug#25365.
|
2022-07-15 11:12:04 +08:00 |
|
|
Wenrui LI
|
85342843ef
|
* fix toolbar position for zentaoclient.
|
2022-07-15 11:10:34 +08:00 |
|
|
王怡栋
|
16bd36bb4e
|
Merge branch 'bugfix/liwenrui/clientdownload' into 'master'
* fix oom on downloading client.
See merge request easycorp/zentaopms!4573
|
2022-07-15 03:09:38 +00:00 |
|
|
Wenrui LI
|
bae78d6262
|
* fix oom on downloading client.
|
2022-07-15 11:05:38 +08:00 |
|
|
孙广明
|
c04d08210a
|
* Code for php error.
|
2022-07-15 10:56:52 +08:00 |
|
|
zenggang
|
410bd4d3aa
|
* Remove productplan die
|
2022-07-15 02:51:57 +00:00 |
|
|
mayue
|
e31f207b0b
|
* Fix bug #25358.
|
2022-07-15 10:45:23 +08:00 |
|
|
王怡栋
|
27b4774795
|
Merge branch 'sprint/215_liumengyi_25336' into 'master'
* Fix bug #25336 and fix bug #25325.
See merge request easycorp/zentaopms!4568
|
2022-07-15 02:37:13 +00:00 |
|
|
王怡栋
|
b022b8b7f5
|
Merge branch 'master_xieqiyu_25084' into 'master'
* Fix bug#25084.
See merge request easycorp/zentaopms!4567
|
2022-07-15 02:36:35 +00:00 |
|
|
王怡栋
|
f900da76ce
|
Merge branch 'sprint214_fix_bug' into 'master'
* Processing product default value error.
See merge request easycorp/zentaopms!4569
|
2022-07-15 02:36:10 +00:00 |
|
|
孙广明
|
d5c7586a47
|
* Fix menu bug.
|
2022-07-15 10:33:58 +08:00 |
|
|
leiyong
|
76dc008820
|
* Processing product default value error.
|
2022-07-15 02:30:21 +00:00 |
|
|
liumengyi
|
5fe08a5c14
|
* Fix bug #25336.
|
2022-07-15 10:10:45 +08:00 |
|
|
wangyidong
|
1fcfdf2972
|
Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms
|
2022-07-15 10:06:00 +08:00 |
|
|
wangyidong
|
c4af3c24b6
|
* fix bug #25346.
|
2022-07-15 10:05:43 +08:00 |
|
|
liumengyi
|
94992c299f
|
* Fix bug #25336.
|
2022-07-15 09:44:01 +08:00 |
|
|
xieqiyu
|
f9e7b52cca
|
* Fix bug#25084.
|
2022-07-15 09:28:00 +08:00 |
|
|
孙广明
|
52281f12c3
|
Merge branch 'liyuchun_fixbug' into 'master'
Liyuchun fixbug
See merge request easycorp/zentaopms!4562
|
2022-07-15 01:22:58 +00:00 |
|
|
孙广明
|
4617c3a040
|
Merge branch 'fixbug_25202' into 'master'
fixbug_25202
See merge request easycorp/zentaopms!4564
|
2022-07-15 01:22:47 +00:00 |
|
|
孙广明
|
ef79ca207a
|
Merge branch 'sprint214_fix_bug' into 'master'
* Fix the product default value error.
See merge request easycorp/zentaopms!4565
|
2022-07-15 01:22:30 +00:00 |
|
|
leiyong
|
949d7e2ce5
|
* Fix the product default value error.
|
2022-07-15 01:14:52 +00:00 |
|