Commit Graph

289 Commits

Author SHA1 Message Date
daitingting
8650982994 * Fix issues of function review. 2022-11-25 05:50:02 +00:00
daitingting
2c709e02ab * Fix bug #30085. 2022-11-23 06:54:34 +00:00
daitingting
3750be48c5 * Finish task #77143. 2022-11-22 08:17:17 +00: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
daitingting
03ff1ab5b0 * Fix bug for task #74859. 2022-11-07 08:54:16 +00:00
daitingting
bb4a0945fd * Finish task #74859. 2022-11-04 09:20:53 +00:00
daitingting
1eaf98a48a * Fix for #73988, #74180. 2022-11-03 07:58:17 +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
wangyidong
148d3d6d6b Merge branch 'master' into zentaopms_239 2022-10-27 11:39:47 +08: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
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
daitingting
f7d564e837 * Finish task #70200. 2022-09-26 09:38:11 +00: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
lanzongjun
03441d3bfc * fix bug #27788 2022-09-22 14:03:44 +08: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
77af712c03 * fix bug #27607 2022-09-21 15:13:03 +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
lanzongjun
c4f00619e4 * finish task #69255 2022-09-21 09:35:22 +08:00
daitingting
d038c1e64c * Finish task #69246,#69247. 2022-09-20 05:08:06 +00:00
lanzongjun
322ac53e2b resolve conflict 2022-09-19 14:55:20 +08:00
lanzongjun
8f92f57390 * finish task #69255 2022-09-19 14:52:21 +08:00
王怡栋
b26b951972 Merge branch 'sprint/zentaopms240' into 'sprint/daitingting_task_69245'
# Conflicts:
#   module/custom/view/mode.html.php
2022-09-19 05:35:56 +00:00
daitingting
bb5c0540cc * Use fixer to get mode. 2022-09-16 09:15:47 +00:00
daitingting
196f638737 * Finish task #69245. 2022-09-16 03:09:55 +00:00
lanzongjun
b0c3bccc9d * task #69250 2022-09-16 11:07:26 +08:00
lanzongjun
f521bbb5a6 * finish task #69244 2022-09-14 17:09:41 +08:00
tianshujie
202da1587e * Fix bug #25813. 2022-08-04 14:46:10 +08:00
tianshujie
c11bae3c96 * Fix bug #25813. 2022-07-28 14:48:14 +08:00
tianshujie
7791a30013 * Finish task #61177. 2022-07-19 13:32:03 +08:00
刘刚
7262a6d365 Merge branch 'sprint/zentaobiz10' into 'master'
* Fix bug #24912.

See merge request easycorp/zentaopms!4406
2022-07-07 05:32:53 +00:00
daitingting
008043aa25 * Fix bug #24912. 2022-07-07 05:31:24 +00:00
王怡栋
04b2a5994f Merge branch 'sprint/208_tianshujie_58554' into 'master'
Sprint/208 tianshujie 58554

See merge request easycorp/zentaopms!4317
2022-07-04 06:59:21 +00:00
tianshujie
1592cefab6 * Fix bug #24391. 2022-06-29 10:40:44 +08:00
tianshujie
6fb8d56c65 * Finish task #58556. 2022-06-28 17:09:04 +08:00
tianshujie
621e382cb6 * Finish task #58554. 2022-06-28 15:35:49 +08:00
xieqiyu
d4ac1b4a5f * Code for task#57850. 2022-06-23 17:20:19 +08:00
tanghucheng
e30bd279bc * Fix bug. 2022-06-23 14:52:21 +08:00