Commit Graph
3186 Commits
Author SHA1 Message Date
wangyidong 8a178c72fe * adjust for project release link story and bug. 2022-11-11 10:47:01 +08:00
tanghucheng e09a070318 * Merge branch 'master' into transfer. 2022-11-09 15:44:42 +08:00
wangyidong 9761648d59 Merge branch 'zentaopms_239' 2022-11-08 08:41:28 +08:00
xieqiyu e5accc3154 * Fix bug#29356. 2022-11-07 06:54:28 +00:00
孙广明 5c4cb5b1e2 Merge branch 'cyy_bug' into 'master'
* Hide pri style when value is null.

See merge request easycorp/zentaopms!6028
2022-11-04 01:53:41 +00:00
Yagami 5aafd5241f * Fix bug #29246. 2022-11-04 09:22:38 +08:00
caoyanyi 829408cc5e * Hide pri style when value is null. 2022-11-04 08:37:35 +08:00
liumengyi e84e6ac11d * Fix bug of bug link bugs. 2022-11-03 09:51:16 +08:00
zhouxin 66fef9275a * Adjust code. 2022-11-02 15:50:38 +08:00
zhouxin 73e1c524c8 * Adjust testcase to bug. 2022-11-02 15:42:21 +08:00
liuyongkai 9685f4b186 * Resolve feedback #1318. 2022-11-01 07:31:11 +00:00
孙广明 71fe0efe0b Merge branch 'feedback_zhouxin_1255' into 'master'
* Resolve feedback #1225.

See merge request easycorp/zentaopms!5915
2022-10-27 06:22:08 +00:00
zhouxin 11ebfea800 * Resolve feedback #1225. 2022-10-27 13:44:44 +08:00
wangyidong 148d3d6d6b Merge branch 'master' into zentaopms_239 2022-10-27 11:39:47 +08:00
caoyanyi 38e718f83f * Fix bug #28995. 2022-10-27 09:02:02 +08:00
caoyanyi 6a6cfaa453 * Adjust code. 2022-10-26 10:01:26 +08:00
caoyanyi e2a8f5a0fe * Modify view page style. 2022-10-26 09:56:57 +08:00
caoyanyi a82cc215ba * Optimize page style. 2022-10-25 14:53:46 +08:00
tanghucheng ea173ebc4d * Fix bug export. 2022-10-25 14:53:46 +08:00
王怡栋 aa49a5bbd3 Merge branch 'zentaopms_239_task_#72984' into 'zentaopms_239'
* Finish task #72984.

See merge request easycorp/zentaopms!5883
2022-10-25 05:08:33 +00:00
daitingting 1aa860c972 * Finish task #72984. 2022-10-25 03:24:04 +00:00
daitingting 9825419bd4 * Finish task #73066. 2022-10-25 02:06:30 +00:00
daitingting 9cfdad38f4 * Remove debug codes. 2022-10-18 07:44:12 +00:00
liuhong d7bb46cda5 *Finish feedback #1133. 2022-10-18 05:46:27 +00:00
daitingting 60891c37bb * Finish task #72258. 2022-10-18 02:58:26 +00:00
lanzongjun aa6546a2ee resolve conflict 2022-10-18 09:26:14 +08:00
王怡栋 b75e9a34ca Merge branch 'zentaopms_239_task#72266' into 'zentaopms_239'
* Finish task #72266 and bug #28441.

See merge request easycorp/zentaopms!5766
2022-10-17 08:45:47 +00:00
wangyuting2 af81361e27 * Finish task #72266 and bug #28441. 2022-10-17 08:16:25 +00:00
wangyuting2 6e8df1ac1c * Finish task #72265 and bug #28442. 2022-10-17 08:09:20 +00:00
zenggang 3237e4e752 * Fix bug#28542 2022-10-17 05:22:40 +00:00
mayue 97aaafbbc3 * Remove ticket from bug. 2022-10-17 09:01:15 +08:00
daitingting f5d987b55d * Fix bugs of mutual_test. 2022-10-11 05:17:07 +00:00
sunguangming 876cde442e * Fix bug #28428. 2022-10-11 11:18:49 +08:00
sunguangming 81bb7739be * Code for bug #28417. 2022-10-11 11:12:59 +08:00
sunguangming 50b2700f56 * Adjust create bug view style. 2022-10-11 09:43:30 +08:00
王怡栋 9f9d913205 Merge branch 'bug_28378' into 'master'
* Fix bug#28378

See merge request easycorp/zentaopms!5711
2022-10-10 09:24:58 +00:00
王怡栋 abcdde7ea3 Merge branch 'zentaopms_239_wangyuting' into 'zentaopms_239'
* Fix systemMode bug.

See merge request easycorp/zentaopms!5710
2022-10-10 09:18:50 +00:00
田淑杰 f6d750c01a Merge branch 'master' into 'sprint/247_tianshujie_table'
# Conflicts:
#   module/my/view/task.html.php
#   www/theme/default/style.css
2022-10-10 08:43:18 +00:00
zenggang 3d68550408 * Fix bug#28378 2022-10-10 07:57:30 +00:00
wangyuting2 aa9bc2b8ec * Fix systemMode bug. 2022-10-10 07:32:11 +00:00
liugang 3cb2f063cd * Fix error param. 2022-10-10 13:39:34 +08:00
liugang 986b7ff785 * Fix bug #27906. 2022-10-10 13:32:00 +08:00
tianshujie e9ebed5a6e * Finish task #71904. 2022-10-10 11:28:31 +08:00
曹延义 f4aa951774 * Finish task #71874. 2022-10-10 09:59:14 +08:00
daitingting 39064a3e22 * Finish task #71580,#71581,#71582,#71583,#71584. 2022-10-09 08:22:27 +00:00
liugang d65fb0321c * Fix bug #28279. 2022-10-09 09:35:32 +08:00
sunguangming 7efbb7d6ca * Fix bug #28227. 2022-10-08 17:02:01 +08:00
wangyidong b670a47863 * fix bug #27958. 2022-10-08 15:32:49 +08:00
liugang d325519d52 * Fix bug #27903. 2022-10-08 09:51:11 +08:00
wangyidong d300ee00da Merge branch 'master' into zentaopms_239 2022-09-30 09:07:53 +08:00