Commit Graph
1615 Commits
Author SHA1 Message Date
lanzongjun 5583916635 * fix bug 2022-10-20 15:46:59 +08:00
hufangzhou e8879c8ad7 * Fix bug #28718. 2022-10-20 05:33:25 +00:00
hufangzhou ee0a444bde * Adjust the type of fields. 2022-10-19 06:48:45 +00:00
hufangzhou d3f7df5518 * Add the new version. 2022-10-19 05:41:40 +00:00
王怡栋 e093a27d20 Merge branch 'master' into 'tanghucheng_feedback_module'
# Conflicts:
#   db/update17.6.2.sql
2022-10-19 01:36:16 +00:00
tanghucheng 484cffa1a1 * Add ticket module. 2022-10-19 09:33:26 +08:00
王怡栋 6e9fd55261 Merge branch 'master' into 'sprint/zentaobiz14_feedback_lanzongjun'
# Conflicts:
#   db/update17.6.2.sql
2022-10-19 00:29:18 +00:00
lanzongjun c452bd3595 task #72131 2022-10-19 08:27:20 +08:00
lanzongjun 7469bebf0a task #72131 2022-10-18 16:53:10 +08:00
tanghucheng 6c063505d6 Merge branch 'master' into tanghucheng_feedback_module 2022-10-18 15:33:45 +08:00
tanghucheng ccd017af47 * Finish task #72201,72130,72129. 2022-10-18 15:04:35 +08:00
lanzongjun aa6546a2ee resolve conflict 2022-10-18 09:26:14 +08:00
wangyuting2 f348f1d29d * Add report db. 2022-10-17 07:19:00 +00:00
周鑫 575bee545a Merge branch 'ticket_zhouxin_71832' into 'sprint/zentaobiz12_ticket'
* Add sql for ticket.

See merge request easycorp/zentaopms!5746
2022-10-13 06:49:19 +00:00
lanzongjun 477db5f7f2 add table 2022-10-13 14:19:34 +08:00
zhouxin 3f33a5810c * Add sql for ticket. 2022-10-13 12:12:38 +08:00
wangyidong 91ae21caec Merge branch 'master' into sprint/feedback_module 2022-10-11 09:33:25 +08:00
lanzongjun f9f49755c1 add sql 2022-10-08 17:04:23 +08:00
lanzongjun 4f79024d88 add sql 2022-10-08 16:47:33 +08:00
lanzongjun 7845fd0aca add sql 2022-10-08 16:35:58 +08:00
lanzongjun 949d430fd4 add sql 2022-10-08 09:30:19 +08:00
lanzongjun 2a7b35764f * modify db 2022-09-30 10:16:57 +08:00
liugang 0c11f5b232 * Optimize. 2022-09-30 09:36:41 +08:00
wangyidong d300ee00da Merge branch 'master' into zentaopms_239 2022-09-30 09:07:53 +08:00
wangyidong daa0ea847c * rename update sql to 18.0. 2022-09-30 08:51:22 +08:00
wangyidong a88cc7454d Merge branch 'sprint/zentaopms240' into zentaopms_239 2022-09-30 08:49:33 +08:00
李玉春 e3802d13c4 Merge branch 'zentaopms_239' into 'zentaopms_239_wangjianhua_70790'
# Conflicts:
#   db/update17.6.1.sql
2022-09-29 07:06:53 +00:00
lanzongjun 398bc004e2 modify sql 2022-09-29 14:00:32 +08:00
曹延义 2f7ed68fa2 * Add kanban setting check. 2022-09-29 09:43:43 +08:00
wangjianhua 9004734f5c * Change variable name projectList to projects. 2022-09-28 20:51:15 +08:00
wangjianhua b9954010ba * Link project and repo. 2022-09-28 16:59:32 +08:00
liugang 6c2a324e40 * Create view to filter the shadow products. 2022-09-28 16:30:28 +08:00
liugang 537fd26d8f * Create view to save the normal products. 2022-09-28 16:12:26 +08:00
lanzongjun f7b1163f39 modify db 2022-09-28 15:32:34 +08:00
wangzemei bcd3d36418 * modify backend logic 2022-09-27 17:10:18 +08:00
daitingting f7d564e837 * Finish task #70200. 2022-09-26 09:38:11 +00:00
lanzongjun 1264f361ee * add database 2022-09-26 16:50:38 +08:00
lanzongjun ba9c9552b0 * add database 2022-09-26 13:56:57 +08:00
tianshujie 3a9b2c4952 * Modify the SQL. 2022-09-26 08:12:53 +08:00
朱金勇 d3911c77e6 Merge branch 'sprint/241_tianshujie_fixbug' into 'master'
Sprint/241 tianshujie fixbug

See merge request easycorp/zentaopms!5518
2022-09-23 16:05:19 +00:00
hufangzhou 952f0395c9 * Add the new version 2022-09-23 16:33:40 +08:00
tianshujie c689dd0f0a * Fix bug #27688. 2022-09-23 13:50:36 +08:00
tianshujie 63fc7c0595 * Fix bug #27688. 2022-09-22 14:54:07 +08:00
lanzongjun 7fd743aef6 * fix upgrade selectmode 2022-09-21 08:39:35 +08:00
lanzongjun 429a08cb1a * finish task #69700 2022-09-20 10:11:02 +08:00
lanzongjun 305e8cd794 * finish task #69698#69703#69704#69705 2022-09-20 08:58:41 +08:00
daitingting bfe47dbdb5 * Add noExecution field in project table.
* Set noExecution of project accord to projectMode.
2022-09-16 06:54:35 +00:00
孙广明 ac994fc477 Merge branch 'zentaopms_239' into 'sgm_69027'
# Conflicts:
#   db/update17.6.1.sql
2022-09-16 00:46:21 +00:00
liugang 00857783d7 * Change the rule to create the shadow product's name. 2022-09-15 13:52:12 +08:00
liugang 3b97ed9213 * Fix bug of upgrade the exist projects. 2022-09-15 09:30:46 +08:00