Commit Graph
3114 Commits
Author SHA1 Message Date
孙广明 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
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
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
liyuchun 412fbb2305 * Finish task #44370. 2021-11-16 16:25:00 +08:00
孙广明 5fbdcff3c2 * Add measurement menu. 2021-11-15 16:01:16 +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
李玉春 e91ff87867 Merge branch 'sprint/171_sgm_43948' into 'sprint/168'
* Fix errors.

See merge request easycorp/zentaopms!343
2021-11-08 08:53:02 +00:00
孙广明 870b311f06 * Fix errors. 2021-11-08 16:32:18 +08:00
李玉春 b0e267571a Merge branch 'sprint/171_sgm_43948' into 'sprint/168'
Sprint/171 sgm 43948

See merge request easycorp/zentaopms!340
2021-11-08 07:53:34 +00:00
孙广明 c2a9dd1d7b * Fix kanban details. 2021-11-08 15:39:35 +08:00
孙广明 3965d5339b * Finish task #44002, #44003... 2021-11-08 13:12:25 +08:00
孙广明 932d73fd12 * Fix menu. 2021-11-08 09:18:15 +08:00
孙广明 d420eba707 * Finish task #44005. 2021-11-05 11:24:19 +08:00
孙广明 f9978c4841 * Code for task #44005. 2021-11-04 17:07:37 +08:00
孙广明 75d547998c * Code for task #44005. 2021-11-04 16:55:37 +08:00
Hao Sun 171eb2f32e * fix modern js syntax not work in ie11. 2021-11-04 09:46:25 +08:00
Hao Sun f786d077e4 * improve layout of execution kanban. 2021-11-02 11:17:12 +08:00
Hao Sun 2b9f96e513 * refactor. 2021-11-02 11:16:56 +08:00
liyuchun 7d31524581 * Fix bug #15861. 2021-11-01 13:45:43 +08:00
李玉春 44ad6d63a4 Merge branch 'sprint/168_sunhao/improve_kanban' into 'sprint/168'
* Fix kanban not work in program, product or project page.

See merge request easycorp/zentaopms!225
2021-10-29 05:44:50 +00:00
Hao Sun 1e39ba869a * remove product card shadow. 2021-10-29 10:36:00 +08:00
xiawenlong 3dc8358434 Finish permissionOC 2021-10-29 10:09:07 +08:00
liyuchun 817178e93b * Add button of set WIP and column name. 2021-10-28 16:19:16 +08:00
李玉春 f9b40d2887 Merge branch 'sprint/168' into 'sprint/168_sgm_43393'
# Conflicts:
#   module/execution/js/kanban.js
2021-10-28 06:47:11 +00:00
孙广明 6c32c9a397 Merge branch 'sprint/tengfei_168_lang' into 'sprint/168'
Sprint/tengfei 168 lang

See merge request easycorp/zentaopms!192
2021-10-28 03:32:04 +00:00
孙广明 83f3079804 * Finish task #43393. 2021-10-28 11:01:50 +08:00
reneeteng cf5682ef5b * Edit api lang and related files. 2021-10-28 10:11:52 +08:00
孙广明 be167bcafb Merge branch 'sprint/168_liyuchun_43424' into 'sprint/168'
* Finish task #43519,#43503.

See merge request easycorp/zentaopms!185
2021-10-27 07:46:11 +00:00
liyuchun d0b9dda4d7 * Finish task #43519,#43503. 2021-10-27 15:41:36 +08:00
Hao Sun 7e8d65f34e * fix window.columnRenderers works with defaultCardType. 2021-10-27 14:53:45 +08:00
孙广明 7ad0747fd6 Merge branch 'sprint/168_zenggang' into 'sprint/168'
* Fix menu pri judge

See merge request easycorp/zentaopms!159
2021-10-26 07:57:05 +00:00
孙广明 fb5687c6a4 Merge branch 'sprint/168' into 'sprint/168_sunhao/kanban_demo'
# Conflicts:
#   module/execution/js/kanban.js
#   module/execution/view/kanban.html.php
2021-10-26 07:53:38 +00:00
zenggang 1da7061d7a * Fix menu pri judge 2021-10-26 07:49:56 +00:00
Hao Sun 43d52ddb9b * improve style for affixed header in kanban. 2021-10-26 14:54:16 +08:00
tianshujie f8447c9825 * Correct Kanban data. 2021-10-26 11:46:33 +08:00
Hao Sun 920b8234a3 + add kanban demo files. 2021-10-26 11:42:23 +08:00
tianshujie 3d22a50a00 * Create the single execution Kanban lane and Kanban column. 2021-10-25 14:13:44 +08:00
liyuchun b32541f20f * Fix bug #15639. 2021-10-19 20:32:06 +08:00
zhujinyong fc2e75eeb8 * Fix languages. 2021-10-19 15:59:07 +08:00
王怡栋 6ee64dffe7 Merge branch 'api_doc' into sprint/167 2021-10-19 11:36:19 +08:00