Design/EasySoft-ZenTaoPMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 30 Wiki Activity
44,300 Commits 2 Branches 292 Tags
12e8aebfb269cacbaaa654cf16c906fcd62d76be
Commit Graph
327 Commits
Author SHA1 Message Date
胡方舟 2027a69923 Merge branch 'sprint/228' into 'master' 
Sprint/228

See merge request easycorp/zentaopms!5015
 2022-08-18 07:53:30 +00:00
liumengyi 62d465d047 * Finish task #65551. 2022-08-18 11:22:16 +08:00
liumengyi a998967592 * Finish task #65551. 2022-08-18 08:21:33 +08:00
liumengyi 6dc929d1db * Fix bug #25319. 2022-08-17 10:58:25 +08:00
liumengyi 33fa12239e * Fix bug #25319. 2022-08-17 10:56:09 +08:00
wangyidong 0d6be2f360 * fix for sql error when change table engine. 2022-08-15 17:56:30 +08:00
wangyidong 811c1d2ad6 * adjust for change table engine. 2022-08-15 13:04:24 +08:00
wangyidong a7da22c833 Merge branch 'sprint/224_hufangzhou_doc' 2022-08-12 16:42:20 +08:00
wangyidong 9a3513a15c * change for change table engine. 2022-08-12 16:11:35 +08:00
liumengyi c376a0b74c * Optimize language item. 2022-08-10 15:44:36 +08:00
liumengyi 880f39ddf0 * Fix bug #25319. 2022-08-10 13:48:25 +08:00
liumengyi d80080b67b * Fix bug #25319. 2022-08-10 13:39:35 +08:00
liumengyi e8d7949d25 * Fix bug #25806. 2022-07-28 15:16:06 +08:00
zhouxudong 26babb4762 * Fix bug #25105. 2022-07-14 01:58:45 +00:00
zhouxudong d2fe52d3b2 * Finish task #60394 #60392 #60389. 2022-07-11 06:55:36 +00:00
zhouxudong b5475f51b2 * Finish task #60394 #60392 #60389. 2022-07-11 03:28:17 +00:00
tianshujie ba16bac74f * Add permission judgment. 2022-06-27 10:05:18 +08:00
tianshujie e2669481c7 * Added German and French. 2022-06-22 15:28:45 +08:00
王怡栋 03c76b1565 Merge branch 'master' into 'sprint/206' 
# Conflicts:
#   db/update17.1.sql
 2022-06-22 07:26:11 +00:00
tianshujie 7372f7f936 * Finish story #32623. 2022-06-22 08:51:05 +08:00
tianshujie 30bff5f852 * Finish task #57894. 2022-06-21 11:15:16 +08:00
tianshujie 69df74b3c5 * Finish task #57895. 2022-06-20 17:11:02 +08:00
tianshujie 24fcb20079 * Finish task #57895. 2022-06-20 17:04:29 +08:00
tianshujie 837849a41a * Finish task #57895. 2022-06-20 14:38:48 +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
Zongjun Lan 81791ba223 * fix bug #21181 2022-03-28 16:23:08 +08:00
liyuchun 4882c5c6cd * Fix bug #20430. 2022-03-23 09:39:10 +08:00
tanghucheng 987d0d0443 * Fix bug #20968,20964. 2022-03-21 17:00:42 +08:00
zhujinyong 90d2447cae - Remove die() of admin module. 2021-12-20 09:13:32 +08:00
liyuchun d392f0e44c * Code for task #41764. 2021-08-26 17:59:58 +08:00
zhujinyong 1677574443 * return before $this->send. 2021-07-16 09:40:41 +08:00
Yagami 38f23c454e * Adjust code. 2021-04-14 15:52:29 +08:00
leiyong e97e88f0c5 * Adjust language items. 2021-04-01 12:52:15 +03:00
Yagami 88b7632ac0 * Fix bug. 2021-04-01 11:43:18 +08:00
qiyu-xie f06361ffcc * Fix bug#11665. 2021-03-31 09:29:09 +08:00
Yagami 50fe4e5033 * Finish add left top btn task. 2021-03-23 11:45:15 +08:00
zhujinyong 6582a700bb * Fix story of project. 2021-03-21 16:11:07 +08:00
zhujinyong a6eff425ca * Adjust menu logic. 2021-03-21 12:15:55 +08:00
Yagami 2f5eb04e08 * Merge code. 2021-03-19 15:14:14 +08:00
leiyong bcf500a081 * Finish task#36317. 2021-03-12 09:51:11 +08:00
zhujinyong c869d88cc2 * Fix css style of *.html.php 2021-03-10 23:35:56 +08:00
zhujinyong f54307a4cc * Fix code style. 2021-03-10 23:07:20 +08:00
Yagami 9516eeafff * Finish task #36481. 2021-03-09 15:22:30 +08:00
hufangzhou 1a75c3c3e1 * Finish task #36433. 2021-03-09 13:25:16 +08:00
qiyu-xie d02eee1c8a * Fix bug. 2021-03-08 11:05:27 +08:00
leiyong e133e198e3 * Adjust the language item. 2021-03-08 10:35:54 +08:00
leiyong 65ba71cec3 * Adjust admin module code. 2021-03-08 09:37:03 +08:00
wangyidong 6bf40e474d Merge branch '12.x' 2021-02-19 13:17:23 +08:00
wangyidong e5b0134b22 * finish task #9114. 2021-01-29 14:27:32 +08:00