Commit Graph
421 Commits
Author SHA1 Message Date
孙广明 c42cca1249 Merge branch 'sprint/168' 2021-11-30 14:38:32 +08:00
孙广明 38619abdd8 * Finish task #45160. 2021-11-30 11:08:33 +08:00
hufangzhou 6d03387d4b * Add the new version. 2021-11-22 16:48:28 +08:00
王怡栋 b3d6e63430 Merge branch 'sprint/168' into 'sprint/172_liyuchun_44367'
# Conflicts:
#   db/update15.9.sql
2021-11-17 06:38:50 +00:00
liyuchun 06d7434989 * Finish task #44367. 2021-11-17 08:26:43 +08:00
liyuchun 412fbb2305 * Finish task #44370. 2021-11-16 16:25:00 +08:00
zhujinyong 3ec178de54 * Fix sql error. 2021-11-10 13:52:25 +08:00
zhujinyong 40e2faf15e * Fix sql error. 2021-11-10 13:50:29 +08:00
tianshujie eedcc1aed5 * Modify code logic. 2021-11-09 10:28:16 +08:00
孙广明 1f49e46582 * Finish task #43948. 2021-11-08 14:29:10 +08:00
孙广明 612c6e0728 * Add weekly and holiday. 2021-11-08 09:07:16 +08:00
tianshujie 6cb70ab01d * Finish task #43903. 2021-11-05 08:59:55 +08:00
孙广明 75d547998c * Code for task #44005. 2021-11-04 16:55:37 +08:00
tianshujie e893c7f6c3 * Add upgrade sql. 2021-11-04 15:42:39 +08:00
hufangzhou 8b1b92bdfc * Add the version. 2021-11-02 12:37:51 +08:00
xieqiyu c08c981ab0 * Display the sub Lane view kanban. 2021-11-01 13:13:56 +08:00
xieqiyu 6035a7f700 * Add data to the Kanban lane table. 2021-10-28 17:24:20 +08:00
tianshujie 3d22a50a00 * Create the single execution Kanban lane and Kanban column. 2021-10-25 14:13:44 +08:00
朱金勇 b0ba5cff66 Merge branch 'sprint/167_xiawenlong' into 'sprint/167'
update sql.

See merge request easycorp/zentaopms!114
2021-10-19 11:32:35 +00:00
zhujinyong f81f49ea5d + Add charset of zentao.sql. 2021-10-19 19:27:53 +08:00
xiawenlong 99fd35321f fix sql. 2021-10-19 19:14:24 +08:00
hufangzhou bf96595c5d * Fix an error for install sql. 2021-10-19 14:20:49 +08:00
王怡栋 6ee64dffe7 Merge branch 'api_doc' into sprint/167 2021-10-19 11:36:19 +08:00
王怡栋 eec51b9f69 * adjust for zentao sql. 2021-10-11 16:18:41 +08:00
王怡栋 b70381885a * add new version and upgrade. 2021-09-14 11:36:00 +08:00
王怡栋 462d61fcf3 * adjust priv and fix bug for view assigned todo. 2021-09-09 10:25:06 +08:00
dingguodong 314c3c593e Merge branch 'jihuMR' 2021-09-07 20:47:10 +08:00
王怡栋 4eee4d5523 Merge branch '15.4' 2021-09-02 19:21:30 +08:00
王怡栋 a90a378321 * finish task #41707. 2021-08-27 18:02:41 +08:00
dingguodong 38f7285ff4 * Update zt_mr table. 2021-08-23 17:01:40 +08:00
王怡栋 7cdd3d5d00 * fix bug #14565. 2021-08-23 16:14:27 +08:00
王怡栋 2c842367ef * fix for upgrade. 2021-08-23 15:12:38 +08:00
dingguodong 0a8c4b40f1 * Change plural to singulative. 2021-08-20 15:37:15 +08:00
Guan Xiying 120a2cd068 * Fix create zt_mr table sql. 2021-08-19 10:20:38 +08:00
holan20180123 c913b9a95d * Finish task #41543. 2021-08-19 08:28:57 +08:00
reneeteng 354b119a2c Merge branch 'master' of https://github.com/easysoft/zentaopms 2021-08-17 10:03:12 +08:00
dingguodong 4a43e87e35 * Add zt_mr database table. 2021-08-13 13:57:24 +08:00
holan20180123 dba3acf631 Merge branch 'master' of http://gitlab.zcorp.cc/easycorp/zentaopms 2021-08-13 08:12:17 +08:00
holan20180123 e107e0a660 * Finish task #41245. 2021-08-12 17:28:41 +08:00
tianshujie98 3e86bf4da9 * Finish task #41226. 2021-08-12 16:14:56 +08:00
reneeteng 09dd10e192 * Optimize lang files. 2021-08-11 15:52:35 +08:00
tianshujie98 751900edf9 * Finish task #41215. 2021-08-10 11:31:15 +08:00
hufangzhou 43ce84beee * Add the tableContents function privilege. 2021-08-06 11:14:45 +08:00
wangyidong bbe793a8aa Merge branch '15.2' 2021-08-02 16:31:42 +08:00
wangyidong 0a131fe8db * finish task #40432. 2021-07-29 15:12:10 +08:00
dingguodong c68a5aea7a * Change display text for corn of job module. 2021-07-27 10:31:03 +08:00
dingguodong 443f016f25 * Finish task #40406 (change jenkins variables to general name). 2021-07-21 13:57:20 +08:00
dingguodong cfd37eb46d * Revert jenkins related files. 2021-07-20 16:48:41 +08:00
dingguodong 661dcdcc13 + Add engine column to zt_job. 2021-07-20 16:13:48 +08:00
dingguodong e5ea831b9d * Change jenkins variables to general name. 2021-07-20 16:05:43 +08:00