 王怡栋
|
63fb16c7e4
|
Merge branch 'sprint/tsj_fixbug' into 'master'
* Fix bug #23550.
See merge request easycorp/zentaopms!6896
|
2023-02-09 02:55:40 +00:00 |
|
|
tianshujie
|
88d990875b
|
* Fix bug #23550.
|
2023-02-09 10:50:40 +08:00 |
|
|
王怡栋
|
436f7a3313
|
Merge branch 'ticket_326' into 'master'
code for Ticket 326 bug 31981
See merge request easycorp/zentaopms!6891
|
2023-02-08 09:17:24 +00:00 |
|
|
wangyidong
|
bc4c940d20
|
Merge branch 'zentaopms_wangyuting'
|
2023-02-08 16:30:30 +08:00 |
|
|
王怡栋
|
9331b9856a
|
Merge branch 'master' into 'zentaopms_wangyuting'
# Conflicts:
# module/programplan/view/gantt.html.php
|
2023-02-08 08:30:14 +00:00 |
|
|
王怡栋
|
26e6c3cdb3
|
Merge branch 'master_xieqiyu_29159' into 'master'
* Code for bug#29159.
See merge request easycorp/zentaopms!6890
|
2023-02-08 08:29:30 +00:00 |
|
|
王怡栋
|
2a6360f45f
|
Merge branch 'ticket_329' into 'master'
Ticket 329
See merge request easycorp/zentaopms!6886
|
2023-02-08 08:28:54 +00:00 |
|
|
王怡栋
|
6cc3863a63
|
Merge branch 'fixbug_tanghucheng' into 'master'
* Fix bug for import testcase.
See merge request easycorp/zentaopms!6884
|
2023-02-08 08:28:23 +00:00 |
|
|
王怡栋
|
3d032b1cf6
|
Merge branch 'bug_31963' into 'master'
* Fix bug#31963
See merge request easycorp/zentaopms!6883
|
2023-02-08 08:28:00 +00:00 |
|
|
王怡栋
|
054c55b38d
|
Merge branch 'sprint/hufangzhou_284_changelog' into 'master'
* Complete changelog.
See merge request easycorp/zentaopms!6882
|
2023-02-08 08:27:48 +00:00 |
|
|
liuhong
|
534b5e6471
|
* Adjust code for ticket #326
|
2023-02-08 08:25:27 +00:00 |
|
|
wangyuting2
|
ab16894c06
|
* Optimize page css.
|
2023-02-08 16:17:16 +08:00 |
|
|
xieqiyu
|
e00862dd0c
|
* Code for bug#29159.
|
2023-02-08 16:16:33 +08:00 |
|
|
wangyuting2
|
afaa89f8fd
|
* Fix bug #27242.
|
2023-02-08 16:03:35 +08:00 |
|
|
Yagami
|
c2724b9f57
|
Merge branch 'zentaopms_281'
|
2023-02-08 15:31:13 +08:00 |
|
|
孙广明
|
5611c2c285
|
Merge branch 'zenops_61' into 'master'
* Add show/hide password.
See merge request easycorp/zentaopms!6888
|
2023-02-08 07:14:32 +00:00 |
|
|
liuhong
|
ffd0c2ce7f
|
* Adjust for ticket 326.
|
2023-02-08 06:58:27 +00:00 |
|
|
zenggang
|
8a645d03ae
|
* Fix bug#31963
|
2023-02-08 05:55:45 +00:00 |
|
|
tanghucheng
|
3e70f86ca2
|
* Fix bug for import testcase.
|
2023-02-08 13:55:25 +08:00 |
|
|
liuhong
|
e16cf8278c
|
* Resolved feedback #1855
|
2023-02-08 05:26:58 +00:00 |
|
|
hufangzhou
|
1546a7da88
|
* Complete changelog.
|
2023-02-08 13:16:39 +08:00 |
|
|
孙广明
|
99446cf8d3
|
Merge branch 'zhouxin_feedback_313' into 'master'
* Resolve feedback #313.
See merge request easycorp/zentaopms!6861
|
2023-02-08 03:23:03 +00:00 |
|
|
zhaoke
|
37ae4b9af5
|
* Add show/hide password.
|
2023-02-08 03:07:09 +00:00 |
|
|
王怡栋
|
1a75e7b690
|
Merge branch 'sprint/hufangzhou_181_package' into 'master'
* Add the new version.
See merge request easycorp/zentaopms!6879
|
2023-02-08 02:49:54 +00:00 |
|
|
hufangzhou
|
025aa5dc4b
|
* Add the new version.
|
2023-02-08 02:44:44 +00:00 |
|
|
liuhong
|
7342444023
|
* Adjust code for 329.
|
2023-02-08 02:24:05 +00:00 |
|
|
王怡栋
|
552222709a
|
Merge branch 'zentaopms_wangyuting' into 'master'
* Fix bug #24872.
See merge request easycorp/zentaopms!6877
|
2023-02-08 02:22:50 +00:00 |
|
|
王怡栋
|
1148adad0c
|
Merge branch 'dev/gfl_add_class_admin-tab-menu' into 'master'
* Code for add class admin-tab-menu
See merge request easycorp/zentaopms!6878
|
2023-02-08 02:22:24 +00:00 |
|
|
wangyuting2
|
2328bcb922
|
* Fix bug #24872.
|
2023-02-08 10:15:27 +08:00 |
|
|
liuhong
|
bf85280dcd
|
* Adjust code for 329.
|
2023-02-08 02:07:02 +00:00 |
|
|
guofeilong
|
08b62c3108
|
* Code for add class admin-tab-menu
|
2023-02-08 10:03:56 +08:00 |
|
|
王怡栋
|
fd92f0e6ae
|
Merge branch 'zenops_61' into 'master'
Zenops 61
See merge request easycorp/zentaopms!6876
|
2023-02-08 01:55:38 +00:00 |
|
|
王怡栋
|
b8b5a62427
|
Merge branch 'zentaopms_wangyuting' into 'master'
* Fix bug #24665.
See merge request easycorp/zentaopms!6875
|
2023-02-08 01:53:25 +00:00 |
|
|
王怡栋
|
9ee0326acf
|
Merge branch 'master_xieqiyu_31949' into 'master'
Master xieqiyu 31949
See merge request easycorp/zentaopms!6873
|
2023-02-08 01:52:56 +00:00 |
|
|
wangyuting2
|
3915c2c1d1
|
* Fix bug #24665.
|
2023-02-08 09:39:28 +08:00 |
|
|
zhouxin
|
26abc21883
|
* Adjust code.
|
2023-02-08 09:26:12 +08:00 |
|
|
xieqiyu
|
975b755c54
|
* Code for bug#31949.
|
2023-02-08 08:48:09 +08:00 |
|
|
xieqiyu
|
bfe1a0ef5e
|
* Code for bug#31949.
|
2023-02-08 08:37:38 +08:00 |
|
|
liuhong
|
5156963cec
|
* Adjust code for 329.
|
2023-02-07 07:23:34 +00:00 |
|
|
王怡栋
|
1bd84b68c7
|
Merge branch 'bugfix/liwenrui/chatavatarpermission' into 'master'
修复禅道客户端中上传群头像功能可能无权使用的问题
See merge request easycorp/zentaopms!6871
|
2023-02-07 06:56:40 +00:00 |
|
|
王怡栋
|
a1aa283d77
|
Merge branch 'master_xieqiyu_31948' into 'master'
* Code for bug#31948.
See merge request easycorp/zentaopms!6872
|
2023-02-07 06:56:13 +00:00 |
|
|
王怡栋
|
a3580b9526
|
Merge branch 'dev/gfl_task_#83732' into 'master'
Dev/gfl task #83732
See merge request easycorp/zentaopms!6870
|
2023-02-07 06:53:05 +00:00 |
|
|
xieqiyu
|
e260ad29a0
|
* Code for bug#31948.
|
2023-02-07 14:43:20 +08:00 |
|
|
Wenrui LI
|
8cdf9aad53
|
* add missing permission for chat avatar upload.
|
2023-02-07 14:41:53 +08:00 |
|
|
guofeilong
|
f3bff30d3a
|
* Code for update theme css in zui.
|
2023-02-07 14:18:57 +08:00 |
|
|
guofeilong
|
c66b3dd489
|
* Code for update zui.css
|
2023-02-07 14:07:44 +08:00 |
|
|
王怡栋
|
64a0c67f38
|
Merge branch 'ticket_330' into 'master'
Ticket 330
See merge request easycorp/zentaopms!6866
|
2023-02-07 03:09:06 +00:00 |
|
|
王怡栋
|
d98c613ff6
|
Merge branch 'ticket_325' into 'master'
* Adjuct code for feedback #1836.
See merge request easycorp/zentaopms!6867
|
2023-02-07 03:08:48 +00:00 |
|
|
王怡栋
|
45d1ee9054
|
Merge branch 'zentaopms_wangyuting' into 'master'
* Fix webhook content is markdown bug.
See merge request easycorp/zentaopms!6868
|
2023-02-07 03:08:09 +00:00 |
|
|
王怡栋
|
388ae5dae0
|
Merge branch 'dev/gfl_task_#83732' into 'master'
* Code for task #83732
See merge request easycorp/zentaopms!6869
|
2023-02-07 03:07:52 +00:00 |
|