 朱金勇
|
67ecc5f8c8
|
Merge branch 'sprint/178_songchenxuan_46099' into 'master'
*Finish task #46099.
See merge request easycorp/zentaopms!974
|
2021-12-17 07:40:10 +00:00 |
|
|
朱金勇
|
d8852453dc
|
Merge branch 'sprint/xuan_sunhao/adjust_card_style' into 'master'
* Optimize style for cards in client.
See merge request easycorp/zentaopms!985
|
2021-12-17 07:39:30 +00:00 |
|
|
Hao Sun
|
fd3a645a30
|
* Optimize style for cards in client.
|
2021-12-17 14:11:50 +08:00 |
|
|
朱金勇
|
3381dd3ab0
|
Merge branch 'sprint/xuan_sunhao/adjust_card_style' into 'master'
* Adjust url card style in client.
See merge request easycorp/zentaopms!981
|
2021-12-17 06:10:26 +00:00 |
|
|
Hao Sun
|
858894a72b
|
* Fix error when load page in client card.
|
2021-12-17 13:59:53 +08:00 |
|
|
songchenxuan
|
59bbd18c55
|
*Finish task #46099.
|
2021-12-17 13:58:31 +08:00 |
|
|
songchenxuan
|
63479860a5
|
*Finish task #46099.
|
2021-12-17 13:56:24 +08:00 |
|
|
zhujinyong
|
dc4eb9867b
|
* Fix problems of mr.
|
2021-12-17 13:37:16 +08:00 |
|
|
zhujinyong
|
3be21de66c
|
Merge branch 'sprint/178_mayue_17015'
|
2021-12-17 13:35:35 +08:00 |
|
|
朱金勇
|
12093a5dce
|
Merge branch 'master' into 'sprint/178_mayue_17015'
# Conflicts:
# module/product/control.php
|
2021-12-17 05:34:25 +00:00 |
|
|
Hao Sun
|
44921262ff
|
* Adjust url card style in client.
|
2021-12-17 11:33:13 +08:00 |
|
|
李玉春
|
43d07b8cd0
|
Merge branch 'sgm_projectpriv' into 'master'
* Reset project priv.
See merge request easycorp/zentaopms!979
|
2021-12-17 03:03:39 +00:00 |
|
|
zhujinyong
|
10dfc32924
|
Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms
|
2021-12-17 10:24:23 +08:00 |
|
|
zhujinyong
|
de2e4be174
|
* Fix test.
|
2021-12-17 10:23:57 +08:00 |
|
|
孙广明
|
6ee1345b07
|
* Reset project priv.
|
2021-12-17 10:13:49 +08:00 |
|
|
朱金勇
|
54651928cf
|
Merge branch 'sprint/xuan_sunhao/improve_client_ui' into 'master'
* Task #45453, improve UI for opening in xuan client.
See merge request easycorp/zentaopms!969
|
2021-12-16 05:06:35 +00:00 |
|
|
Hao Sun
|
8bf3c8e6e1
|
* Adjust navbar position in client.
|
2021-12-16 12:02:33 +08:00 |
|
|
Hao Sun
|
348e44a00e
|
* Adjust navbar position in client.
|
2021-12-16 11:41:12 +08:00 |
|
|
Hao Sun
|
42599b5d8a
|
* Fix text color in app header in client.
|
2021-12-16 11:16:53 +08:00 |
|
|
Hao Sun
|
697b314cc0
|
* Improve UI for opening in xuan client.
|
2021-12-16 10:53:05 +08:00 |
|
|
mayue
|
65bcac3b67
|
* Optimized code.
|
2021-12-16 09:07:51 +08:00 |
|
|
songchenxuan
|
fb8793f1d3
|
*Finish task #46099.
|
2021-12-15 17:29:31 +08:00 |
|
|
mayue
|
4adf6e0a52
|
* Fix bug #17015.
|
2021-12-15 17:17:57 +08:00 |
|
|
李玉春
|
898f65f84b
|
Merge branch 'sgm_fixbug' into 'master'
* Fix bug.
See merge request easycorp/zentaopms!956
|
2021-12-15 07:45:07 +00:00 |
|
|
孙广明
|
874b4c6cdd
|
Merge branch 'sprint/master_tanghucheng_17565' into 'master'
* Fix bug #17565.
See merge request easycorp/zentaopms!959
|
2021-12-15 06:56:07 +00:00 |
|
|
tanghucheng
|
8409760490
|
* Fix bug #17565.
|
2021-12-15 14:55:04 +08:00 |
|
|
孙广明
|
04eb385659
|
* Fix bug.
|
2021-12-15 14:34:52 +08:00 |
|
|
朱金勇
|
eba28ffa85
|
Merge branch 'sprint/176_songchenxuan_45535' into 'master'
*Fix task #45535 bug.
See merge request easycorp/zentaopms!944
|
2021-12-15 00:40:22 +00:00 |
|
|
朱金勇
|
b3b60dd4e4
|
Merge branch 'sprint/176_songchenxuan_45545' into 'master'
*Fix task #45545 bug.
See merge request easycorp/zentaopms!941
|
2021-12-15 00:39:56 +00:00 |
|
|
songchenxuan
|
8a014b58f4
|
*Fix task #45535 bug.
|
2021-12-15 08:37:31 +08:00 |
|
|
songchenxuan
|
731c7fb45c
|
*Fix task #45545 bug.
|
2021-12-14 17:33:01 +08:00 |
|
|
朱金勇
|
328379d956
|
Merge branch 'sprint/176_xieqiyu_17516' into 'master'
* Fix bug#17516.
See merge request easycorp/zentaopms!939
|
2021-12-14 09:12:47 +00:00 |
|
|
孙广明
|
2be30ab738
|
Merge branch 'sprint/liyuchun_bug' into 'master'
* Fix bug #17521.
See merge request easycorp/zentaopms!938
|
2021-12-14 09:10:53 +00:00 |
|
|
xieqiyu
|
fde47bebb6
|
* Fix bug#17516.
|
2021-12-14 16:56:59 +08:00 |
|
|
liyuchun
|
df21c2f8bf
|
* Fix bug #17521.
|
2021-12-14 16:56:40 +08:00 |
|
|
朱金勇
|
7a7dd0d6c3
|
Merge branch 'sprint/176_xieqiyu_17503' into 'master'
* Fix bug#17503.
See merge request easycorp/zentaopms!931
|
2021-12-14 07:49:20 +00:00 |
|
|
xieqiyu
|
a978d41365
|
* Code for bug#17503.
|
2021-12-14 15:47:19 +08:00 |
|
|
朱金勇
|
d5d4cfe049
|
Merge branch 'sprint/176_mayue_45544' into 'master'
* Optimize code.
See merge request easycorp/zentaopms!936
|
2021-12-14 07:43:32 +00:00 |
|
|
朱金勇
|
e683c32d25
|
Merge branch 'sprint/177_sunhao/use_rings' into 'master'
* Refactor progress-pie instead of rings to improve perf.
See merge request easycorp/zentaopms!932
|
2021-12-14 07:40:58 +00:00 |
|
|
Hao Sun
|
2f862118d8
|
* Refactor progress-pie instead of rings to improve perf.
|
2021-12-14 14:31:41 +08:00 |
|
|
xieqiyu
|
ed9eedf543
|
* Fix bug#17503.
|
2021-12-14 14:27:26 +08:00 |
|
|
李玉春
|
7f098934f8
|
Merge branch 'devops_mr_unit' into 'master'
* Add mr create unit test and adjust code
See merge request easycorp/zentaopms!919
|
2021-12-14 06:10:24 +00:00 |
|
|
zenggang
|
9c47c36ba3
|
* Adjust code style
|
2021-12-14 06:06:55 +00:00 |
|
|
mayue
|
7deea0d588
|
* Optimize code.
|
2021-12-14 13:42:54 +08:00 |
|
|
朱金勇
|
efdadc07a7
|
Merge branch 'sprint/176_mayue_45544' into 'master'
* Finish a task #45544.
See merge request easycorp/zentaopms!928
|
2021-12-14 05:34:42 +00:00 |
|
|
mayue
|
35a7df0974
|
* Optimize code.
|
2021-12-14 11:02:15 +08:00 |
|
|
mayue
|
ccf82f6226
|
* Modify annotation.
|
2021-12-14 10:18:35 +08:00 |
|
|
朱金勇
|
a14138be45
|
Merge branch 'sprint/176_xieqiyu_17472' into 'master'
* Fix bug#17472.
See merge request easycorp/zentaopms!921
|
2021-12-14 01:54:13 +00:00 |
|
|
mayue
|
77d36b7467
|
* Finish a task #45544.
|
2021-12-14 09:49:46 +08:00 |
|
|
朱金勇
|
26dc3e847d
|
Merge branch 'sprint/176_xieqiyu_17469' into 'master'
* Fix bug#17469.
See merge request easycorp/zentaopms!918
|
2021-12-14 01:48:56 +00:00 |
|