 liumengyi
|
d9e4aaf940
|
* Fix bug #24206.
|
2022-06-23 14:39:27 +08:00 |
|
|
wangyidong
|
439f555e45
|
Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms
|
2022-06-23 14:23:43 +08:00 |
|
|
wangyidong
|
31f53a6953
|
Merge branch 'sgm_upgrade'
|
2022-06-23 14:22:15 +08:00 |
|
|
王怡栋
|
88427c47a9
|
Merge branch 'sgm_details' into 'master'
* Code for code error.
See merge request easycorp/zentaopms!4102
|
2022-06-23 06:20:57 +00:00 |
|
|
孙广明
|
e0fa7f1ea2
|
Merge branch 'liyuchun_language' into 'master'
* Add language.
See merge request easycorp/zentaopms!4101
|
2022-06-23 06:20:07 +00:00 |
|
|
孙广明
|
9bedfb86e4
|
* Add comment.
|
2022-06-23 14:19:05 +08:00 |
|
|
孙广明
|
6d88c0c22b
|
* Code for code error.
|
2022-06-23 14:16:01 +08:00 |
|
|
王怡栋
|
6c6e76f136
|
Merge branch 'sprint/206_liumengyi_24179' into 'master'
* Fix bug #24179.
See merge request easycorp/zentaopms!4100
|
2022-06-23 05:49:34 +00:00 |
|
|
王怡栋
|
85cbbc79bd
|
Merge branch 'sprint/206_liumengyi_fixissue' into 'master'
* Fix issue #682, #683.
See merge request easycorp/zentaopms!4098
|
2022-06-23 05:49:02 +00:00 |
|
|
王怡栋
|
6b99fe2afe
|
Merge branch 'sprint/206_liumengyi_fixbug' into 'master'
* Fix bug for doc search flipping.
See merge request easycorp/zentaopms!4095
|
2022-06-23 05:48:09 +00:00 |
|
|
孙广明
|
a2b913d05f
|
* Add upgrade logic.
|
2022-06-23 13:33:25 +08:00 |
|
|
liyuchun
|
5355c2cc98
|
* Add language.
|
2022-06-23 05:30:58 +00:00 |
|
|
孙广明
|
33dd17eb8a
|
Merge branch 'sprint/207_mayue_bug#23765' into 'master'
Sprint/207 mayue bug#23765
See merge request easycorp/zentaopms!4094
|
2022-06-23 05:30:16 +00:00 |
|
|
mayue
|
243392a075
|
* Optimize code.
|
2022-06-23 13:27:22 +08:00 |
|
|
liumengyi
|
46bbcc74f4
|
* Fix bug #24179.
|
2022-06-23 13:24:00 +08:00 |
|
|
朱金勇
|
a53e503dc2
|
Merge branch 'sprint/sunhao/task57850' into 'master'
* task #57850, fix selected options not show in picker.
See merge request easycorp/zentaopms!4099
|
2022-06-23 05:23:28 +00:00 |
|
|
Hao Sun
|
d4e1f8a835
|
* task #57850, fix selected options not show in picker.
|
2022-06-23 05:18:52 +00:00 |
|
|
liumengyi
|
48948cd563
|
* Fix issue #683.
|
2022-06-23 13:09:36 +08:00 |
|
|
liumengyi
|
0400a2628a
|
* Fix issue 682.
|
2022-06-23 13:09:10 +08:00 |
|
|
wangyidong
|
26a4381109
|
Merge branch 'sgm_prjadmin'
|
2022-06-23 13:01:04 +08:00 |
|
|
王怡栋
|
748f1ffedf
|
Merge branch 'master' into 'sgm_prjadmin'
# Conflicts:
# db/update17.1.sql
|
2022-06-23 05:00:48 +00:00 |
|
|
孙广明
|
65a162536a
|
* Fix details.
|
2022-06-23 11:27:55 +08:00 |
|
|
wangyidong
|
e77cf47434
|
Merge branch 'sgm_kanbanwip'
|
2022-06-23 11:24:07 +08:00 |
|
|
王怡栋
|
e6f8af9c13
|
Merge branch 'master' into 'sgm_kanbanwip'
# Conflicts:
# db/update17.1.sql
|
2022-06-23 03:23:53 +00:00 |
|
|
孙广明
|
3eb9719ad2
|
* Finish task #58241.
|
2022-06-23 11:16:55 +08:00 |
|
|
liumengyi
|
6f93912640
|
* Fix bug for doc search flipping.
|
2022-06-23 10:55:13 +08:00 |
|
|
孙广明
|
d710725155
|
* Add set wip.
|
2022-06-23 10:00:48 +08:00 |
|
|
孙广明
|
2cc17fa503
|
Merge branch 'sprint205_leiyong_feishu_v2' into 'master'
* Fix bug#24031.
See merge request easycorp/zentaopms!4087
|
2022-06-23 01:59:06 +00:00 |
|
|
孙广明
|
74182ed277
|
Merge branch 'sprint207_zg_57907' into 'master'
* Code for task#57907
See merge request easycorp/zentaopms!4089
|
2022-06-23 01:58:52 +00:00 |
|
|
mayue
|
3591596462
|
* Optimize code.
|
2022-06-23 09:58:19 +08:00 |
|
|
王怡栋
|
b5bcb3c90b
|
Merge branch 'sprint/206_liumengyi_fixbug' into 'master'
Sprint/206 liumengyi fixbug
See merge request easycorp/zentaopms!4093
|
2022-06-23 01:54:14 +00:00 |
|
|
liumengyi
|
a57ab674d9
|
* Fix bug.
|
2022-06-23 09:52:10 +08:00 |
|
|
liumengyi
|
67f88f0177
|
* Fix bug.
|
2022-06-23 09:50:44 +08:00 |
|
|
wangyidong
|
067a594067
|
Merge branch 'sprint/206_liumengyi_58288'
|
2022-06-23 09:47:00 +08:00 |
|
|
王怡栋
|
77d1ab4daf
|
Merge branch 'master' into 'sprint/206_liumengyi_58288'
# Conflicts:
# db/update17.1.sql
|
2022-06-23 01:46:35 +00:00 |
|
|
孙广明
|
458688e636
|
* Code for project admin.
|
2022-06-23 09:46:34 +08:00 |
|
|
tianshujie
|
413248e27d
|
Merge branch 'sprint/206_liumengyi_58288' of https://gitlab.zcorp.cc/easycorp/zentaopms into liu
|
2022-06-23 09:42:58 +08:00 |
|
|
王怡栋
|
735bc3dc09
|
Merge branch 'fixbug' into 'master'
* Fix bug #24177.
See merge request easycorp/zentaopms!4092
|
2022-06-23 01:42:57 +00:00 |
|
|
tianshujie
|
31f920d59f
|
* Modify the indentation.
|
2022-06-23 09:42:26 +08:00 |
|
|
tanghucheng
|
4d8da5eeb1
|
* Fix bug #24177.
|
2022-06-23 09:40:19 +08:00 |
|
|
liumengyi
|
c26c9dc110
|
* Optimize code for task #58288.
|
2022-06-23 09:39:29 +08:00 |
|
|
王怡栋
|
022110478d
|
Merge branch 'sprint/master_zhouxudong_fixbug' into 'master'
* Fix bug.
See merge request easycorp/zentaopms!4091
|
2022-06-23 01:37:05 +00:00 |
|
|
mayue
|
1e8049788d
|
* Optimize code.
|
2022-06-23 09:35:54 +08:00 |
|
|
zhouxudong
|
74808b486e
|
* Fix bug.
|
2022-06-23 01:33:32 +00:00 |
|
|
孙广明
|
8cee2b2ff8
|
Merge branch 'fixbug_search' into 'master'
fixbug_search
See merge request easycorp/zentaopms!4090
|
2022-06-23 01:29:23 +00:00 |
|
|
zenggang
|
f5071a43eb
|
* Code for task#57907
|
2022-06-23 01:26:21 +00:00 |
|
|
sunjun
|
14de888e17
|
fixbug_search
|
2022-06-23 01:17:33 +00:00 |
|
|
leiyong
|
f1d9e3375f
|
* Fix bug#24031.
|
2022-06-23 01:16:26 +00:00 |
|
|
孙广明
|
1ce9112928
|
Merge branch 'liyuchun_57658'
|
2022-06-23 09:14:54 +08:00 |
|
|
孙广明
|
124701de98
|
Merge branch 'master' into 'liyuchun_57658'
# Conflicts:
# module/repo/control.php
|
2022-06-23 01:14:27 +00:00 |
|