Commit Graph
24733 Commits
Author SHA1 Message Date
孙广明 00912a7d52 * Finish task #43985. 2021-11-11 13:26:33 +08:00
Hao Sun 467201be5d * refactor: rename css class name to follow the code specification. 2021-11-11 10:36:20 +08:00
Hao Sun e257cb37ce * make docs tree in left side sortable. 2021-11-11 10:35:00 +08:00
李玉春 4d9387059b Merge branch 'sprint/168_sgm_docbtn' into 'sprint/168'
* Remove unused btn.

See merge request easycorp/zentaopms!392
2021-11-11 01:17:48 +00:00
孙广明 c50592d978 Merge branch 'sprint/168_liyuchun_16107' into 'sprint/168'
* Fix bug #16107.

See merge request easycorp/zentaopms!377
2021-11-11 01:07:49 +00:00
孙广明 b99febf1b3 * Remove unused btn. 2021-11-11 09:00:25 +08:00
李玉春 900de67361 Merge branch 'sprint/171_sgm_43998' into 'sprint/168'
* Finish task #43998.

See merge request easycorp/zentaopms!376
2021-11-10 02:35:22 +00:00
liyuchun 1c7e707e41 * Fix bug #16107. 2021-11-10 10:24:02 +08:00
孙广明 6d625bb597 * Finish task #43998. 2021-11-10 09:43:04 +08:00
Hao Sun a233ecdf4b * fix iframe modal show double times on click at second time. 2021-11-09 19:55:15 +08:00
孙广明 df8701d4cb Merge branch 'sprint/168_liyuchun_43941' into 'sprint/168'
* Finish task #43941.

See merge request easycorp/zentaopms!369
2021-11-09 09:24:15 +00:00
liyuchun 00d9bc4d7f * Sort execution kanban. 2021-11-09 17:22:42 +08:00
liyuchun 876c9e3877 * Finish task #43941. 2021-11-09 17:04:31 +08:00
孙广明 b4e9ab871d Merge branch 'sprint/168' into 'sprint/168_liyuchun_43982'
# Conflicts:
#   module/kanban/lang/en.php
#   module/kanban/lang/zh-cn.php
2021-11-09 08:57:01 +00:00
liyuchun cec2fd2c42 * Finish task #43960. 2021-11-09 16:42:22 +08:00
liyuchun 108208de6b * Finish task #43982. 2021-11-09 15:09:25 +08:00
孙广明 dc2e2cba79 * Adjust doc css. 2021-11-09 14:57:42 +08:00
孙广明 521a8e871d * Finish task #44139. 2021-11-09 14:39:07 +08:00
李玉春 60766cee16 Merge branch 'sprint/168_sgm_43995' into 'sprint/168'
* Finish task #43955.

See merge request easycorp/zentaopms!359
2021-11-09 06:36:52 +00:00
孙广明 21d6cbd160 * Fix logic error. 2021-11-09 14:24:49 +08:00
Hao Sun 7e9f72ab57 * improve UI for dropdown menu in doc side tree. 2021-11-09 13:38:37 +08:00
孙广明 a8ce426a32 Merge branch 'sprint/168' into 'sprint/168_liyuchun_43954'
# Conflicts:
#   module/kanban/lang/en.php
#   module/kanban/lang/zh-cn.php
2021-11-09 05:04:22 +00:00
孙广明 954221334b * Finish task #43955. 2021-11-09 10:38:09 +08:00
liyuchun 7589eca470 * Finish task #43954. 2021-11-09 09:50:00 +08:00
孙广明 72a6f47b38 Merge branch 'spirnt/168_liyuchun_bug' into 'sprint/168'
* Finish task #43933.

See merge request easycorp/zentaopms!353
2021-11-09 01:16:47 +00: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
liyuchun f634d5f20d * Finish task #43933. 2021-11-09 08:59:56 +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
孙广明 9f85b1a557 * Fix kanban error. 2021-11-08 18:22:02 +08:00
孙广明 d49b7eac72 * Fix kanban error. 2021-11-08 17:35:09 +08:00
李玉春 c97af049d8 Merge branch 'sprint/171_sgm_43948' into 'spirnt/168_liyuchun_bug'
Sprint/171 sgm 43948

See merge request easycorp/zentaopms!346
2021-11-08 09:04:11 +00:00
孙广明 c7529ca96f * Code for task #43998. 2021-11-08 17:01:31 +08:00
liyuchun bddeb2d5b2 * Remove more button in group lane. 2021-11-08 16:50:12 +08: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
孙广明 3d00ecc5b0 * Fix an error. 2021-11-08 15:48:58 +08:00
孙广明 c2a9dd1d7b * Fix kanban details. 2021-11-08 15:39:35 +08:00
李玉春 e8039ed93a Merge branch 'sprint/171_sgm_43948' into 'sprint/168'
* Finish task #43948.

See merge request easycorp/zentaopms!337
2021-11-08 07:01:13 +00:00
孙广明 1f49e46582 * Finish task #43948. 2021-11-08 14:29:10 +08:00
李玉春 f4734d8249 Merge branch 'sprint/sgm_168_44003' into 'sprint/168'
Sprint/sgm 168 44003

See merge request easycorp/zentaopms!334
2021-11-08 06:13:06 +00:00
孙广明 d37ce3b5a3 Merge branch 'spirnt/168_liyuchun_bug' into 'sprint/168'
Spirnt/168 liyuchun bug

See merge request easycorp/zentaopms!331
2021-11-08 05:40:56 +00:00
liyuchun 743f03c2cf * Finish task #43929. 2021-11-08 13:35:49 +08:00
孙广明 791be24fb7 * Remove unused code. 2021-11-08 13:27:17 +08:00
孙广明 869faaeaaa * Remove unused code. 2021-11-08 13:26:26 +08:00
孙广明 1ecb25aabc * Code for task #43994. 2021-11-08 13:18:53 +08:00
孙广明 2fb46989d3 * Code for task #43997. 2021-11-08 13:15:56 +08:00
liyuchun e8f2b39833 * Finish task #43929. 2021-11-08 13:15:17 +08:00
孙广明 3965d5339b * Finish task #44002, #44003... 2021-11-08 13:12:25 +08:00