 caoyanyi
|
46085e314d
|
* Modify client picture.
|
2022-12-19 10:08:35 +08:00 |
|
|
caoyanyi
|
c7c37f1db0
|
* Finish task #79628.
|
2022-12-19 10:03:35 +08:00 |
|
|
caoyanyi
|
1748e9a48c
|
Merge branch 'master' into sprint/272_tianshujie
|
2022-12-16 13:39:04 +08:00 |
|
|
wangzemei
|
3eddaf8808
|
* theme: update zui theme
|
2022-12-16 13:11:47 +08:00 |
|
|
孙广明
|
9d4bd9d8e1
|
Merge branch 'bugfix/liwenrui/zentaobottasks' into 'master'
* fix bot error handling.
See merge request easycorp/zentaopms!6574
|
2022-12-16 05:11:23 +00:00 |
|
|
孙广明
|
6036606f6e
|
Merge branch 'master_xieqiyu_30866' into 'master'
* Fix bug#30866.
See merge request easycorp/zentaopms!6572
|
2022-12-16 05:07:06 +00:00 |
|
|
孙广明
|
294ab34e83
|
Merge branch 'sprint/zentaopms271_lanzongjun' into 'master'
* Fix Bug product release show error #30883
See merge request easycorp/zentaopms!6573
|
2022-12-16 05:06:52 +00:00 |
|
|
孙广明
|
dc33dd6283
|
Merge branch 'master_xieqiyu_30891' into 'master'
* Fix bug#30891.
See merge request easycorp/zentaopms!6576
|
2022-12-16 05:06:37 +00:00 |
|
|
孙广明
|
9a6929062a
|
* Fix bug #30882.
|
2022-12-16 11:12:40 +08:00 |
|
|
xieqiyu
|
f17dbd2c68
|
* Fix bug#30861.
|
2022-12-16 11:01:03 +08:00 |
|
|
lanzongjun
|
8e7afd50c9
|
* Fix Bug #30883
|
2022-12-16 11:00:36 +08:00 |
|
|
田淑杰
|
38f1576937
|
* Finish task #79626.
|
2022-12-16 10:41:52 +08:00 |
|
|
xieqiyu
|
dc425fd923
|
* Fix bug#30891.
|
2022-12-16 10:36:40 +08:00 |
|
|
孙广明
|
8649716ad4
|
* Fix bug #30916.
|
2022-12-16 10:30:46 +08:00 |
|
|
Wenrui LI
|
7d8e0d43ac
|
* handle incorrect api response for now.
|
2022-12-16 10:18:13 +08:00 |
|
|
Wenrui LI
|
8d6014d0be
|
* fix bot error handling.
|
2022-12-16 09:57:52 +08:00 |
|
|
lanzongjun
|
09ccb1ebd7
|
* Fix Bug product release show error
|
2022-12-16 09:44:55 +08:00 |
|
|
田淑杰
|
5b8d6f92d9
|
Merge branch 'sprint/272' of https://gitlab.zcorp.cc/easycorp/zentaopms into sprint/272_tianshujie
|
2022-12-16 08:40:13 +08:00 |
|
|
xieqiyu
|
0fb96ef566
|
* Fix bug#30866.
|
2022-12-15 17:04:03 +08:00 |
|
|
王怡栋
|
fbe78108a5
|
Merge branch 'sprint/wangzemei/project' into 'master'
* project/manageMembers: optimize the style of the picker
See merge request easycorp/zentaopms!6571
|
2022-12-15 08:50:27 +00:00 |
|
|
wangzemei
|
e596b31431
|
* project/manageMembers: optimize the style of the picker
|
2022-12-15 16:41:34 +08:00 |
|
|
朱金勇
|
b04e7295f1
|
Merge branch 'sprint/sunhao/update_kindeditor' into 'master'
* update kindeditor files.
See merge request easycorp/zentaopms!6551
|
2022-12-15 08:36:28 +00:00 |
|
|
王怡栋
|
2225fa3632
|
Merge branch 'zentaopms_bug_#30911' into 'master'
* Fix bug #30911.
See merge request easycorp/zentaopms!6566
|
2022-12-15 08:27:11 +00:00 |
|
|
王怡栋
|
b9828faff2
|
Merge branch 'bugfix/liwenrui/clientalert' into 'master'
* fix unable to alert and confirm in zentaoclient.
See merge request easycorp/zentaopms!6563
|
2022-12-15 08:26:58 +00:00 |
|
|
孙广明
|
1222fd65f0
|
Merge branch 'sprint/hufangzhou_xuancommit' into 'master'
* Adjust the xuanxuan commit.
See merge request easycorp/zentaopms!6570
|
2022-12-15 08:22:23 +00:00 |
|
|
hufangzhou
|
5b13b13d43
|
* Adjust the xuanxuan commit.
|
2022-12-15 08:21:11 +00:00 |
|
|
孙广明
|
c893ac76d8
|
Merge branch 'master_liuhong_30907' into 'master'
Master liuhong 30907
See merge request easycorp/zentaopms!6567
|
2022-12-15 08:20:12 +00:00 |
|
|
孙广明
|
7ab740a26b
|
Merge branch 'master_xieqiyu_30901' into 'master'
* Fix bug#30901.
See merge request easycorp/zentaopms!6568
|
2022-12-15 08:20:01 +00:00 |
|
|
孙广明
|
d72556fdb4
|
Merge branch 'sprint/scx_taskestimateapi' into 'master'
* Support pms effort.
See merge request easycorp/zentaopms!6569
|
2022-12-15 08:19:54 +00:00 |
|
|
xieqiyu
|
5c34348cd9
|
* Fix bug#30901.
|
2022-12-15 16:18:18 +08:00 |
|
|
liuhong
|
cc631b6e4f
|
* Adjust code #30907.
|
2022-12-15 08:15:03 +00:00 |
|
|
liuhong
|
a08eff199f
|
* Fix bug #30907.
|
2022-12-15 08:12:15 +00:00 |
|
|
daitingting
|
d241f76e49
|
* Fix bug #30911.
|
2022-12-15 08:10:58 +00:00 |
|
|
孙广明
|
47817d9153
|
Merge branch 'sprint/zentaopms271_lanzongjun' into 'master'
* Fix Bug #30879
See merge request easycorp/zentaopms!6565
|
2022-12-15 08:10:30 +00:00 |
|
|
lanzongjun
|
9d0a087132
|
* Fix Bug #30879
|
2022-12-15 16:09:01 +08:00 |
|
|
孙广明
|
b827ae2002
|
Merge branch 'sprint/zentaopms271_lanzongjun' into 'master'
* fix bug #30796#30765#79453#30886#30909
See merge request easycorp/zentaopms!6549
|
2022-12-15 07:58:29 +00:00 |
|
|
孙广明
|
2bcd6ed191
|
Merge branch 'master_xieqiyu_30844' into 'master'
* Fix bug#30844.
See merge request easycorp/zentaopms!6553
|
2022-12-15 07:57:10 +00:00 |
|
|
lanzongjun
|
a8551febe5
|
* Fix Bug #30909
|
2022-12-15 15:54:33 +08:00 |
|
|
孙广明
|
7bb5217ea9
|
Merge branch 'master_xieqiyu_79440' into 'master'
* Code for task#79440.
See merge request easycorp/zentaopms!6556
|
2022-12-15 07:53:13 +00:00 |
|
|
孙广明
|
bb418ee465
|
Merge branch 'sprint/fixbug_liumengyi_30896' into 'master'
* Fix bug #30896.
See merge request easycorp/zentaopms!6558
|
2022-12-15 07:52:58 +00:00 |
|
|
孙广明
|
2dd370e821
|
Merge branch 'master_xieqiyu_79444' into 'master'
* Code for task#79444.
See merge request easycorp/zentaopms!6560
|
2022-12-15 07:50:27 +00:00 |
|
|
孙广明
|
e173f7e3bf
|
Merge branch 'master_liuhong_30897' into 'master'
* Fix bug #30897.
See merge request easycorp/zentaopms!6561
|
2022-12-15 07:49:58 +00:00 |
|
|
孙广明
|
53c2ae7089
|
Merge branch 'master_xieqiyu_30803' into 'master'
* Fix bug#30803.
See merge request easycorp/zentaopms!6562
|
2022-12-15 07:49:22 +00:00 |
|
|
孙广明
|
a788dedd50
|
* Fix bug #30916.
|
2022-12-15 15:46:34 +08:00 |
|
|
宋辰轩
|
12c0a5ddcc
|
* Support pms effort.
|
2022-12-15 15:44:59 +08:00 |
|
|
孙广明
|
2a2ea5e9b0
|
* Remove unused code.
|
2022-12-15 15:33:15 +08:00 |
|
|
孙广明
|
4acb2e69ec
|
* Fix bug #30658.
|
2022-12-15 15:17:10 +08:00 |
|
|
Wenrui LI
|
ca0cbffb0b
|
* fix unable to alert and confirm in zentaoclient.
|
2022-12-15 15:17:08 +08:00 |
|
|
xieqiyu
|
e6d364c246
|
* Fix bug#30803.
|
2022-12-15 15:12:24 +08:00 |
|
|
王怡栋
|
6fe7f03e7e
|
Merge branch 'feedback_1576' into 'master'
* Resolve feedback#1576
See merge request easycorp/zentaopms!6530
|
2022-12-15 06:53:08 +00:00 |
|