Commit Graph
605 Commits
Author SHA1 Message Date
hufangzhou e55c40278d * Add the new version. 2022-08-25 09:31:18 +08:00
liyuchun a9b8582cc9 * Add cron task. 2022-08-25 08:57:01 +08:00
liyuchun b2189bf529 Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms 2022-08-25 08:55:31 +08:00
liyuchun 0f1d8abfdf * Add filed in zt_job. 2022-08-25 08:55:18 +08:00
xieqiyu 99e4534f38 Merge branch 'master' into master_xieqiyu_draftStory 2022-08-22 17:29:21 +08:00
sunguangming 9d52e47151 Merge branch 'sprint/228_tianshujie_64967' 2022-08-22 10:24:40 +08:00
王怡栋 e8654f20a9 Merge branch 'master' into 'sprint/zentaomax42'
# Conflicts:
#   db/update17.5.sql
2022-08-19 02:34:50 +00:00
tianshujie 98694da2ae Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms into sprint/228_tianshujie_64967 2022-08-18 16:47:14 +08:00
tianshujie 399f6b53d9 * Finish task #64967. 2022-08-18 15:08:07 +08:00
tianshujie 9f468e6d24 * Finish task #64976. 2022-08-18 14:35:19 +08:00
王怡栋 bff1d42c2f Merge branch 'sprint/zentaomax42_lanzongjun' into 'sprint/zentaomax42'
* finish task #64943

See merge request easycorp/zentaopms!4997
2022-08-18 01:57:13 +00:00
lanzongjun c28e0748dd * finish task #64943 2022-08-17 16:39:55 +08:00
王怡栋 fe898f9e20 Merge branch 'sprint/224_tianshujie_63687' into 'sprint/228'
Sprint/224 tianshujie 63687

See merge request easycorp/zentaopms!4985
2022-08-17 07:33:25 +00:00
wangyidong 97700ca723 * fix for MYISAM to InnoDB. 2022-08-16 08:27:17 +08:00
hufangzhou f98716d88f * Add the xuan update sql to zentao.sql. 2022-08-15 10:53:56 +08:00
tianshujie 4f08c31607 Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms into sprint/224_tianshujie_63687 2022-08-15 10:48:36 +08:00
zhujinyong 9ebd84ddcb + Add bi sql. 2022-08-15 10:09:32 +08:00
xieqiyu 17773dee90 * Code for story of add draft status. 2022-08-12 16:00:00 +08:00
tianshujie 1838710b42 * Finish task #63696,63695,63687. 2022-08-10 09:02:49 +08:00
liyuchun 02b18d8174 * Fix error of zentao.sql 2022-08-05 05:12:32 +00:00
王怡栋 000038f12f Merge branch 'sprint/gantt_upgrade' into 'master'
Sprint/gantt upgrade

See merge request easycorp/zentaopms!4807
2022-08-05 01:58:16 +00:00
wangyidong 7796bc8499 Merge branch 'sprint/devplat_30' 2022-08-05 08:46:26 +08:00
lanzongjun f241846903 resolve conflict 2022-08-05 08:43:09 +08:00
daitingting a292bc7438 * Add createdBy,createdDate fields in build table. 2022-08-04 07:39:24 +00:00
wangyidong c98ee9e323 * fix for searchindex table fulltext index. 2022-08-04 09:40:58 +08:00
mayue dfeafd9dbd * Add key for zt_task. 2022-08-04 09:21:05 +08:00
wangyidong f5b6edef01 Merge branch 'sprint/devplat_30' 2022-08-04 09:13:53 +08:00
王怡栋 8675278f16 Merge branch 'master' into 'sprint/221_tianshujie_62940'
# Conflicts:
#   db/update17.4.sql
2022-08-03 01:35:27 +00:00
wangyidong 99c5aab19a * code for task #62739. 2022-08-02 16:18:38 +08:00
tianshujie c13808d8df * Finish task #62943,62941,62940,62942. 2022-08-02 15:01:24 +08:00
daitingting daa5ca846d * Add createdBy and createdDate in these tables. 2022-08-02 00:52:00 +00:00
mayue 62b3b33910 * Add update17.4.sql. 2022-08-01 16:53:49 +08:00
caoyanyi abd4b2aa6f * Update sql. 2022-07-27 08:25:37 +08:00
caoyanyi 9037038690 * Modify data name. 2022-07-18 10:36:26 +08:00
lanzongjun eac15cf70a * fix bug #25172 2022-07-13 16:04:15 +08:00
lanzongjun 47aed9058f * fix task #60360 2022-07-13 10:16:07 +08:00
wangyidong 6757d64f6e * fix field type. 2022-07-11 16:16:59 +08:00
wangyidong 6d71c5e346 * fix bug #24794. 2022-07-07 13:18:25 +08:00
孙广明 6f1521407c * Add cfd cron. 2022-07-06 09:07:13 +08:00
孙广明 25028997fa * Finish task #59701. 2022-07-05 15:03:15 +08:00
hufangzhou 4336b35a36 * Fix bug #24626. 2022-06-30 15:13:34 +08:00
hufangzhou ab1a43e1c6 * Change the xuan version. 2022-06-30 09:10:00 +08:00
王怡栋 f1c9378e10 Merge branch 'sprint/devplat_29' into 'master'
* Add fields to integrate workflow and approval.

See merge request easycorp/zentaopms!4224
2022-06-29 09:08:21 +00:00
tanghucheng a4966c759b * Fix bug #24552. 2022-06-29 16:27:58 +08:00
liugang 21ea84f2f5 * Add fields to integrate workflow and approval. 2022-06-29 16:21:06 +08:00
hufangzhou cb49804253 * Add the new version. 2022-06-29 13:18:20 +08:00
liumengyi cca9efbb77 * Finish task #58561. 2022-06-28 10:33:05 +08:00
tanghucheng 6226497d08 * Code for install max. 2022-06-23 16:51:30 +08:00
孙广明 33dd17eb8a Merge branch 'sprint/207_mayue_bug#23765' into 'master'
Sprint/207 mayue bug#23765

See merge request easycorp/zentaopms!4094
2022-06-23 05:30:16 +00:00
王怡栋 748f1ffedf Merge branch 'master' into 'sgm_prjadmin'
# Conflicts:
#   db/update17.1.sql
2022-06-23 05:00:48 +00:00