Design/EasySoft-ZenTaoPMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 30 Wiki Activity
43,232 Commits 2 Branches 292 Tags
ca91a4c8aafafc2dffe242d95dfd4c9b35afefe0
Commit Graph
1107 Commits
Author SHA1 Message Date
王怡栋 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
liyuchun d960846c16 * Fix bug #14805. 2022-04-24 09:10:01 +00:00
liyuchun ade40aaa75 * Fix bug #12931. 2022-04-19 09:26:41 +08:00
xieqiyu bcee37d2a9 * Fix bug#6959. 2022-04-14 14:10:09 +08:00
tianshujie 2e5b43979e * Fix bug #21641. 2022-04-13 09:51:40 +08:00
王怡栋 53b0cd0c57 * code for bug #20133. 2022-04-08 11:27:23 +08:00
孙广明 af9545b817 Merge branch 'sprint/master_fixbug' into 'master' 
* Fix bug #21403,21474,21410,21414,21417.

See merge request easycorp/zentaopms!2756
 2022-04-07 07:57:51 +00:00
tanghucheng 3d3ffe9348 * Fix bug #21403,21474,21410,21414,21417,21456. 2022-04-07 15:27:54 +08:00
zenggang 2429bc7f6e * Fix bug#20886,16610 2022-04-07 01:58:09 +00:00
孙广明 ed276fb0fe Merge branch 'master_xieqiyu_20882' into 'master' 
* Fix bug#20882.

See merge request easycorp/zentaopms!2743
 2022-04-02 08:10:56 +00:00
xieqiyu 0ab12f5d80 * Fix bug#20882. 2022-04-02 13:07:33 +08:00
zenggang 8c1b36fb3d * Fix bug#13131,16610 2022-04-01 07:49:52 +00:00
tianshujie f7fd08aaa3 * Fix bug #20789. 2022-04-01 13:27:26 +08:00
孙广明 2907e3171d Merge branch 'fixbugs_zhouxin_15286' into 'master' 
* Fix bug #15286.

See merge request easycorp/zentaopms!2645
 2022-03-30 09:15:38 +00:00
zhouxin 88982a5e0e * Fix bug #15286. 2022-03-30 08:29:20 +00:00
tianshujie b452680fb3 * Fix bug #14841. 2022-03-30 14:48:34 +08:00
王怡栋 fe91dc8481 Merge branch 'pailei2' 2022-03-22 09:01:03 +08:00
tanghucheng b9542612cb * Fix bug. 2022-03-16 09:51:36 +08:00
tanghucheng 9cffc3bcf7 * Fix bug #20754,20776,20759. 2022-03-15 11:13:26 +08:00
tianshujie 3c25a51bf2 * Fix bug #20738. 2022-03-14 16:59:51 +08:00