 guofeilong
|
9aeba19381
|
* add pd-r-8 to column c-hours th
|
2022-10-09 06:56:38 +00:00 |
|
|
guofeilong
|
13135a581f
|
* finish task 71882
|
2022-10-09 05:28:58 +00:00 |
|
|
王怡栋
|
6de1261aa9
|
Merge branch 'bug_28284' into 'master'
* Fix bug#28284
See merge request easycorp/zentaopms!5681
|
2022-10-09 05:13:24 +00:00 |
|
|
王怡栋
|
c4b0ea226e
|
Merge branch 'bug_28268' into 'master'
* Fix bug#28268
See merge request easycorp/zentaopms!5673
|
2022-10-09 05:10:54 +00:00 |
|
|
王怡栋
|
7e3bd18704
|
Merge branch 'sprint/hufangzhou_bug_28265' into 'master'
* Fix bug #28265.
See merge request easycorp/zentaopms!5666
|
2022-10-09 05:10:25 +00:00 |
|
|
王怡栋
|
449f6ec5c4
|
Merge branch 'master_xieqiyu_26061' into 'master'
* Fix bug#26061.
See merge request easycorp/zentaopms!5660
|
2022-10-09 05:09:42 +00:00 |
|
|
王怡栋
|
05d4c462a7
|
Merge branch 'master_28214' into 'master'
*Fix bug #28214.
See merge request easycorp/zentaopms!5659
|
2022-10-09 05:09:28 +00:00 |
|
|
王怡栋
|
1f68a6b1e7
|
Merge branch 'master_xieqiyu_26098' into 'master'
* Fix bug#26098.
See merge request easycorp/zentaopms!5658
|
2022-10-09 05:08:34 +00:00 |
|
|
王怡栋
|
83d7911269
|
Merge branch 'sprint/gfl_71907' into 'master'
* finish task #71907
See merge request easycorp/zentaopms!5677
|
2022-10-09 05:08:02 +00:00 |
|
|
zenggang
|
af225c1284
|
* Fix bug#28284
|
2022-10-09 03:27:18 +00:00 |
|
|
guofeilong
|
7fa0485534
|
* finish task #71907
|
2022-10-09 02:52:47 +00:00 |
|
|
wangyidong
|
460c3d9fb1
|
* adjust for ztSessionHandler.
|
2022-10-09 10:41:14 +08:00 |
|
|
李玉春
|
235739d5d0
|
Merge branch 'sprint/cyy_71886' into 'master'
* Finish task #71886.
See merge request easycorp/zentaopms!5675
|
2022-10-09 02:27:56 +00:00 |
|
|
曹延义
|
bff2bdcbb3
|
* Finish task #71877.
|
2022-10-09 10:07:41 +08:00 |
|
|
曹延义
|
dbd87ebfd3
|
Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms into sprint/cyy_71886
|
2022-10-09 09:36:33 +08:00 |
|
|
曹延义
|
162c12800b
|
* Finish task #71886.
|
2022-10-09 09:36:13 +08:00 |
|
|
李玉春
|
5ca7ebfadc
|
Merge branch 'cyy_71909' into 'master'
Cyy 71909
See merge request easycorp/zentaopms!5674
|
2022-10-09 00:26:46 +00:00 |
|
|
曹延义
|
a923a0838d
|
* Finish task #71884.
|
2022-10-08 17:21:29 +08:00 |
|
|
曹延义
|
9e7e1f6969
|
* Finish task #71906.
|
2022-10-08 17:17:42 +08:00 |
|
|
曹延义
|
62cc57a8e7
|
* Finish task #71909.
|
2022-10-08 17:04:34 +08:00 |
|
|
曹延义
|
4b219ab7b1
|
* Reset page style.
|
2022-10-08 16:59:02 +08:00 |
|
|
zenggang
|
78b8da1ba8
|
* Fix bug#28268
|
2022-10-08 08:09:12 +00:00 |
|
|
wangyidong
|
b670a47863
|
* fix bug #27958.
|
2022-10-08 15:32:49 +08:00 |
|
|
李玉春
|
f00f3a313e
|
Merge branch 'ta_liyang' into 'master'
* Fix unittest of task.
See merge request easycorp/zentaopms!5671
|
2022-10-08 03:30:56 +00:00 |
|
|
liyang
|
20dc2d58a7
|
* Fix unittest of task.
|
2022-10-08 11:28:02 +08:00 |
|
|
liyuchun
|
45a69b24f9
|
Merge branch 'devops19'
|
2022-10-08 11:22:42 +08:00 |
|
|
李玉春
|
743595ea83
|
Merge branch 'master' into 'devops19'
# Conflicts:
# test/model/mr/create.php
|
2022-10-08 03:21:38 +00:00 |
|
|
李玉春
|
d38d83d667
|
Merge branch 'sprint/wangzemei/28244' into 'master'
* fix bug 28244
See merge request easycorp/zentaopms!5664
|
2022-10-08 03:08:09 +00:00 |
|
|
wangzemei
|
48efbc2d95
|
* optimize the format
|
2022-10-08 11:02:34 +08:00 |
|
|
liyuchun
|
fbb492f4a5
|
Merge branch 'sprint/244_dyl_70022'
|
2022-10-08 10:56:08 +08:00 |
|
|
李玉春
|
7b37919be9
|
Merge branch 'sprint/wangzemei/28210' into 'master'
* fix bug 28210
See merge request easycorp/zentaopms!5656
|
2022-10-08 02:49:30 +00:00 |
|
|
李玉春
|
c2504f09b0
|
Merge branch 'cyy_optimize' into 'master'
* Fix bug #28263.
See merge request easycorp/zentaopms!5654
|
2022-10-08 02:48:44 +00:00 |
|
|
曹延义
|
6155b79963
|
Merge branch 'master' into cyy_optimize
|
2022-10-08 10:18:00 +08:00 |
|
|
曹延义
|
80e9e163e7
|
* Fix bug #28181.
|
2022-10-08 10:14:54 +08:00 |
|
|
孙广明
|
22db5f3296
|
Merge branch 'lyk_feedback_938' into 'master'
* Resolve feedback #938.
See merge request easycorp/zentaopms!5668
|
2022-10-08 01:46:11 +00:00 |
|
|
liuyongkai
|
6422b24d96
|
* Resolve feedback #938.
|
2022-10-08 01:40:04 +00:00 |
|
|
管西迎
|
ee7eed5a4f
|
Merge branch 'sprint/hufangzhou_bug_urmodule' into 'master'
* Fix bug #28266.
See merge request easycorp/zentaopms!5667
|
2022-10-08 01:29:41 +00:00 |
|
|
hufangzhou
|
90e28b35c2
|
* Fix bug #28266.
|
2022-10-08 01:24:57 +00:00 |
|
|
hufangzhou
|
fa00ebf9f5
|
* Fix bug #28265.
|
2022-10-08 01:05:13 +00:00 |
|
|
朱金勇
|
1f3796fcde
|
Merge branch 'sprint/readme' into 'master'
* Optimize README.
See merge request easycorp/zentaopms!5662
|
2022-10-08 00:46:59 +00:00 |
|
|
wangzemei
|
e30e856ea6
|
* fix bug 28244
|
2022-09-30 16:27:11 +08:00 |
|
|
dingyongliang
|
61a485590e
|
* change nest toggle position.
|
2022-09-30 08:05:04 +00:00 |
|
|
Lufei
|
05950e0061
|
* Optimize README.
|
2022-09-30 15:48:10 +08:00 |
|
|
xieqiyu
|
f8c9dad863
|
* Fix bug#26061.
|
2022-09-30 07:28:48 +00:00 |
|
|
liuhong
|
0f9ee29fec
|
*Fix bug #28214.
|
2022-09-30 07:20:17 +00:00 |
|
|
王怡栋
|
d8fc1f2c60
|
Merge branch 'sprint/hufangzhou_feedback_130' into 'master'
* Handle feedback #130.
See merge request easycorp/zentaopms!5657
|
2022-09-30 07:19:30 +00:00 |
|
|
xieqiyu
|
57dd6eb716
|
* Fix bug#26098.
|
2022-09-30 07:19:21 +00:00 |
|
|
王怡栋
|
20bebfa17b
|
Merge branch 'feedback_958' into 'master'
* Code for feedback#958
See merge request easycorp/zentaopms!5655
|
2022-09-30 07:15:29 +00:00 |
|
|
hufangzhou
|
098ad81cd5
|
* Handle feedback #130.
|
2022-09-30 15:11:57 +08:00 |
|
|
wangyidong
|
fd1c722af1
|
* fix bug #28075.
|
2022-09-30 14:58:57 +08:00 |
|