 李玉春
|
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 |
|
|
朱金勇
|
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 |
|
|
王怡栋
|
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 |
|
|
王怡栋
|
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 |
|
|
wangzemei
|
22b77ec407
|
* format Code
|
2022-09-30 14:55:46 +08:00 |
|
|
zenggang
|
88460b30ba
|
* Code for feedback#958
|
2022-09-30 06:41:27 +00:00 |
|
|
wangzemei
|
14742e0ad6
|
* fix bug 28210
|
2022-09-30 14:41:11 +08:00 |
|
|
曹延义
|
10fad7a82c
|
* Fix bug #28263.
|
2022-09-30 14:38:53 +08:00 |
|
|
王怡栋
|
975e588900
|
Merge branch 'master_xieqiyu_26837' into 'master'
* Fix bug#26837.
See merge request easycorp/zentaopms!5651
|
2022-09-30 06:28:24 +00:00 |
|
|
李玉春
|
8eca51d54c
|
Merge branch 'cyy_optimize' into 'master'
* Optimize page style.
See merge request easycorp/zentaopms!5649
|
2022-09-30 06:27:22 +00:00 |
|
|
李玉春
|
aaee69bf3e
|
Merge branch 'sprint/244_tianshujie_28256' into 'master'
Sprint/244 tianshujie 28256
See merge request easycorp/zentaopms!5652
|
2022-09-30 06:23:40 +00:00 |
|
|
曹延义
|
8901b0bb73
|
* Modify page style.
|
2022-09-30 14:05:40 +08:00 |
|
|
tianshujie
|
6113c39e9c
|
* Fix an issue where use cases in the company are ordered by status.
|
2022-09-30 14:04:14 +08:00 |
|
|
tianshujie
|
786505dca9
|
* Fix an issue where use cases in the company are ordered by status.
|
2022-09-30 14:01:49 +08:00 |
|
|
tianshujie
|
d375b98af6
|
* Fix bug #28256.
|
2022-09-30 14:01:33 +08:00 |
|
|
王怡栋
|
549cd96053
|
Merge branch 'master_xieqiyu_26904' into 'master'
* Fix bug#26904.
See merge request easycorp/zentaopms!5639
|
2022-09-30 05:59:35 +00:00 |
|
|
王怡栋
|
49a416c70c
|
Merge branch 'master_28189' into 'master'
*Fix bug #28189.
See merge request easycorp/zentaopms!5643
|
2022-09-30 05:59:20 +00:00 |
|
|
曹延义
|
bfa7cdbdd7
|
* Optimize page style.
|
2022-09-30 13:59:18 +08:00 |
|
|
王怡栋
|
2ef4d837b1
|
Merge branch 'master_xieqiyu_26892' into 'master'
Master xieqiyu 26892
See merge request easycorp/zentaopms!5645
|
2022-09-30 05:59:04 +00:00 |
|
|
xieqiyu
|
c4818a0fec
|
* Fix bug#26837.
|
2022-09-30 05:58:46 +00:00 |
|
|
王怡栋
|
be8e38c7ff
|
Merge branch 'feedback_923' into 'master'
* Handling feedback#923.
See merge request easycorp/zentaopms!5647
|
2022-09-30 05:58:25 +00:00 |
|
|
李玉春
|
d7d3fdad41
|
Merge branch 'cyy_optimize' into 'master'
* Modify click style.
See merge request easycorp/zentaopms!5648
|
2022-09-30 05:44:01 +00:00 |
|
|
曹延义
|
b228a66aca
|
* Modify project style.
|
2022-09-30 13:42:28 +08:00 |
|
|
dingyongliang
|
8630943125
|
* update zui.
|
2022-09-30 05:39:40 +00:00 |
|
|
曹延义
|
3911275e4f
|
* Modify click style.
|
2022-09-30 13:36:56 +08:00 |
|
|
leiyong
|
cf752602ab
|
* Handling feedback#923.
|
2022-09-30 05:32:11 +00:00 |
|
|
李玉春
|
05046906ea
|
Merge branch 'sprint/244_tianshujie_28241' into 'master'
Sprint/244 tianshujie 28241
See merge request easycorp/zentaopms!5646
|
2022-09-30 05:21:40 +00:00 |
|
|
李玉春
|
6823f93bf6
|
Merge branch 'cyy_28201' into 'master'
* Fix bug #28201.
See merge request easycorp/zentaopms!5638
|
2022-09-30 05:21:27 +00:00 |
|
|
dingyongliang
|
6cbce4d471
|
* fix danger label overlay.
|
2022-09-30 05:20:38 +00:00 |
|
|
dingyongliang
|
5867221abe
|
* fix btns overlap.
|
2022-09-30 05:20:38 +00:00 |
|
|
dingyongliang
|
359809361a
|
* add limit for btn color.
|
2022-09-30 05:20:38 +00:00 |
|
|
dingyongliang
|
768f91b1f5
|
* task #70022, optimize program style.
|
2022-09-30 05:20:38 +00:00 |
|
|
曹延义
|
29781b82c7
|
* Modify tips style.
|
2022-09-30 13:19:41 +08:00 |
|
|
tianshujie
|
e43a0cfab7
|
* Finish task #70505.
|
2022-09-30 13:14:34 +08:00 |
|