Design/EasySoft-ZenTaoPMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 30 Wiki Activity
48,794 Commits 2 Branches 292 Tags
c45cc998547597ed4e0d82db33a94de955f85ca4
Commit Graph
449 Commits
Author SHA1 Message Date
Yagami a4bf3c06d0 * Finish task #76972. 2022-11-22 11:02:24 +08:00
wangyidong 148d3d6d6b Merge branch 'master' into zentaopms_239 2022-10-27 11:39:47 +08:00
tianshujie a72173cd72 * Finish task #73752. 2022-10-26 15:49:13 +08:00
wangyuting2 aa9bc2b8ec * Fix systemMode bug. 2022-10-10 07:32:11 +00:00
wangyidong 8fdde5fa0e * code for task #71616. 2022-10-10 11:31:03 +08:00
daitingting dc0ecc890e * Optimize codes. 2022-09-06 05:26:47 +00:00
tianshujie b59b8b1c39 * Fix bug #25478. 2022-07-20 11:25:11 +08:00
sunjun 1404449da1 sprint/211_sunjun_60474 2022-07-11 09:09:29 +00:00
liumengyi 957d6f3249 * Fix bug of task #59469. 2022-07-06 11:11:45 +08:00
hufangzhou eebcfaad58 * Adjust the spacing of dynamic block and dynamic page. 2022-06-24 13:33:11 +08:00
王怡栋 9ffdc942c2 Merge branch 'master' into 'sprint/205' 
# Conflicts:
#   module/execution/lang/en.php
#   module/execution/lang/zh-cn.php
 2022-06-22 09:21:12 +00:00
hufangzhou ac69cd1afb * Finish task #57883. 2022-06-22 10:39:55 +08:00
tianshujie 7372f7f936 * Finish story #32623. 2022-06-22 08:51:05 +08:00
zhouxudong d8ba49e688 * Finisha task #57872. 2022-06-21 06:01:59 +00:00
zhouxudong 4dd1445e8b * Finish task #57872. 2022-06-21 05:48:57 +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
tianshujie 3033d3e567 * Fix bug #23258. 2022-06-07 09:42:05 +08:00
孙广明 61ad544156 Merge branch 'zentaopms_198' 2022-06-02 15:04:56 +08:00
孙广明 cf5dbf0f23 * Remove unused code. 2022-06-02 14:53:51 +08:00
孙广明 23d19bd6b3 * Code for export users. 2022-06-02 14:52:16 +08:00
mayue 1965426827 * Finish task #55852. 2022-06-02 13:22:13 +08:00
孙广明 f79844fd99 * Merge create user btn. 2022-06-01 15:40:49 +08:00
liumengyi 3c053ada91 * Add english lang item. 2022-04-21 13:11:14 +08:00
liumengyi 80bbd19c9d * Fix bug #19143. 2022-04-21 13:00:36 +08:00
sunjun 8b96fe80bf *Fixbug_sunjun_21521 2022-04-11 14:00:16 +08:00
李玉春 a0c697e670 Merge branch 'cyy_bug' into 'master' 
Cyy bug

See merge request easycorp/zentaopms!2810
 2022-04-08 01:13:44 +00:00
caoyanyi 4819b30292 * Fix bug #18018. 2022-04-07 16:50:05 +08:00
zenggang 6deba0c240 * Fix bug #21103,21176 2022-04-07 07:44:39 +00:00
Wenrui LI c3d025f199 * fix unable to reorder in dynamic view, bug #21046. 2022-03-25 11:05:46 +08:00
Wenrui LI c53d0c6295 * fix dynamic order select styles, task #51310, bug #20973. 2022-03-22 11:03:33 +08:00
王怡栋 3c1865c527 * adjust code for order by. 2022-03-14 17:28:14 +08:00
王怡栋 c1f3258a74 * adjust for get dynamic. 2022-03-14 16:08:58 +08:00
王怡栋 185ae2a4f8 * fix bug #20560. 2022-03-10 17:23:50 +08:00
zhujinyong b17c3c8206 * Move die to return print. 2022-02-22 08:42:32 +08:00
zhujinyong 5bd64d9312 Merge branch 'lite' into sprint/185 2022-02-17 08:56:40 +08:00
zhouxudong c7211f7164 *Fix bug #13636. 2022-02-14 16:50:33 +08:00
zhouxudong 5ec1d31b76 *Fix bug #13636. 2022-02-07 11:11:48 +08:00
tanghucheng 268fa200a9 * fix bug #19022. 2022-01-28 16:04:01 +08:00
tanghucheng 640dd2ce1b * Delete product for dynamic search. 2022-01-21 13:11:52 +08:00
liyuchun 7e96eb9f68 Merge branch 'devops19' 2022-01-19 16:55:57 +08:00
liyuchun 4bf49c5da7 * Finish task #47232. 2022-01-13 16:25:56 +08:00
liumengyi dc8da347b6 * Fix bug #18293. 2022-01-11 08:54:15 +08:00
hufangzhou 22f322fb94 * Fix bug #18220. 2022-01-05 20:47:05 +08:00
孙广明 c8db935f34 Merge branch '180' 2022-01-04 22:41:23 +08:00
xieqiyu 5c4609d302 * Modify review problem. 2021-12-31 15:43:27 +08:00
王怡栋 061bf4388c * adjust for unit test. 2021-12-30 10:08:00 +08:00
zhujinyong 45cdfc8f59 Merge branch 'xuan' 2021-12-14 09:08:15 +08:00
朱金勇 161233a64f Merge branch 'sprint/176_xieqiyu_45536' into 'master' 
Sprint/176 xieqiyu 45536

See merge request easycorp/zentaopms!884
 2021-12-10 06:15:15 +00:00
xieqiyu ad8ed52f22 * Code for task#45536. 2021-12-10 10:57:56 +08:00