Commit Graph
827 Commits
Author SHA1 Message Date
daitingting 8650982994 * Fix issues of function review. 2022-11-25 05:50:02 +00:00
daitingting df38b1400c * Fix bug #30209. 2022-11-24 06:20:49 +00:00
daitingting b4296bb71e * Fix bug #30171. 2022-11-24 02:52:17 +00:00
王怡栋 fb9bdee652 Merge branch 'zentaopms_263_bug_#30174' into 'master'
* Fix bug #30174.

See merge request easycorp/zentaopms!6347
2022-11-24 02:12:55 +00:00
daitingting a3cc874acc * Fix bug #30174. 2022-11-24 01:55:13 +00:00
王怡栋 0330c90d05 Merge branch 'zentaopms_263_bug_30165' into 'master'
* Fix bug #30165,#30170.

See merge request easycorp/zentaopms!6336
2022-11-23 08:13:59 +00:00
daitingting 48d2209722 * Fix bug #30165,#30170. 2022-11-23 08:10:39 +00:00
daitingting 2c709e02ab * Fix bug #30085. 2022-11-23 06:54:34 +00:00
daitingting 96623039db * Fix bug #30151. 2022-11-23 06:05:32 +00:00
王怡栋 6cd5d4c2d4 Merge branch 'master' into 'zentaopms_263_sort_features'
# Conflicts:
#   module/custom/config.php
2022-11-23 05:42:45 +00:00
daitingting d038c3126c * Fix bug #30113. 2022-11-23 05:23:25 +00:00
daitingting f4d756e8c6 * Sort features. 2022-11-23 03:11:52 +00:00
daitingting d7bd0481a5 * Disabled current mode button. 2022-11-23 02:28:34 +00:00
daitingting 7f19feff3a * Finish task #77137. 2022-11-23 01:43:12 +00:00
daitingting 3750be48c5 * Finish task #77143. 2022-11-22 08:17:17 +00:00
hufangzhou 3dae19302b * Add the new version. 2022-11-16 06:34:29 +00:00
孙广明 ca3de7cc84 Merge branch 'lyk_feedback_1411' into 'master'
* Resolve feedback #1411.

See merge request easycorp/zentaopms!6121
2022-11-11 06:50:22 +00:00
liuyongkai dd519c7587 * Resolve feedback #1411. 2022-11-11 13:02:26 +08:00
daitingting be40637a66 * Rename config->custom->feature. 2022-11-11 02:52:58 +00:00
daitingting 1f949f1b3f * Finish task #75242. 2022-11-10 07:15:23 +00:00
daitingting ea917ac153 * Scrum details are in max edition. 2022-11-08 02:52:43 +00:00
daitingting 0578e78e51 * Fix bug #29381. 2022-11-08 01:42:27 +00:00
wangyidong 9761648d59 Merge branch 'zentaopms_239' 2022-11-08 08:41:28 +08:00
daitingting 03ff1ab5b0 * Fix bug for task #74859. 2022-11-07 08:54:16 +00:00
caoyanyi ddfade7db2 * Fix bug #27589. 2022-11-07 09:50:00 +08:00
王怡栋 dc6371478d Merge branch 'zentaopms_239_task_#74859' into 'zentaopms_239'
* Finish task #74859.

See merge request easycorp/zentaopms!6049
2022-11-07 00:32:52 +00:00
daitingting bb4a0945fd * Finish task #74859. 2022-11-04 09:20:53 +00:00
王怡栋 74c7882fc6 Merge branch 'zentaopms_239_task_#74858' into 'zentaopms_239'
* Finish task #74858.

See merge request easycorp/zentaopms!6030
2022-11-04 02:44:03 +00:00
daitingting 3d287772cc * Finish task #74858. 2022-11-04 01:49:32 +00:00
daitingting 9f1f70f9ca * Finish task #74864. 2022-11-04 01:41:06 +00:00
王 于听 95879b7f64 Merge branch 'zentaopms_239_task_#73988_#74180' into 'zentaopms_239'
* Fix for #73988, #74180.

See merge request easycorp/zentaopms!6023
2022-11-03 08:53:34 +00:00
daitingting 1eaf98a48a * Fix for #73988, #74180. 2022-11-03 07:58:17 +00:00
wangyuting2 b4f6b346b8 * Fix bug for review code. 2022-11-03 07:16:01 +00:00
代婷婷 c105930472 Merge branch 'zentaopms_239' into 'zentaopms_239_task_#74667'
# 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
2022-11-03 05:36:38 +00:00
daitingting b07b1031ea * Finish task #74667. 2022-11-03 03:15:41 +00:00
daitingting 998866a374 * Finish task #74180. 2022-11-03 01:40:17 +00:00
daitingting cb90a2e25b * Finish task #74176. 2022-11-02 06:30:01 +00:00
daitingting 47db9c31e3 * Finish task #74179. 2022-10-31 05:19:20 +00:00
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