孙广明
|
7dfc7c62fe
|
* Code for approval.
|
2022-05-14 15:14:26 +08:00 |
|
wangyidong
|
8f437f4537
|
* code for bug #22057.
|
2022-04-28 10:32:24 +08:00 |
|
孙广明
|
10496fd993
|
Merge branch 'sprint/master_zhouxudong_16729' into 'master'
* Fix bug from max #16729.
See merge request easycorp/zentaopms!3080
|
2022-04-22 06:55:14 +00:00 |
|
zhouxudong
|
aaffd2788c
|
* Fix bug from max #16729.
|
2022-04-22 13:07:10 +08:00 |
|
zhouxudong
|
5a8089c3fb
|
* Fix bug from max #15833.
|
2022-04-22 09:30:05 +08:00 |
|
王怡栋
|
884c145ce2
|
Merge branch 'fixbug' into 'master'
* Fix bug #21846.
See merge request easycorp/zentaopms!3019
|
2022-04-21 00:44:21 +00:00 |
|
tianshujie
|
0c55baddc6
|
* Fix bug #21858.
|
2022-04-20 10:57:00 +08:00 |
|
tianshujie
|
524a2214ab
|
* Fix the query project name error.
|
2022-04-19 17:04:56 +08:00 |
|
tanghucheng
|
7ea847db02
|
* Fix bug #21846.
|
2022-04-19 15:41:14 +08:00 |
|
xieqiyu
|
eda23f27f1
|
* Fix bug: manage contacts have two chosen.
|
2022-04-15 14:16:07 +08:00 |
|
Zongjun Lan
|
51337cac92
|
* fix bug *15336
|
2022-04-14 11:13:31 +08:00 |
|
李玉春
|
730989ce6c
|
Merge branch 'sunhuawei_fixbug_18309' into 'master'
*Fix bug#18309.
See merge request easycorp/zentaopms!2794
|
2022-04-07 08:39:06 +00:00 |
|
孙华伟
|
3e484e917d
|
Update managecontacts.html.php
|
2022-04-07 08:23:51 +00:00 |
|
孙华伟
|
d351d9bc83
|
Optimize the code.
|
2022-04-07 16:22:52 +08:00 |
|
孙广明
|
af9545b817
|
Merge branch 'sprint/master_fixbug' into 'master'
* Fix bug #21403,21474,21410,21414,21417.
See merge request easycorp/zentaopms!2756
|
2022-04-07 07:57:51 +00:00 |
|
tanghucheng
|
3d3ffe9348
|
* Fix bug #21403,21474,21410,21414,21417,21456.
|
2022-04-07 15:27:54 +08:00 |
|
孙华伟
|
cb159d5aee
|
*Fix bug#18309.
|
2022-04-07 15:22:54 +08:00 |
|
孙广明
|
c286e44d55
|
Merge branch 'liyuchun_fixbug' into 'master'
* Fix bug #16610.
See merge request easycorp/zentaopms!2773
|
2022-04-07 02:44:02 +00:00 |
|
xieqiyu
|
8d877ea731
|
* Fix bug#18689.
|
2022-04-06 17:21:02 +08:00 |
|
zhouxudong
|
37f76d050f
|
* Fix bug #18545.
|
2022-04-06 16:45:30 +08:00 |
|
liyuchun
|
570c50b9f1
|
* Fix bug #16610.
|
2022-04-06 16:29:08 +08:00 |
|
zhouxudong
|
c776289815
|
* Fix bug #16780.
|
2022-04-06 16:00:00 +08:00 |
|
孙广明
|
1c8f929a0d
|
Merge branch 'liyuchun_fixbug' into 'master'
* Fix bug #13324.
See merge request easycorp/zentaopms!2684
|
2022-04-02 06:49:30 +00:00 |
|
hufangzhou
|
0608a7dadb
|
* Fix bug #21304.
|
2022-04-02 10:55:16 +08:00 |
|
liyuchun
|
e88a47ea3c
|
* Fix bug #21061.
|
2022-04-01 15:41:21 +08:00 |
|
liyuchun
|
b7d3bea247
|
* Fix bug #21061.
|
2022-04-01 10:31:38 +08:00 |
|
孙华伟
|
9c34cc22a2
|
Optimize the code.
|
2022-03-30 01:42:07 +00:00 |
|
孙华伟
|
c4d579152b
|
Optimize the code
|
2022-03-30 01:35:32 +00:00 |
|
孙华伟
|
e26cbcc00c
|
*Fix bug#16677.
|
2022-03-29 16:40:05 +08:00 |
|
tanghucheng
|
08f9c25798
|
* Fix bug #21177.
|
2022-03-25 15:58:03 +08:00 |
|
王怡栋
|
fe91dc8481
|
Merge branch 'pailei2'
|
2022-03-22 09:01:03 +08:00 |
|
Hao Sun
|
aee62254eb
|
* fix $(window).height() value is difference in firefox: avoid to insert js before <!DOCTYPE html>.
|
2022-03-21 16:03:52 +08:00 |
|
朱金勇
|
ec7c5022c8
|
Merge branch 'master' into 'Zentao_app1.1'
# Conflicts:
# module/execution/control.php
|
2022-03-21 06:12:21 +00:00 |
|
tianshujie
|
34c8489218
|
* Fix pending review issues.
|
2022-03-18 15:20:59 +08:00 |
|
songchenxuan
|
ed6e82f02f
|
*Close a story.
|
2022-03-17 10:11:35 +08:00 |
|
王怡栋
|
c1f3258a74
|
* adjust for get dynamic.
|
2022-03-14 16:08:58 +08:00 |
|
tianshujie
|
af5a97ad40
|
* Fix bug #20591.
|
2022-03-11 08:34:54 +08:00 |
|
tianshujie
|
eab4c059a3
|
* Finish task #50388.
|
2022-03-09 16:02:00 +08:00 |
|
tianshujie
|
d6692b22c1
|
* Fix bug #20522.
|
2022-03-09 10:39:45 +08:00 |
|
tianshujie
|
e1dd273c3c
|
* Modify the add contact popup style.
|
2022-03-09 08:49:13 +08:00 |
|
liumengyi
|
92c6de35f0
|
* Finish task #50324.
|
2022-03-07 14:27:50 +08:00 |
|
孙广明
|
7b962c4e38
|
Merge branch 'pailei'
|
2022-03-07 10:56:26 +08:00 |
|
liumengyi
|
0ca866ed99
|
* Fix bug #50325.
|
2022-03-07 09:37:42 +08:00 |
|
tianshujie
|
5b5213c761
|
* Fix bug #20301.
|
2022-03-04 13:21:09 +08:00 |
|
tianshujie
|
ae154aea0c
|
* Modify the code logic.
|
2022-03-04 11:18:03 +08:00 |
|
tianshujie
|
fc2bd0bbdc
|
* Fix bug #20307,18089.
|
2022-03-04 11:00:58 +08:00 |
|
孙广明
|
43b873f7ae
|
Merge branch 'sprint/186_tianshujie_upgrade' into 'master'
* Adjust the project field of the zt_task.
See merge request easycorp/zentaopms!2065
|
2022-03-04 02:40:52 +00:00 |
|
liumengyi
|
f82ba22467
|
* Fix bug #20314.
|
2022-03-04 09:33:00 +08:00 |
|
tianshujie
|
6dc0d7a70d
|
* Solve the problem that the project field of the pending task list is 0.
|
2022-03-04 09:04:02 +08:00 |
|
liumengyi
|
fed5f3cb4e
|
* Fix bug #20302.
|
2022-03-03 15:46:05 +08:00 |
|