Design/EasySoft-ZenTaoPMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 30 Wiki Activity
40,381 Commits 2 Branches 292 Tags
58e7a4ff19d768511bb488bb693ffdb4aa0212e6
Commit Graph
950 Commits
Author SHA1 Message Date
zhouxin 68b8268391 * Finish task #55258. 2022-06-13 01:25:38 +00:00
wangyidong 11e6edcd22 Merge branch 'zdoo18' 2022-06-08 17:06:07 +08:00
liumengyi 5511a51882 * Fix bug #23340. 2022-06-08 10:35:41 +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
liumengyi 6e4ac95a48 * Fix bug #23340. 2022-06-07 10:35:13 +08:00
wangyidong fb786e9cf6 * remove useless flow action. 2022-06-02 15:02:38 +08:00
wangyidong 2400dfc83a * code for task #55568. 2022-06-01 14:48:35 +08:00
tianshujie ae096f635c * Fix bug #22979. 2022-05-26 21:32:07 +08:00
tianshujie 53e95069e4 * Fix bug #22979. 2022-05-26 21:08:37 +08:00
tianshujie 8c2654c7d2 * Fix bug #22979. 2022-05-26 13:55:49 +08:00
tianshujie 017019f6af * Fix bug #22952,22979. 2022-05-26 11:35:47 +08:00
李玉春 b41cdeb6f4 Merge branch 'sprint/194_tianshujie_55257' into 'master' 
Sprint/194 tianshujie 55257

See merge request easycorp/zentaopms!3594
 2022-05-25 08:08:26 +00:00
tianshujie 8e3068d9b5 * Finish task #55257. 2022-05-25 14:26:21 +08:00
tianshujie e3d1c44eae * Finish task #55257. 2022-05-25 13:45:10 +08:00
mayue 33b78769b4 * Fix bug #22901. 2022-05-25 05:28:36 +00:00
孙华伟 9e9395694d *Fix bug #22375. 2022-05-19 15:27:37 +08:00
liumengyi 2d3f07a300 * Code format fot task #54318. 2022-05-19 10:35:12 +08:00
liumengyi dee4ff7043 * Finish task #54318. 2022-05-19 08:55:27 +08:00
孙华伟 4bc08301f8 *Fix bug #22375 2022-05-17 10:40:11 +08:00
孙华伟 3ae610d77d Update model.php 2022-05-16 08:27:21 +00:00
孙华伟 94af8b93af *Optimize the code. 2022-05-16 16:26:19 +08:00
孙华伟 ecea8c6147 Update model.php 2022-05-16 08:24:40 +00:00
孙华伟 4c968d5872 *Optimize the code. 2022-05-16 16:21:34 +08:00
孙华伟 39c0ad9c17 *Finish task #54207. 2022-05-16 16:08:30 +08:00
wangyidong aa0f666d41 * adjust for project flow. 2022-05-12 15:52:24 +08:00
wangyuting2 d4ed89e64a * Finish task #53548. 2022-05-11 15:05:13 +08:00
daitingting e30acad1f2 * Add id for checking unique field. 2022-05-09 07:56:17 +00:00
daitingting 96e460c47d * Finish task #53549. 2022-05-09 06:41:35 +00:00
李玉春 e6c646f6bd Merge branch 'sprint/fixbug_liumengyi_2441' into 'master' 
* Fix bug #2441.

See merge request easycorp/zentaopms!3198
 2022-04-28 08:26:06 +00:00
liumengyi 2780f01d00 * Fix bug #2441. 2022-04-28 16:21:37 +08:00
mayue 94c3a3a270 * Fix bug #10878. 2022-04-28 07:50:01 +00:00
孙广明 8010daa536 Merge branch 'sprint/master_zhouxudong_15338' into 'master' 
* Fix bug #15338.

See merge request easycorp/zentaopms!3140
 2022-04-26 09:12:31 +00:00
zhouxudong 9851bc1047 * Fix bug #15338. 2022-04-26 09:10:29 +00:00
zhouxudong a55f5f9df6 * Fix bug #15338. 2022-04-26 09:03:06 +00:00
zenggang 9e1f09d37a * Fix bug#21982,21983 2022-04-26 03:25:12 +00:00
孙广明 37733991df Merge branch 'fixbug_21140' into 'master' 
*Fixbug_21140

See merge request easycorp/zentaopms!3107
 2022-04-25 06:42:26 +00:00
sunjun 1cf2e5e541 *Fixbug_21140 2022-04-25 13:10:55 +08:00
wangyidong 0705daa805 * adjust for performance issue. 2022-04-25 08:55:03 +08:00
caoyanyi b8c0f822d9 * Add response data. 2022-04-22 05:38:48 +00:00
王怡栋 a8983445c8 Merge branch 'master' into 'sprint/master_zhouxudong_17994' 
# Conflicts:
#   module/bug/model.php
#   module/task/model.php
 2022-04-13 07:52:03 +00:00
王怡栋 c273c3aefe Merge branch 'sprint/master_zhouxudong_21700' into 'master' 
* Fix bug #21700.

See merge request easycorp/zentaopms!2904
 2022-04-13 07:19:18 +00:00
zhouxudong dcdbf60bdf * Fix bug #17994. 2022-04-13 11:07:22 +08:00
tanghucheng 0c2c898c01 * Fix bug #21576. 2022-04-13 10:46:44 +08:00
zhouxudong 7ac526401d * Fix bug #21700. 2022-04-13 10:08:53 +08:00
zhouxudong 1dd4af6ff3 * Fix bug #17994. 2022-04-13 09:26:20 +08:00
zhouxudong 233a035b12 * Fix bug #17994. 2022-04-12 17:23:24 +08:00
zhouxudong 8baef621d2 * Fix bug #17994. 2022-04-12 16:50:56 +08:00
xieqiyu a60f498ea8 * Modify review code. 2022-04-11 17:23:59 +08:00
xieqiyu ee5d43bea9 * Fix bug#18080. 2022-04-11 08:53:28 +08:00