Commit Graph
789 Commits
Author SHA1 Message Date
wangyuting2 b7ebe4ee2b * Optimize code. 2022-10-28 08:05:21 +00:00
wangyuting2 a1df161747 * Finish task #73818. 2022-10-27 06:45:09 +00:00
wangyidong 148d3d6d6b Merge branch 'master' into zentaopms_239 2022-10-27 11:39:47 +08:00
wangyuting2 e72e9c7a74 * Optimize code. 2022-10-26 07:13:57 +00:00
wangyuting2 f8f329ec94 * Finish task #73470. 2022-10-26 07:01:57 +00:00
wangyidong 9031aac218 * fix for print divider in three level navigation. 2022-10-20 13:39:26 +08:00
wangyuting2 ecaff099cd * Finish task #72773. 2022-10-19 05:45:15 +00:00
zenggang fa7624efbd * Fix bug#28514 2022-10-13 07:44:06 +00:00
wangyuting2 aa9bc2b8ec * Fix systemMode bug. 2022-10-10 07:32:11 +00:00
wangyuting2 4fcf7ae1bd * Optimize code. 2022-10-09 08:14:10 +00:00
wangyuting2 82b7246b8d * Finish task #71648. 2022-10-09 07:44:39 +00:00
王怡栋 a445dc463b Merge branch 'zentaopms_239_wangyuting' into 'zentaopms_239'
* Optimize code.

See merge request easycorp/zentaopms!5650
2022-09-30 06:28:00 +00:00
wangyuting2 606ea74471 * Optimize code. 2022-09-30 05:52:05 +00:00
daitingting 7ba36be668 * Count assetlib if edition is max. 2022-09-30 03:21:09 +00:00
wangyuting2 e0edb0bf91 * Fix bug #28147. 2022-09-29 06:12:11 +00:00
王 于听 59d85868b5 Merge branch 'sprint/zentaopms240_wangyuting' into 'sprint/zentaopms240'
* Fix bug in review code.

See merge request easycorp/zentaopms!5612
2022-09-29 05:51:04 +00:00
wangyuting2 d33cc87da9 * Fix bug in review code. 2022-09-29 05:50:16 +00:00
王怡栋 b5075cfb2d Merge branch 'sprint/zentaopms240_getscrumdata' into 'sprint/zentaopms240'
* Get scrum risk and issue.

See merge request easycorp/zentaopms!5608
2022-09-29 05:48:37 +00:00
wangyidong 04cc70c4cc * adjust for task #70545. 2022-09-29 13:45:24 +08:00
daitingting e1d1aaac06 * Get undeleted data. 2022-09-29 05:18:26 +00:00
daitingting c59e9afaa8 * Get scrum risk and issue. 2022-09-29 02:59:53 +00:00
wangyuting2 f9310ade48 * Fix bug #27929. 2022-09-28 06:59:18 +00:00
daitingting 45d957cc9f * Disable issue, risk, urstory when switch to lean mode for task #70565,#70566. 2022-09-28 02:16:14 +00:00
wangyuting2 ffc90c7d58 * Hide lean mode features. 2022-09-27 06:07:49 +00:00
daitingting dc8b4f4ccd * Optimize codes. 2022-09-27 05:19:40 +00:00
王怡栋 2d868419b2 Merge branch 'sprint/zentaopms240_task#70850' into 'sprint/zentaopms240'
* Do task #70850.

See merge request easycorp/zentaopms!5561
2022-09-27 03:11:25 +00:00
wangyuting2 3874a3e22b * Do task #70850. 2022-09-27 03:07:47 +00:00
wangyuting2 80fe821de6 * Finish task #70571. 2022-09-27 01:33:34 +00:00
王怡栋 444834b316 Merge branch 'sprint/zentaopms240' into 'sprint/zentaopms240_lanzongjun'
# Conflicts:
#   module/custom/js/mode.js
#   module/custom/lang/de.php
#   module/custom/lang/en.php
#   module/custom/lang/fr.php
#   module/custom/lang/zh-cn.php
#   module/custom/view/mode.html.php
#   module/project/control.php
#   module/project/lang/zh-cn.php
2022-09-27 00:28:36 +00:00
daitingting f7d564e837 * Finish task #70200. 2022-09-26 09:38:11 +00:00
wangyuting2 3af041060f * Finish task #70194. 2022-09-26 07:06:15 +00:00
lanzongjun 905a71ddf7 * fix bug meeting 2022-09-23 17:25:45 +08:00
王怡栋 1b67944be1 Merge branch 'sprint/zentaopms240_lanzongjun' into 'sprint/zentaopms240'
* fix bug #27786

See merge request easycorp/zentaopms!5485
2022-09-22 06:55:30 +00:00
lanzongjun 52fdb68caa * fix bug #27788 2022-09-22 14:53:54 +08:00
lanzongjun c4c57794ea * fix bug #27788 2022-09-22 14:49:33 +08:00
王怡栋 66d557a280 Merge branch 'sprint/zentaopms240_lanzongjun' into 'sprint/zentaopms240'
Sprint/zentaopms240 lanzongjun

See merge request easycorp/zentaopms!5470
2022-09-22 06:42:54 +00:00
王怡栋 1b5a1296e0 Merge branch 'sprint/zentaopms240_task#69699' into 'sprint/zentaopms240'
* Finish task #69699.

See merge request easycorp/zentaopms!5466
2022-09-22 06:15:41 +00:00
wangyuting2 bdae125fd3 * Update white for project. 2022-09-22 06:11:35 +00:00
lanzongjun 03441d3bfc * fix bug #27788 2022-09-22 14:03:44 +08:00
daitingting 06022d2d06 * Fix bug for #27683. 2022-09-22 05:57:35 +00:00
daitingting f2abc5711c * Optimize tips for task #69246. 2022-09-22 05:39:45 +00:00
wangyuting2 6a82102b27 * Finish task #69699. 2022-09-22 01:05:34 +00:00
lanzongjun 222a65223f * fix meeting 2022-09-21 16:30:05 +08:00
lanzongjun 13f713060c * fix bug #27684 2022-09-21 15:19:38 +08:00
lanzongjun 77af712c03 * fix bug #27607 2022-09-21 15:13:03 +08:00
lanzongjun 9ab3bc4937 * fix bug #27605 2022-09-21 15:01:49 +08:00
lanzongjun 6ab0868d6e resolve conflict 2022-09-21 13:37:43 +08:00
lanzongjun 24f686b75a fix noSprint 2022-09-21 13:35:42 +08:00
daitingting 19a3fdacf9 * Refresh top after switching mode. 2022-09-21 02:55:33 +00:00
lanzongjun df7938e7ad * finish task #69255 2022-09-21 09:54:50 +08:00