Design/EasySoft-ZenTaoPMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 30 Wiki Activity
45,018 Commits 2 Branches 292 Tags
3438ffbbc0b34fe7251aeff10a3bdbaa980b6266
Commit Graph
269 Commits
Author SHA1 Message Date
王怡栋 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
tanghucheng 4d8da5eeb1 * Fix bug #24177. 2022-06-23 09:40:19 +08:00
zenggang ea2280da59 * Adjust code 2022-06-14 06:56:01 +00:00
zenggang cc49cbe439 * Finish task#57156 2022-06-14 06:03:55 +00:00
孙广明 b896377846 * Change zentao license. 2022-06-08 10:02:29 +08:00
孙广明 b528156589 * Change license. 2022-06-08 09:34:46 +08:00
liumengyi 356d69025a * Fix bug #23236. 2022-06-02 17:08:00 +08:00
liumengyi d93d30e2d7 * Optimize code for task #55677. 2022-06-01 14:39:11 +08:00
liumengyi 499024e935 * Finish tash #55677. 2022-06-01 10:36:46 +08:00
孙广明 e864362836 * Fix bug #22944. 2022-05-26 10:48:34 +08:00
孙广明 79ebf4a441 * Fix bug #22944. 2022-05-26 09:42:12 +08:00
tianshujie 244a281a47 * Finish task #54329. 2022-05-19 09:57:00 +08:00
tianshujie d79a01aecb * Finish task #54329. 2022-05-19 08:40:01 +08:00
tianshujie f1f4c511b5 * Finish task #54329. 2022-05-18 16:08:09 +08:00
liumengyi fb4e586acf * Finish task #54349. 2022-05-17 14:50:31 +08:00
tianshujie 0c55baddc6 * Fix bug #21858. 2022-04-20 10:57:00 +08:00
liyuchun 3804046bdb * Fix bug #21182. 2022-04-07 09:15:35 +08:00
tanghucheng 12c3fd80dd * Code for bug #21058. 2022-03-28 17:01:56 +08:00
tianshujie a7d66c5fae * Fix bug #20572. 2022-03-10 10:05:34 +08:00
tianshujie b7c3e92e95 * Modify version judgment logic. 2022-02-24 16:17:26 +08:00
zhujinyong b17c3c8206 * Move die to return print. 2022-02-22 08:42:32 +08:00