 王怡栋
|
7c60199c84
|
Merge branch 'master_xieqiyu_56919' into 'master'
* Finish task#56919.
See merge request easycorp/zentaopms!3914
|
2022-06-14 08:21:41 +00:00 |
|
|
王怡栋
|
1c98c75274
|
Merge branch 'sgm_fixbug' into 'master'
* Fix bug #23680.
See merge request easycorp/zentaopms!3915
|
2022-06-14 08:20:57 +00:00 |
|
|
孙广明
|
e31b570be2
|
* Fix bug #23680.
|
2022-06-14 16:18:34 +08:00 |
|
|
zhujinyong
|
d4a23c5d00
|
Merge branch 'sprint/sunhao/task56924'
|
2022-06-14 16:03:23 +08:00 |
|
|
xieqiyu
|
c03d486fab
|
* Finish task#56919.
|
2022-06-14 15:55:48 +08:00 |
|
|
王怡栋
|
ee4ce60394
|
Merge branch 'sprint/204_liumengyi_23648' into 'master'
* Fix bug #23648.
See merge request easycorp/zentaopms!3912
|
2022-06-14 07:26:14 +00:00 |
|
|
王怡栋
|
71fb547445
|
Merge branch 'master_xieqiyu_56922' into 'master'
* Finish task#56922.
See merge request easycorp/zentaopms!3910
|
2022-06-14 07:19:42 +00:00 |
|
|
王怡栋
|
dce5aa0a23
|
Merge branch 'sprint/master_zhouxudong_56915' into 'master'
Sprint/master zhouxudong 56915
See merge request easycorp/zentaopms!3909
|
2022-06-14 07:18:50 +00:00 |
|
|
liumengyi
|
5ad98df2ca
|
* Fix bug #23648.
|
2022-06-14 15:17:57 +08:00 |
|
|
王怡栋
|
fd8c9b0f9a
|
Merge branch 'sprint/master_tanghucheng' into 'master'
* Finish story #33374.
See merge request easycorp/zentaopms!3911
|
2022-06-14 07:14:07 +00:00 |
|
|
tanghucheng
|
1f1b79948a
|
* Finish story #33374.
|
2022-06-14 15:03:36 +08:00 |
|
|
xieqiyu
|
38dad8467f
|
* Finish task#56922.
|
2022-06-14 15:00:08 +08:00 |
|
|
孙广明
|
dbb1ccc413
|
Merge branch 'sprint/203_zg_56558' into 'master'
* Finish task#56558
See merge request easycorp/zentaopms!3892
|
2022-06-14 06:58:39 +00:00 |
|
|
孙广明
|
7d37afcd4f
|
Merge branch 'sprint/203_zg_57156' into 'master'
* Finish task#57156,57159
See merge request easycorp/zentaopms!3905
|
2022-06-14 06:58:22 +00:00 |
|
|
zenggang
|
ea2280da59
|
* Adjust code
|
2022-06-14 06:56:01 +00:00 |
|
|
王怡栋
|
94a84d9463
|
Merge branch 'sprint/204_liumengyi_57090' into 'master'
* Fix bug for task #57090.
See merge request easycorp/zentaopms!3908
|
2022-06-14 06:41:42 +00:00 |
|
|
liumengyi
|
6aaf4f6308
|
* Fix bug for task #57090.
|
2022-06-14 14:39:55 +08:00 |
|
|
zhouxudong
|
1ad55fdd08
|
* Finish task #56915.
|
2022-06-14 06:39:25 +00:00 |
|
|
zenggang
|
18449b6c13
|
* Finish task #57159
|
2022-06-14 06:32:41 +00:00 |
|
|
王怡栋
|
d682c68483
|
Merge branch 'master_xieqiyu_56931' into 'master'
* Finish task#56931.
See merge request easycorp/zentaopms!3906
|
2022-06-14 06:30:53 +00:00 |
|
|
王怡栋
|
a8e7dcf2a3
|
Merge branch 'sprint/204_liumengyi_57090' into 'master'
* Fix bug #23648, #23650, and finish task #57090.
See merge request easycorp/zentaopms!3904
|
2022-06-14 06:29:34 +00:00 |
|
|
王怡栋
|
785d7ff2e2
|
Merge branch 'master_xieqiyu_56913' into 'master'
Master xieqiyu 56913
See merge request easycorp/zentaopms!3903
|
2022-06-14 06:27:37 +00:00 |
|
|
王怡栋
|
fa81f27748
|
Merge branch 'sprint/201_tianshujie_23663' into 'master'
* Fix bug #23663.
See merge request easycorp/zentaopms!3902
|
2022-06-14 06:25:45 +00:00 |
|
|
王怡栋
|
bfc378eba2
|
Merge branch 'master_xieqiyu_56935' into 'master'
* Finish task#56935.
See merge request easycorp/zentaopms!3899
|
2022-06-14 06:24:47 +00:00 |
|
|
王怡栋
|
68cf5cf967
|
Merge branch 'sprint/hufangzhou_ci' into 'master'
* Modify the makefile for gitlab ci.
See merge request easycorp/zentaopms!3895
|
2022-06-14 06:23:58 +00:00 |
|
|
王怡栋
|
f70f0c9f97
|
Merge branch 'sprint/master_zhouxudong_56910' into 'master'
Sprint/master zhouxudong 56910
See merge request easycorp/zentaopms!3898
|
2022-06-14 06:23:20 +00:00 |
|
|
hufangzhou
|
c5aa828a09
|
* Add the git pull command.
|
2022-06-14 14:21:56 +08:00 |
|
|
hufangzhou
|
ad41c62797
|
* Add the xuanxuan web.
|
2022-06-14 14:13:37 +08:00 |
|
|
xieqiyu
|
8814f0f6dd
|
* Finish task#56931.
|
2022-06-14 14:12:57 +08:00 |
|
|
Hao Sun
|
2f234eef8f
|
* task #56924, optimize style for checkboxes and radioes.
|
2022-06-14 06:12:42 +00:00 |
|
|
zenggang
|
cc49cbe439
|
* Finish task#57156
|
2022-06-14 06:03:55 +00:00 |
|
|
liumengyi
|
d1a44ab424
|
* Finish task #57090.
|
2022-06-14 13:58:18 +08:00 |
|
|
liumengyi
|
2d4f3be98a
|
* Finish task #57090.
|
2022-06-14 13:56:38 +08:00 |
|
|
tianshujie
|
1eda1081d1
|
* Fix bug #23663.
|
2022-06-14 13:49:07 +08:00 |
|
|
liumengyi
|
347fcb16c7
|
* Fix bug #23648, #23650.
|
2022-06-14 13:47:33 +08:00 |
|
|
tianshujie
|
ed2664f731
|
* Fix bug #23663.
|
2022-06-14 13:46:38 +08:00 |
|
|
hufangzhou
|
ffffeeb6ec
|
* Temporarily fix environment variables for gitlab ci.
|
2022-06-14 13:46:05 +08:00 |
|
|
xieqiyu
|
a384279f28
|
* Finish task#56911.
|
2022-06-14 13:45:45 +08:00 |
|
|
朱金勇
|
4d960b1ff3
|
Merge branch 'sprint/sunhao/kanban' into 'master'
* update kanban lib, fix option "sortable" not work sometimes.
See merge request easycorp/zentaopms!3901
|
2022-06-14 05:45:25 +00:00 |
|
|
hufangzhou
|
50877d82a9
|
* Change the xuan repo path to /home/gitlab-runner.
|
2022-06-14 13:39:29 +08:00 |
|
|
孙广明
|
0397a7b0b5
|
Merge branch 'sprint/203_mayue_bug#23410' into 'master'
* Fix bug #23410.
See merge request easycorp/zentaopms!3897
|
2022-06-14 05:35:39 +00:00 |
|
|
xieqiyu
|
030d826624
|
* Finish task#56912.
|
2022-06-14 13:34:49 +08:00 |
|
|
xieqiyu
|
d343298490
|
* Finish task#56913.
|
2022-06-14 13:28:42 +08:00 |
|
|
王怡栋
|
f5788a4535
|
Merge branch 'sprint/204_tianshujie_57098' into 'master'
Sprint/204 tianshujie 57098
See merge request easycorp/zentaopms!3900
|
2022-06-14 05:28:03 +00:00 |
|
|
Hao Sun
|
bb0d1e58c2
|
* update kanban lib, fix option "sortable" not work sometimes.
|
2022-06-14 05:23:54 +00:00 |
|
|
tianshujie
|
3d9012cfca
|
* Finish task #57098.
|
2022-06-14 13:18:52 +08:00 |
|
|
xieqiyu
|
254dbf58e5
|
* Finish task#56935.
|
2022-06-14 13:10:19 +08:00 |
|
|
hufangzhou
|
ca6eb3fcc5
|
* Simplified code.
|
2022-06-14 12:33:38 +08:00 |
|
|
mayue
|
a70fd10f87
|
* Fix bug #23410.
|
2022-06-14 11:17:25 +08:00 |
|
|
zhouxudong
|
50571ec217
|
* Finish task #56915.
|
2022-06-14 03:13:14 +00:00 |
|