Commit Graph
3157 Commits
Author SHA1 Message Date
孙广明 c42cca1249 Merge branch 'sprint/168' 2021-11-30 14:38:32 +08:00
李玉春 4b223ec01b Merge branch 'sprint/174_mayue_44987,44988,44989' into 'master'
* Finish task #44987,44988,44989.

See merge request easycorp/zentaopms!657
2021-11-30 05:02:41 +00:00
mayue d89aa24c8c * Finish task #44987,44988,44989. 2021-11-30 10:32:11 +08:00
王怡栋 ef2385a150 Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms 2021-11-30 09:38:44 +08:00
王怡栋 85d498c5cb * replace lib for markdown to html. 2021-11-30 09:38:12 +08:00
李玉春 0cf53a32e0 Merge branch 'sprint/174_songchenxuan_45048' into 'master'
* Finish task 45048.

See merge request easycorp/zentaopms!650
2021-11-29 09:37:35 +00:00
songchenxuan 908f51250b * Fix bug #15737. 2021-11-29 16:17:04 +08:00
王怡栋 21e42772b2 * add lang for api. 2021-11-29 15:29:00 +08:00
mayue a77510b311 * Finish task #44987,44988,44989. 2021-11-29 15:11:16 +08:00
王怡栋 d41d6cf262 * adjust for api. 2021-11-26 13:28:45 +08:00
孙广明 c5e7bd91c3 * Fix php 5.3 bug. 2021-11-24 15:06:09 +08:00
孙广明 c6d990a3f5 * Fix bug #16530. 2021-11-23 16:26:30 +08:00
王怡栋 74a41448dc * add lang for mobile api. 2021-11-23 09:35:16 +08:00
hufangzhou 6d03387d4b * Add the new version. 2021-11-22 16:48:28 +08:00
Hao Sun b011796c15 * fix php syntax error. 2021-11-22 15:33:59 +08:00
Hao Sun 6619652319 * append special class to body in client mode. 2021-11-22 15:10:00 +08:00
liumengyi e477c580bf * Fix Bug #16505. 2021-11-22 10:28:18 +08:00
liyuchun 8cde6c30d4 * Finish task #44357,#44358. 2021-11-19 12:26:23 +08:00
王怡栋 fde5cb61da Merge branch 'sprint/app10' into sprint/170 2021-11-19 08:41:00 +08:00
李玉春 ba8ec26e96 Merge branch 'sprint/170_zhouxin_44486,44487,44488' into 'sprint/170'
Add realBegan for program.

See merge request easycorp/zentaopms!529
2021-11-18 09:21:25 +00:00
zhouxin 88938892b0 Add realBegan for program. 2021-11-18 16:49:11 +08:00
李玉春 3870f6f9e4 Merge branch 'sprint/170_zhouxin_44486,44487,44488' into 'sprint/170'
Finis task #44486,44487,44488.

See merge request easycorp/zentaopms!495
2021-11-18 06:30:03 +00:00
zhouxin b658a98de3 Fix some problem. 2021-11-18 14:13:32 +08:00
王怡栋 3510f6ef63 * code for task #44321. 2021-11-18 11:20:39 +08:00
Hao Sun 13d5803ce1 * adjust card style in kanban: remove border. 2021-11-18 10:35:39 +08:00
Hao Sun ebae1b755e * apply border color with execution status. 2021-11-17 17:56:37 +08:00
Hao Sun a6accd9c50 * refactor: remove console.log. 2021-11-17 17:54:12 +08:00
Hao Sun 6ad007f06e * task #44357, refactor executions kanban with kanban component and support dnd. 2021-11-17 17:51:20 +08:00
mayue bf7e878ae4 * Fix bug #16257. 2021-11-17 17:44:22 +08:00
zhouxin b7e3fe9003 Finis task #44486,44487,44488. 2021-11-17 15:49:24 +08:00
李玉春 1161128163 Merge branch 'sprint/170_lizhiqiang_44489' into 'sprint/170'
* Finish task#44489.

See merge request easycorp/zentaopms!485
2021-11-17 06:52:16 +00:00
lizhiqiang 6b2a45fa70 * Finish task#44489. 2021-11-17 14:47:49 +08:00
李玉春 3700fa0e63 Merge branch 'sprint/170_mayue_44493,44494' into 'sprint/170'
Sprint/170 mayue 44493,44494

See merge request easycorp/zentaopms!484
2021-11-17 06:44:22 +00:00
李玉春 4d605316d1 Merge branch 'sprint/170_lizhiqiang_44489' into 'sprint/170'
Finish task #44489.

See merge request easycorp/zentaopms!474
2021-11-17 06:36:07 +00:00
mayue 51709b88d5 * Finish task #44493,44494. 2021-11-17 14:32:24 +08:00
mayue 8b8c4fe180 * Finish task #44493,44494. 2021-11-17 09:30:34 +08:00
mayue 102561019d * Finish task #44493,44494. 2021-11-16 18:20:35 +08:00
mayue 7d496eebc2 * Finish task #44493,44494. 2021-11-16 17:05:03 +08:00
liyuchun 412fbb2305 * Finish task #44370. 2021-11-16 16:25:00 +08:00
lizhiqiang 2212f7473b Finish task #44489. 2021-11-16 16:03:07 +08:00
孙广明 5fbdcff3c2 * Add measurement menu. 2021-11-15 16:01:16 +08:00
李玉春 81f49bd434 Merge branch 'sprint/170_mayue_43892' into 'sprint/170'
* Fix bug #16191.

See merge request easycorp/zentaopms!413
2021-11-11 08:01:22 +00:00
mayue c9996a26ec * Fix bug #16191. 2021-11-11 15:54:22 +08:00
leiyong 088a6374df * Finish task#44172,task#44273. 2021-11-11 05:26:27 +00:00
zhujinyong 37b486ad1c * Replace htmlspecialchars to htmlSpecialString for compatibility. 2021-11-10 14:57:48 +08:00
mayue 7247a7d4b5 * Finish task #43892. 2021-11-10 11:13:37 +08:00
李玉春 ca4fb1a6ce Merge branch 'sprint/168_sgm_43995' into 'sprint/168'
* Adjust kanban details.

See merge request easycorp/zentaopms!355
2021-11-09 01:15:25 +00:00
孙广明 f9f26953aa * Adjust kanban details. 2021-11-09 09:10:07 +08:00
李玉春 6c1200a086 Merge branch 'sprint/168_sunhao/fix_js_syntax' into 'sprint/168'
* Fix modern js syntax not work in ie11 or older browser.

See merge request easycorp/zentaopms!301
2021-11-09 00:36:56 +00:00
李玉春 d66bd6f3d3 Merge branch 'sprint/168_sunhao/improve_kanban' into 'sprint/168'
* Adjust kanban layout.

See merge request easycorp/zentaopms!278
2021-11-09 00:32:48 +00:00