Commit Graph
1445 Commits
Author SHA1 Message Date
wangyidong 660c82b46e * adjust for change table engine in upgrade. 2022-08-08 14:05:50 +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 0ce2b35004 * fix for change table engine for upgrade. 2022-08-04 11:51:03 +08: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 d4c95e6e9c Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms 2022-08-04 09:14:41 +08:00
wangyidong f5b6edef01 Merge branch 'sprint/devplat_30' 2022-08-04 09:13:53 +08:00
mayue 0ab5b2956d * Finish task #62892. 2022-08-04 09:07:37 +08:00
tianshujie 6661f80c81 * Fix bug #25984. 2022-08-03 14:19:00 +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
daitingting b834dc794f * Finish task #62919,#62923,#62924. 2022-08-02 07:43:12 +00: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 7b18471a21 * Modify update sql. 2022-07-27 15:38:17 +08:00
hufangzhou 9bfb42cffd * Add the new version. 2022-07-27 15:01:41 +08:00
李玉春 8fe00ca4cd Merge branch 'master' into 'cyy_repo'
# Conflicts:
#   db/update17.3.sql
2022-07-27 00:31:56 +00:00
caoyanyi abd4b2aa6f * Update sql. 2022-07-27 08:25:37 +08:00
wangyidong ba89545efb * fix bug. 2022-07-26 17:11:33 +08:00
caoyanyi c10c25b84d * Modify branch get. 2022-07-26 16:16:17 +08:00
caoyanyi 4c8474d335 * Modify gitea use git command. 2022-07-26 14:40:17 +08:00
tianshujie 4078ed9068 * Fix bug #25185. 2022-07-26 13:59:09 +08:00
tianshujie bf5495565f * Fix bug #25185. 2022-07-26 13:47:56 +08:00
caoyanyi 364cf79920 * Add sql. 2022-07-19 08:35:02 +08:00
caoyanyi 9037038690 * Modify data name. 2022-07-18 10:36:26 +08:00
lanzongjun 32eef59eaf * add standard sql 2022-07-14 09:05:46 +08:00
lanzongjun eac15cf70a * fix bug #25172 2022-07-13 16:04:15 +08:00
hufangzhou d133a2b5e8 * Add the new version. 2022-07-13 13:28:45 +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
朱金勇 0766e36e20 Merge branch 'sprint/scx_api' into 'master'
* Update api.

See merge request easycorp/zentaopms!4185
2022-06-28 05:57:43 +00:00
宋辰轩 afdde557fc * Update api. 2022-06-28 13:51:10 +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
wangyuting2 e8dbad3b19 * Add approval field to zt_workflow. 2022-06-28 08:33:59 +08:00
tanghucheng 6226497d08 * Code for install max. 2022-06-23 16:51:30 +08:00