Commit Graph
25581 Commits
Author SHA1 Message Date
Yagami 78ea82597b * Fix bug #13545. 2021-07-14 10:13:17 +08:00
Guan Xiying 1c802f2a36 Merge branch 'jihu' 2021-07-14 09:48:58 +08:00
zenggang 6255a862c7 Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms 2021-07-14 09:38:25 +08:00
zenggang 86a0e7d8bf finish task #40123 2021-07-14 09:32:48 +08:00
qiyu-xie 1f7e04e6f0 * Add no data tips when look execution kanban. 2021-07-14 09:31:50 +08:00
Guan Xiying be054d1c2b Merge branch 'jihu' of https://gitlab.zcorp.cc/easycorp/zentaopms into jihu 2021-07-14 09:28:49 +08:00
Guan Xiying 6f2ae70f06 * Merge from mapi branch. 2021-07-14 09:28:34 +08:00
Guan Xiying ac8fb7783f Merge branch 'jihu' of https://gitlab.zcorp.cc/easycorp/zentaopms into jihu 2021-07-14 09:16:21 +08:00
dingguodong e8c9118515 * Correct function comment, and keep func code stay. 2021-07-14 09:08:57 +08:00
hufangzhou 73394d0435 Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms 2021-07-13 18:20:52 +08:00
hufangzhou a4db5380eb * Finish task #40000. 2021-07-13 18:20:48 +08:00
dingguodong a519be7fb6 * Bug fix when assign user on story in execution. 2021-07-13 17:43:59 +08:00
qiyu-xie 020ab8d8b8 * Finish task#40010. 2021-07-13 17:41:18 +08:00
wangyidong 753943fe07 * adjust for pinyin abbr. 2021-07-13 17:38:25 +08:00
wangyidong 9fe62d4386 * finish task #40121. 2021-07-13 17:37:55 +08:00
dingguodong fee5d53f94 * Optimize import issue and bug fix. 2021-07-13 16:50:46 +08:00
qiyu-xie 876721d267 * Adjust other language item. 2021-07-13 16:31:47 +08:00
qiyu-xie 3a9492c7cc * Add other language item. 2021-07-13 16:28:26 +08:00
holan20180123 e276882ea8 * Fix bug #13603. 2021-07-13 16:20:07 +08:00
Yagami 9d2a4f70d9 * Finish task #40129. 2021-07-13 16:04:28 +08:00
hufangzhou b76d6f2b3e Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms 2021-07-13 15:49:27 +08:00
hufangzhou fd4b4f3b35 * Adjust the font color in drop menu. 2021-07-13 15:49:23 +08:00
qiyu-xie d51930784c * Fix a bug. 2021-07-13 15:47:43 +08:00
qiyu-xie 9d4e2a4dd1 * Fix a bug. 2021-07-13 15:26:19 +08:00
tianshujie98 e23de07bee Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms 2021-07-13 15:17:16 +08:00
tianshujie98 132d5484f9 * Adjust code. 2021-07-13 15:17:04 +08:00
qiyu-xie da283bc32d * Fix a bug. 2021-07-13 15:17:02 +08:00
dingguodong dd7d97fc04 * Add private column to sql file. 2021-07-13 15:00:58 +08:00
tianshujie98 8c6f5898ea * Fix an error. 2021-07-13 15:00:40 +08:00
qiyu-xie 7fd8cdf8fd * Finish task#40013. 2021-07-13 14:49:29 +08:00
Yagami bc40429ad6 * Fix details. 2021-07-13 14:49:22 +08:00
tianshujie98 690980d60a * Fix an error. 2021-07-13 14:41:02 +08:00
dingguodong c8b3045fc9 * Rename pipline to pipeline. 2021-07-13 14:39:20 +08:00
dingguodong b3641df7b2 * Display icon name in lang setting. 2021-07-13 14:36:01 +08:00
hufangzhou 51eb6980c1 Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms 2021-07-13 14:23:03 +08:00
hufangzhou 7626959450 * Adjust the label background color. 2021-07-13 14:22:59 +08:00
王怡栋 65a43e49a3 Merge branch '15.0' into 'master'
* update picker js.

See merge request easycorp/zentaopms!4
2021-07-13 06:18:45 +00:00
hufangzhou d11e847832 Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms 2021-07-13 14:11:37 +08:00
hufangzhou 09b2caf838 * Adjust the project order in project drop menu. 2021-07-13 14:11:32 +08:00
wangyidong 637acf434a * adjust for show image. 2021-07-13 14:10:27 +08:00
tianshujie98 e2f6101340 * Add start and end date judgment. 2021-07-13 14:00:34 +08:00
holan20180123 2e8884d86c * Fix bug #13585. 2021-07-13 13:51:21 +08:00
tianshujie98 1926cb7ad9 * Fix bug #13579. 2021-07-13 13:41:57 +08:00
qiyu-xie f689717078 * Add permissions to the executive Kanban. 2021-07-13 13:41:21 +08:00
tianshujie98 6977cf91ed * Add select all. 2021-07-13 13:38:14 +08:00
Yagami 7ef07b30ba * Finish task #40113. 2021-07-13 13:37:44 +08:00
hufangzhou dafebe5d95 Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms 2021-07-13 13:33:34 +08:00
hufangzhou e007087966 * Finish task #39999. 2021-07-13 13:33:14 +08:00
wangyidong c523e60eb0 Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms 2021-07-13 13:30:15 +08:00
wangyidong 503815289a * finish task #40114. 2021-07-13 13:29:50 +08:00