Design/EasySoft-ZenTaoPMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 30 Wiki Activity
41,478 Commits 2 Branches 292 Tags
4d16cbf4dc9f8fbcbdfc462594de6d3d825e5a39
Commit Graph
1076 Commits
Author SHA1 Message Date
zhouxudong 0a86bc474f * Fix bug #24417. 2022-06-29 07:10:13 +00:00
zhouxudong a1794e7ef6 * Finish task #24398. 2022-06-29 06:27:01 +00:00
zhouxudong afb37ddeeb * Fix bug #24398. 2022-06-29 06:15:44 +00:00
孙广明 d104fe7e72 * Fix bug #24423. 2022-06-28 15:48:23 +08:00
王怡栋 afae79d45f Merge branch 'sgm_fixbug' into 'master' 
* Fix bug #24406.

See merge request easycorp/zentaopms!4188
 2022-06-28 06:31:17 +00:00
孙广明 56a5488efc * Fix bug #24406. 2022-06-28 14:25:02 +08:00
王怡栋 956c806cf9 Merge branch 'master' into 'sprint/208_liumengyi_58561' 
# Conflicts:
#   db/update17.1.sql
 2022-06-28 05:08:18 +00:00
liumengyi cca9efbb77 * Finish task #58561. 2022-06-28 10:33:05 +08:00
孙广明 c3cf1eab05 * Add de/fr lang. 2022-06-28 09:45:47 +08:00
孙广明 bc47df0018 * Finish task #59081. 2022-06-28 09:23:27 +08:00
孙广明 4f8fc5f122 * Code css file. 2022-06-24 11:07:17 +08:00
孙广明 00f264d26c * Fix bugs. 2022-06-24 09:30:56 +08:00
wangyidong 439f555e45 Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms 2022-06-23 14:23:43 +08:00
孙广明 6d88c0c22b * Code for code error. 2022-06-23 14:16:01 +08:00
孙广明 a2b913d05f * Add upgrade logic. 2022-06-23 13:33:25 +08:00
王怡栋 748f1ffedf Merge branch 'master' into 'sgm_prjadmin' 
# Conflicts:
#   db/update17.1.sql
 2022-06-23 05:00:48 +00:00
孙广明 65a162536a * Fix details. 2022-06-23 11:27:55 +08:00
王怡栋 77d1ab4daf Merge branch 'master' into 'sprint/206_liumengyi_58288' 
# Conflicts:
#   db/update17.1.sql
 2022-06-23 01:46:35 +00:00
孙广明 458688e636 * Code for project admin. 2022-06-23 09:46:34 +08:00
王怡栋 c69384617a Merge branch 'master_xieqiyu_57850' into 'master' 
* Code for task#57850.

See merge request easycorp/zentaopms!4083
 2022-06-23 00:39:25 +00:00
孙广明 a67ba3e0aa * Code for project admin. 2022-06-22 23:07:27 +08:00
孙广明 a58607bbaa * Code for task #58217. 2022-06-22 18:25:02 +08:00
王怡栋 03c76b1565 Merge branch 'master' into 'sprint/206' 
# Conflicts:
#   db/update17.1.sql
 2022-06-22 07:26:11 +00:00
liumengyi 8f0073050f * Finish task #58288. 2022-06-22 15:23:38 +08:00
xieqiyu 21b0217aa8 * Code for task#57850. 2022-06-22 13:15:44 +08:00
liumengyi 2fce450bb8 * Fix bug for task #58063. 2022-06-22 09:54:08 +08:00
tianshujie 7372f7f936 * Finish story #32623. 2022-06-22 08:51:05 +08:00
mayue d97b5aeb97 * Fix bug #23765. 2022-06-21 13:30:00 +08:00
tianshujie 837849a41a * Finish task #57895. 2022-06-20 14:38:48 +08:00
liyuchun e447ec9a11 * Remove unused code. 2022-06-16 08:57:09 +00:00
孙广明 089662bd5e * Finish task #56629. 2022-06-14 10:20:29 +08:00
tianshujie 450ecef008 * Fix bug #23201. 2022-06-13 10:12:29 +08:00
zhouxudong 94c8b0a523 * Finish task #56374. 2022-06-10 01:32:52 +00:00
leiyong 70ee0323f6 * Fix bug#23487. 2022-06-09 06:48:21 +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
sunjun c4d2cfe200 fixbug_sunjun_sprint194 2022-05-25 03:19:07 +00:00
xieqiyu 5e314ba343 * Finish task#54984. 2022-05-24 15:50:52 +08:00
liumengyi 96785175b6 * Finish story #29765. 2022-05-24 10:52:43 +08:00
liumengyi dfa70c678b * Finish task #54349. 2022-05-17 16:51:19 +08:00
xieqiyu c01b9f54cf * Fix bug#22496. 2022-05-16 16:40:25 +08:00
xieqiyu 5ee54fb81a * Fix bug#22496. 2022-05-16 16:30:24 +08:00
tianshujie b715ecd177 * Finish task #53655. 2022-05-11 11:13:41 +08:00
孙华伟 d8d0d71e3e *Optimize the bug. 2022-04-28 15:06:59 +08:00
孙华伟 9395fe3210 *Fix new bug. 2022-04-28 14:33:40 +08:00
孙华伟 c11b818bc0 Update privbygroup.html.php 2022-04-28 05:20:26 +00:00
孙华伟 0cd1a57430 Update en.php 2022-04-28 05:18:35 +00:00
孙华伟 2817457166 *Add english. 2022-04-28 13:17:06 +08:00
孙华伟 95db914e93 *Optimize the bug. 2022-04-28 13:15:24 +08:00
孙华伟 4282d601bc *Fix bug#8180 2022-04-28 11:29:21 +08:00