Design/EasySoft-ZenTaoPMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 30 Wiki Activity
41,145 Commits 2 Branches 292 Tags
08d27f8d7958f8fcf693aab55152fa126dff147c
Commit Graph
553 Commits
Author SHA1 Message Date
xieqiyu a757ea76c1 * Code for task#58567. 2022-06-28 17:23:20 +08:00
xieqiyu 3d7fd651db * Code for task#58567. 2022-06-28 16:11:40 +08:00
hufangzhou eebcfaad58 * Adjust the spacing of dynamic block and dynamic page. 2022-06-24 13:33:11 +08:00
zenggang f1c802d979 * Fix bug#24184 2022-06-23 07:28:21 +00:00
hufangzhou 48fb1a45f0 * Fix bug #24151. 2022-06-22 16:50:42 +08:00
tianshujie 226a7fc69b * Finish task #57893. 2022-06-21 16:37:35 +08:00
tianshujie f6f4bc5f7c * Finish task #57894. 2022-06-21 15:13:21 +08:00
tianshujie 42aa5a0f28 * Finish task #57894. 2022-06-21 14:05:36 +08:00
tianshujie b812104494 * Finish task #57894. 2022-06-21 13:14:06 +08:00
tianshujie 9585c4f031 * Finish task #57894. 2022-06-21 11:26:07 +08:00
tianshujie 30bff5f852 * Finish task #57894. 2022-06-21 11:15:16 +08:00
孙广明 b896377846 * Change zentao license. 2022-06-08 10:02:29 +08:00
孙广明 b528156589 * Change license. 2022-06-08 09:34:46 +08:00
leiyong 71a4c1099d * Adjust the prompt text for plugin expiration. 2022-05-26 10:39:16 +00:00
leiyong ea4eb1d2de * Finish task#54979. 2022-05-26 07:28:03 +00:00
zhouxudong 925aa3f8d8 * Finish task #54480. 2022-05-17 08:12:27 +00:00
zhouxudong c097334f3b * Finish task #54480. 2022-05-17 07:58:26 +00:00
zhouxudong cca3f56437 * Finish task #54480. 2022-05-17 07:38:22 +00:00
sunjun 445279bb1a *Fixbug_sunjun_17828 2022-04-28 05:26:17 +00:00
xieqiyu 565ea292d3 * Fix bug#21642. 2022-04-20 14:31:47 +08:00
zhouxin 1571548411 * Fix bug #21654. 2022-04-12 01:34:40 +00:00
zhouxin d79f9f22e4 * Fix bug #21320. 2022-04-11 06:14:00 +00:00
zhouxin 50fe51a2e5 * Fix bug #21320. 2022-04-11 01:18:40 +00:00
孙广明 1c8f929a0d Merge branch 'liyuchun_fixbug' into 'master' 
* Fix bug #13324.

See merge request easycorp/zentaopms!2684
 2022-04-02 06:49:30 +00:00
liyuchun 4240b563c9 * Fix bug #21061. 2022-04-01 10:27:27 +08:00
Zongjun Lan 7c99a6153d * fix bug gantt 2022-03-29 16:11:21 +08:00
王怡栋 15a3516aca Merge branch 'master' into 165_package 2022-03-28 08:50:18 +08:00
Zongjun Lan 47b88a959d * fix bug classic user edit and batchedit 2022-03-25 10:15:31 +08:00
Zongjun Lan b80761648b * fix bug classic vision 2022-03-25 09:36:56 +08:00
liyuchun 81c04c08e9 * Fix bug #17367. 2022-03-25 09:20:22 +08:00
Wenrui LI 4a36b134cd * fix hidden vision inputs. 2022-03-22 11:06:54 +08:00
Wenrui LI e920e855eb * add hidden vision input if vision is not shown. 2022-03-22 10:51:40 +08:00
Wenrui LI 450f2d7d89 * remove user vision field if there is no other vision available, task #51318, bug #20691. 2022-03-21 17:06:12 +08:00
tanghucheng 72095bf38a * Fix bug #20803. 2022-03-15 16:31:27 +08:00
tanghucheng 6e0066af25 * Merge code. 2022-03-10 16:19:26 +08:00
孙广明 97859c945b Merge branch 'master' into 'sprint/master_tanghucheng_fixbug' 
# Conflicts:
#   module/user/js/batchcreate.js
#   module/user/view/batchcreate.html.php
 2022-03-10 08:07:31 +00:00
tanghucheng 31588aacc7 * Adjust for batchcreate user. 2022-03-10 15:23:40 +08:00
tanghucheng 76fd14c845 * Adjust for create user. 2022-03-10 12:09:33 +08:00
王怡栋 53c2dd44fb * fix bug #20113. 2022-03-10 10:31:10 +08:00
王怡栋 f5d4dfc9ad * code for task #49356. 2022-03-09 10:53:08 +08:00
王怡栋 b960a07ecf * code for task #49352. 2022-03-08 10:52:48 +08:00
tianshujie 38d53186ba * Modify the code. 2022-03-07 15:34:10 +08:00
tianshujie 1e11c1b4e1 * Fix bug #20287. 2022-03-07 14:15:15 +08:00
王怡栋 a783b5d736 Merge branch 'master' into 'sprint/master_tanghucheng_fix' 
# Conflicts:
#   db/update16.4.sql
#   module/user/view/batchcreate.html.php
 2022-03-07 05:25:38 +00:00
tanghucheng 79a38cc9ad * Fix bug. 2022-03-07 13:04:06 +08:00
tianshujie 8215369e8d * Modify the code. 2022-03-07 12:26:44 +08:00
tianshujie 01d0a6b902 * Finish task #50311. 2022-03-07 11:32:10 +08:00
tianshujie 391d9cc18b * Fix bug #20090. 2022-03-02 10:02:27 +08:00
孙广明 7ba3ed1dfc Merge branch 'spring/185_zhengrunyu_49305' into 'sprint/185' 
* Fix bug 19941 19923 19922 19787.

See merge request easycorp/zentaopms!1980
 2022-02-25 05:26:24 +00:00
zhengrunyu b641170d85 * Fix bug 19941 19923 19922 19787. 2022-02-25 11:01:31 +08:00