Design/EasySoft-ZenTaoPMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 30 Wiki Activity
49,145 Commits 2 Branches 292 Tags
63149fd719c4e662df6dc7bd953a5ff91a41d9fe
Commit Graph
1571 Commits
Author SHA1 Message Date
chaideqing 4f5d210d1f * Fix feedback 1657. 2022-12-15 10:40:07 +08:00
chaideqing a4c89f47d6 * Fix feedback1714. 2022-12-12 15:49:07 +08:00
Lufei 91d4f420ec * Change resetFileName. 2022-12-08 14:00:48 +08:00
xieqiyu ef70a4c142 * Fix bug#30188. 2022-11-24 09:57:35 +08:00
王怡栋 476ceeaa6a Merge branch 'bug_27991' into 'master' 
Bug 27991

See merge request easycorp/zentaopms!6319
 2022-11-23 05:44:52 +00:00
zenggang 748323efe0 * Fix bug#27991 and adjust code 2022-11-23 02:55:03 +00:00
xieqiyu bfafc2996d * Fix bug#30026. 2022-11-23 10:54:51 +08:00
孙广明 fb274164f6 Merge branch 'sprint/scx_userapi' into 'master' 
Sprint/scx userapi

See merge request easycorp/zentaopms!6203
 2022-11-16 09:21:03 +00:00
宋辰轩 cdb40c8190 * Modify user api bug. 2022-11-16 16:27:09 +08:00
zenggang 8370d27ee4 * Fix feedback#1231 2022-11-16 08:24:12 +00:00
zenggang 921de5b4f1 * Fix feedback#1452 2022-11-16 01:13:55 +00:00
wangyidong 9761648d59 Merge branch 'zentaopms_239' 2022-11-08 08:41:28 +08:00
wangyidong d354c68adf * adjust for task #74928. 2022-11-07 15:19:58 +08:00
daitingting cb90a2e25b * Finish task #74176. 2022-11-02 06:30:01 +00:00
liuyongkai 738b1d8d57 * Resovle feedback #1334. 2022-11-02 02:25:46 +00:00
tianshujie 73dd27e207 * Delete unnecessary Spaces. 2022-10-28 10:46:21 +08:00
tianshujie 1b575f2024 * Fix bug #29081. 2022-10-28 09:56:54 +08:00
tianshujie 5031451ce8 * Fix bug #29000. 2022-10-28 09:53:28 +08:00
tianshujie c96621c63a * Fix bug #29015. 2022-10-28 09:37:22 +08:00
tianshujie 118098b77e * Fix bug #29048. 2022-10-28 08:42:12 +08:00
caoyanyi 467f1ba3e1 * Modify todo page style. 2022-10-27 14:33:04 +08:00
wangyidong 148d3d6d6b Merge branch 'master' into zentaopms_239 2022-10-27 11:39:47 +08:00
caoyanyi 249ef3592c * Fix bug #29001. 2022-10-27 09:26:28 +08:00
caoyanyi 6b589558f0 * Fix bug #28990. 2022-10-27 08:38:14 +08:00
tianshujie a72173cd72 * Finish task #73752. 2022-10-26 15:49:13 +08:00
caoyanyi e2a8f5a0fe * Modify view page style. 2022-10-26 09:56:57 +08:00
caoyanyi a82cc215ba * Optimize page style. 2022-10-25 14:53:46 +08:00
caoyanyi 3867eb0f55 * Code for execution #3238. 2022-10-24 16:56:27 +08:00
wangyidong fd861ec262 * code for task #72274. 2022-10-21 08:50:45 +08:00
tianshujie 80b66aea5c * Fix bug #28490. 2022-10-17 11:12:48 +08:00
tianshujie c0377d939a * Fix bug #28476. 2022-10-11 16:22:13 +08:00
tianshujie 40f225d93b * Finish task #71890. 2022-10-11 15:11:14 +08:00
tianshujie e1aa6ac3d4 * Fix bug #28433. 2022-10-11 15:06:55 +08:00
李玉春 bd488328ab Merge branch 'sprint/gfl_71875' into 'master' 
* finish task 71875

See merge request easycorp/zentaopms!5716
 2022-10-11 06:52:12 +00:00
李玉春 30238c658f Merge branch 'sprint/247_tianshujie_71888' into 'master' 
Sprint/247 tianshujie 71888

See merge request easycorp/zentaopms!5723
 2022-10-11 06:51:55 +00:00
tianshujie 5ffeb14e65 * Finish task #71888. 2022-10-11 13:53:50 +08:00
tianshujie 1d4bab43ab * Fix bug #28423. 2022-10-11 11:01:52 +08:00
曹延义 8f73e4d340 Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms into sprint/gfl_71875 2022-10-11 08:36:05 +08:00
曹延义 3f32ccdcb5 * Modify bug title. 2022-10-11 08:34:53 +08:00
田淑杰 f6d750c01a Merge branch 'master' into 'sprint/247_tianshujie_table' 
# Conflicts:
#   module/my/view/task.html.php
#   www/theme/default/style.css
 2022-10-10 08:43:18 +00:00
tianshujie ff6c9221cb * Finish task #71904. 2022-10-10 16:14:45 +08:00
tianshujie e9ebed5a6e * Finish task #71904. 2022-10-10 11:28:31 +08:00
wangyidong e9b5ab09cc * code for task #71612. 2022-10-10 10:45:36 +08:00
曹延义 d6bd6c978b * Modify bug list style. 2022-10-10 10:05:40 +08:00
宋辰轩 05b8fa3317 * Fix bug for api requests using json. 2022-10-09 14:12:51 +08:00
zenggang af225c1284 * Fix bug#28284 2022-10-09 03:27:18 +00:00
tianshujie d375b98af6 * Fix bug #28256. 2022-09-30 14:01:33 +08:00
wangyidong d300ee00da Merge branch 'master' into zentaopms_239 2022-09-30 09:07:53 +08:00
wangyuting2 03da1bcf64 * Optimize code for review code. 2022-09-26 05:56:56 +00:00
wangyuting2 48187a2051 * Fix bug #27805. 2022-09-22 08:19:20 +00:00