Commit Graph

608 Commits

Author SHA1 Message Date
tianshujie
7a70ae8481 * Finish task #55675. 2022-06-01 13:50:53 +08:00
tianshujie
2fb1cc0032 * Finish task #55675. 2022-06-01 10:57:07 +08:00
tianshujie
bee7fe5ae4 * Export tasks Add task mode. 2022-05-27 05:38:05 +08:00
tianshujie
50e9f82455 * Fix bug #22988. 2022-05-26 14:20:44 +08:00
tianshujie
017019f6af * Fix bug #22952,22979. 2022-05-26 11:35:47 +08:00
李玉春
b41cdeb6f4 Merge branch 'sprint/194_tianshujie_55257' into 'master'
Sprint/194 tianshujie 55257

See merge request easycorp/zentaopms!3594
2022-05-25 08:08:26 +00:00
tianshujie
e3d1c44eae * Finish task #55257. 2022-05-25 13:45:10 +08:00
孙广明
495a034784 * Finish task #55178. 2022-05-24 14:15:34 +08:00
wangyidong
967d24dd06 Merge branch 'sprint/189_package' 2022-05-24 10:32:09 +08:00
wangyidong
d6cf08b9d7 Merge branch 'tid' 2022-05-18 10:20:48 +08:00
tanghucheng
d3dc4ebe43 * Fix bug. 2022-05-17 06:00:26 +00:00
xieqiyu
e085535743 * Fix bug#22375. 2022-05-16 14:59:06 +08:00
mayue
3d55d30a92 * Optimize code. 2022-04-28 07:54:22 +00:00
mayue
94c3a3a270 * Fix bug #10878. 2022-04-28 07:50:01 +00:00
sunjun
c2d9f7b240 *Fixbug_sunjun_22007 2022-04-28 02:48:11 +00:00
sunjun
0495a32a20 *Fixbug_sunjun_22007 2022-04-27 07:59:37 +00:00
mayue
18b70b3208 * Fix bug #10878. 2022-04-26 09:18:13 +00:00
zhouxudong
a55f5f9df6 * Fix bug #15338. 2022-04-26 09:03:06 +00:00
zhengrunyu
2633b5c23c * Fix bug when create task and story error. 2022-04-26 15:14:22 +08:00
王怡栋
a8983445c8 Merge branch 'master' into 'sprint/master_zhouxudong_17994'
# Conflicts:
#   module/bug/model.php
#   module/task/model.php
2022-04-13 07:52:03 +00:00
zhouxudong
37337bdb68 * Fix bug #17994. 2022-04-13 10:59:25 +08:00
zhouxudong
1dd4af6ff3 * Fix bug #17994. 2022-04-13 09:26:20 +08:00
zhouxudong
233a035b12 * Fix bug #17994. 2022-04-12 17:23:24 +08:00
zhouxudong
8baef621d2 * Fix bug #17994. 2022-04-12 16:50:56 +08:00
李玉春
ecf6797cb2 Merge branch 'sprint/master_zhouxudong_15146' into 'master'
Sprint/master zhouxudong 15146

See merge request easycorp/zentaopms!2855
2022-04-11 06:14:39 +00:00
周旭东
36e1809e7c Update control.php 2022-04-11 06:11:03 +00:00
xieqiyu
93cb0c08bf * Fix bug#15146. 2022-04-11 14:07:49 +08:00
zhouxudong
5e5f3c50d1 * Fix bug #15146. 2022-04-11 09:50:59 +08:00
朱金勇
1518796b03 Merge branch 'app_zry' into 'master'
* Fix bug 21591.

See merge request easycorp/zentaopms!2828
2022-04-08 06:05:36 +00:00
zhengrunyu
a7d7cca753 * Fix bug 21591. 2022-04-08 14:03:21 +08:00
王怡栋
3f74884813 * fix bug #21411. 2022-04-02 15:53:38 +08:00
王怡栋
adb3a7ea72 Merge branch 'master' into 'sprint/master_fixbug'
# Conflicts:
#   module/project/model.php
2022-04-02 07:33:24 +00:00
tanghucheng
8c81661d37 * Fix bug #21431. 2022-04-02 14:30:25 +08:00
tianshujie
b2e99c8dd4 * Modify the jump link mode. 2022-04-02 10:37:43 +08:00
tianshujie
b9dc9b118e * Fix bug #19676. 2022-04-01 14:05:06 +08:00
xieqiyu
2a57f4fd28 * Fix bug#19665. 2022-03-31 16:08:33 +08:00
xieqiyu
2ed1eedfcf * Fix bug#19273. 2022-03-31 13:42:28 +08:00
孙广明
df2cda6e8b Merge branch 'sprint/master_zhouxudong_18083' into 'master'
Sprint/master zhouxudong 18083

See merge request easycorp/zentaopms!2653
2022-03-31 03:06:37 +00:00
xieqiyu
0983c30e8d * Fix bug#18083. 2022-03-30 17:26:17 +08:00
caoyanyi
c2bc48fc38 * Fix bug #6971. 2022-03-30 13:29:38 +08:00
tianshujie
c9c1573a2d * Fix bug #20523. 2022-03-24 14:40:38 +08:00
zhujinyong
0c39542c38 Merge branch 'Zentao_app1.1' 2022-03-22 10:55:09 +08:00
王怡栋
fe91dc8481 Merge branch 'pailei2' 2022-03-22 09:01:03 +08:00
caoyanyi
bd8dfd8269 Merge branch 'Zentao_app1.1' of https://gitlab.zcorp.cc/easycorp/zentaopms into Zentao_app1.1 2022-03-21 14:41:49 +08:00
caoyanyi
f2d6299356 * Fix bug #20662. 2022-03-21 10:39:41 +08:00
Zongjun Lan
3d936d7dc8 * fix bug #20703 2022-03-14 15:43:15 +08:00
zhouxin
f9c4e15149 Fix bug #50416. 2022-03-14 02:09:18 +00:00
孙广明
4c218d7a69 Merge branch 'pailei_zhangzilong_49888' into 'pailei2'
Pailei zhangzilong 49888

See merge request easycorp/zentaopms!2155
2022-03-09 06:41:53 +00:00
xieqiyu
4ba238cd27 * Modify review code. 2022-03-09 14:36:50 +08:00
mayue
9f38f5cd10 * Fix bug #50240. 2022-03-09 13:27:42 +08:00