Design/EasySoft-ZenTaoPMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 30 Wiki Activity
44,982 Commits 2 Branches 292 Tags
2a57f28bc5cb0aa8a123335f9bbf217fe8bd859b
Commit Graph
744 Commits
Author SHA1 Message Date
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
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 6cd72e94ac * finish task #69701 2022-09-20 09:11:56 +08:00
lanzongjun 9960576e69 modify mode width 2022-09-19 16:18:38 +08:00
lanzongjun d980ef31ba modify upgrade install 2022-09-19 15:25:06 +08: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
lanzongjun 4d0ce9f58c Merge branch 'sprint/zentaopms240' of https://gitlab.zcorp.cc/easycorp/zentaopms into sprint/zentaopms240 2022-09-19 13:31:09 +08:00
lanzongjun c86e0a8914 modify lang 2022-09-19 13:31:01 +08:00
lanzongjun 7ff2af63ff modify lang 2022-09-19 13:30:23 +08:00
lanzongjun c86e8179fd Merge branch 'sprint/zentaopms240' of https://gitlab.zcorp.cc/easycorp/zentaopms into sprint/zentaopms240_lanzongjun 2022-09-19 08:48:37 +08:00
lanzongjun ffa25acdbe modify custom 2022-09-19 08:40:27 +08:00
daitingting bb5c0540cc * Use fixer to get mode. 2022-09-16 09:15:47 +00:00
wangyidong 6b541a7c60 Merge branch 'sprint/zentaopms240_lanzongjun' into sprint/zentaopms240 2022-09-16 16:26:29 +08:00
lanzongjun 1d9a11cc66 * task #69250#69251 2022-09-16 15:08:38 +08:00
lanzongjun d80acf6a78 * task #69250 2022-09-16 13:28:50 +08:00
lanzongjun 62fec75de1 * task #69250 2022-09-16 13:15:09 +08:00
lanzongjun 8d0e5b978c * task #69250 2022-09-16 13:13:24 +08: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
daitingting c44bc35ec6 * Adjust language. 2022-09-16 02:38:51 +00:00
daitingting e8481ba4a2 * Finish task #69245. 2022-09-16 02:02:50 +00:00
daitingting fe13c4de38 * Doing task #69253. 2022-09-16 01:02:13 +00:00
lanzongjun f521bbb5a6 * finish task #69244 2022-09-14 17:09:41 +08:00
tianshujie 619068ea8d * Finish task #64967. 2022-08-17 15:40:01 +08:00
tianshujie 24e39026cc * Finish task #64967. 2022-08-16 17:07:27 +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 72ac19d156 * Finish task #61177. 2022-07-20 09:42:37 +08:00
tianshujie f0dec448ce * Finish task #61177. 2022-07-20 08:36:04 +08:00
tianshujie 237e184998 * Finish task #61177. 2022-07-19 14:38:19 +08:00
tianshujie 896ac04352 * Finish task #61177. 2022-07-19 14:34:54 +08:00
tianshujie 7791a30013 * Finish task #61177. 2022-07-19 13:32:03 +08:00
xieqiyu 2c5ca0fc6a * Fix bug#25198. 2022-07-14 08:39:46 +08:00
xieqiyu cdec3750ed * Fix bug#25145. 2022-07-13 10:20:03 +08:00
leiyong 3a55d594c3 * Finish task#60375. 2022-07-11 07:18:52 +00: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
刘刚 c958da7bf4 Merge branch 'sprint/zentaobiz10' into 'master' 
* Fix bug #24924.

See merge request easycorp/zentaopms!4405
 2022-07-07 03:20:08 +00:00
daitingting 162513b943 * Fix bug #24924. 2022-07-07 03:18:45 +00:00
刘刚 d3174ab36c Merge branch 'sprint/zentaobiz10' into 'master' 
Sprint/zentaobiz10

See merge request easycorp/zentaopms!4368
 2022-07-06 03:07:19 +00:00
daitingting dddeaa9edd * Finish task #59649. 2022-07-06 02:55:08 +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
tanghucheng 78608484b7 * Fix bug #24638. 2022-06-30 17:26:57 +08:00