Design/EasySoft-ZenTaoPMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 30 Wiki Activity
48,948 Commits 2 Branches 292 Tags
fd30e0a0062bb94de6cf1dba4af552da316bbc71
Commit Graph
194 Commits
Author SHA1 Message Date
liuhong decfddd1d2 * Fix bug #23961. 2022-11-23 06:34:32 +00:00
wangzemei 261eb124ae * fix bug 29345 2022-11-07 13:51:53 +08:00
tianshujie 4ea862f2ee * Fix bug #28222. 2022-11-01 14:20:20 +08:00
tianshujie 438bd7cb8c * Delete useless code. 2022-10-31 17:13:54 +08:00
tianshujie 5543d1ec40 * Finish task #74082. 2022-10-31 17:09:59 +08:00
tianshujie c79a78afe4 * Fix bug #28222. 2022-10-31 15:43:28 +08:00
tianshujie 11f969dc9f * Finish task #74082. 2022-10-31 15:24:22 +08:00
caoyanyi 6570992da4 * Fix bug #28997. 2022-10-27 09:15:40 +08:00
tianshujie a72173cd72 * Finish task #73752. 2022-10-26 15:49:13 +08:00
wangzemei 25f8023fef * Solve width calculation problems 2022-10-19 14:31:55 +08:00
lanzongjun aa6546a2ee resolve conflict 2022-10-18 09:26:14 +08:00
zhouxin 9593f24d92 * Fix bugs. 2022-10-17 23:05:00 +08:00
zhouxin 4bab4bc356 * Fix some bugs of ticket. 2022-10-17 14:01:04 +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 e9ebed5a6e * Finish task #71904. 2022-10-10 11:28:31 +08:00
tianshujie 20fdae4f1b * Finish task #71889. 2022-10-10 10:11:28 +08:00
tianshujie 6c39ac6ba5 * Finish task #71899. 2022-10-10 09:49:54 +08:00
tianshujie 87f5fb905a * Finish task #71900. 2022-10-10 09:23:45 +08:00
tianshujie b81f00714c * Finish task #71901. 2022-10-10 09:13:13 +08:00
tianshujie 0658933923 * Finish task #71902. 2022-10-10 09:06:55 +08:00
李玉春 635693bef4 Merge branch 'sprint/244_wzm_70007' into 'master' 
* finish task 70007 & 71896

See merge request easycorp/zentaopms!5689
 2022-10-10 00:56:52 +00:00
guofeilong 9aeba19381 * add pd-r-8 to column c-hours th 2022-10-09 06:56:38 +00:00
wangzemei 8cab82e6ff * modify style 2022-09-30 09:51:23 +08:00
tianshujie c204037450 * Finish task #70017. 2022-09-28 13:51:12 +08:00
tianshujie 92eb14d26e * Finish task #70015. 2022-09-26 16:13:39 +08:00
tianshujie 37ce477c0e * Finish task #70015. 2022-09-26 14:49:20 +08:00
dingyongliang c7c4ec7429 * task #70018, change bug confirmed color. 2022-09-22 01:12:16 +00:00
dongli 51853ef523 * Fix bug #26188. 2022-09-01 07:42:29 +00:00
dongli 25fe8cd518 * Fix bug #24387. 2022-08-28 11:57:16 +00:00
tianshujie 8e46aa45f5 * Fix bug #26832. 2022-08-25 09:07:19 +08:00
liumengyi b323432098 * Modify text-overflow style. 2022-08-24 09:00:09 +08:00
liumengyi 1d00010f72 * Modify css for task #65780. 2022-08-22 16:13:51 +08:00
liumengyi ce47faa9cf * Finish task #65780. 2022-08-22 14:05:01 +08:00
zhujinyong 50479852ea Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms 2022-08-15 08:47:48 +08:00
dongli 91908bc56b * Fix bug #63669. 2022-08-10 23:59:31 +00:00
王怡栋 026739dc18 Merge branch 'master' into 'sprint/224_dongli_bug63669' 
# Conflicts:
#   module/my/css/task.css
 2022-08-10 05:46:12 +00:00
dongli dacb68a745 * Fix bug #63669. 2022-08-10 03:35:16 +00:00
Hao Sun da2fa732bf * fix white-space in table. 2022-08-10 03:08:56 +00:00
xieqiyu 930d72178e * Code for task#63790. 2022-08-09 22:39:41 +08:00
liumengyi 7252dc6b7c * Finish task #63694. 2022-08-09 14:51:15 +08:00
liuhong 2a5c5521fe *Finish task #35865. 2022-08-08 08:37:08 +00:00
liuhong 0578dd3cfb *Finish task #35865. 2022-08-08 06:40:19 +00:00
liumengyi 175a703f11 * Fix bug #26020. 2022-08-05 10:49:10 +08:00
leiyong 3a55d594c3 * Finish task#60375. 2022-07-11 07:18:52 +00:00
zhouxudong c23b4fe7b6 * Finish task #59536 #59537. 2022-07-05 07:34:49 +00:00
王怡栋 e05ac602cc Merge branch 'master_xieqiyu_58567' into 'master' 
Master xieqiyu 58567

See merge request easycorp/zentaopms!4197
 2022-06-28 09:31:57 +00:00
xieqiyu 92926fce1d * Finish task#58567. 2022-06-28 16:48:45 +08:00
leiyong a5b4a79ea8 * Adjust code. 2022-06-28 05:26:37 +00:00
王怡栋 2f837a3970 Merge branch 'sprint209_leiyong_task_58598' into 'master' 
Sprint209 leiyong task 58598

See merge request easycorp/zentaopms!4167
 2022-06-28 01:42:06 +00:00
leiyong 808d67b879 * Adjust code. 2022-06-27 10:32:20 +00:00