Commit Graph
24767 Commits
Author SHA1 Message Date
孙广明 5fbdcff3c2 * Add measurement menu. 2021-11-15 16:01:16 +08:00
tanghucheng 939023de6d * Finish task #44023 for max. 2021-11-15 10:19:35 +08:00
孙广明 aa50ceb485 Merge branch 'spirnt/171_liyuchun_16208' into 'sprint/168'
* Fix bug #16208.

See merge request easycorp/zentaopms!430
2021-11-15 00:51:01 +00:00
孙广明 e638de03fa Merge branch 'spirnt/171_liyuchun_bug' into 'sprint/168'
* Fix bug #16165.

See merge request easycorp/zentaopms!429
2021-11-15 00:33:26 +00:00
李玉春 68653946e5 Merge branch 'sprint/171_sgm_sortwiki' into 'sprint/168'
Sprint/171 sgm sortwiki

See merge request easycorp/zentaopms!435
2021-11-12 05:24:19 +00:00
孙广明 be6d12a15e Merge branch 'sprint/171_liyuchun_16182' into 'sprint/168'
Sprint/171 liyuchun 16182

See merge request easycorp/zentaopms!431
2021-11-12 05:20:24 +00:00
孙广明 4bc3f4c03a * Fix details. 2021-11-12 13:17:37 +08:00
孙广明 7130de00a8 Merge branch 'sprint/168_sunhao/doc_tree_sortable' into 'sprint/168'
* Fix drop shadow element position.

See merge request easycorp/zentaopms!433
2021-11-12 05:13:54 +00:00
孙广明 9d6c421176 * Fix bug #16203. 2021-11-12 13:03:56 +08:00
Hao Sun 6890e9535f * fix drop shadow element position. 2021-11-12 11:35:50 +08:00
liyuchun 1838b65ad1 * Fix bug #16182. 2021-11-12 11:29:46 +08:00
孙广明 70c1981893 * Fix bug #16059. 2021-11-12 11:23:35 +08:00
liyuchun 7dd3525a66 * Fix bug #16163. 2021-11-12 11:17:42 +08:00
liyuchun fa1ffa32bb * Fix bug #16163. 2021-11-12 11:13:37 +08:00
liyuchun 1ae2cffc7c * Fix bug #16165. 2021-11-12 11:01:04 +08:00
liyuchun 4865431f22 * Fix bug #16166. 2021-11-12 10:36:57 +08:00
liyuchun 36b10d3983 * Fix bug #16173. 2021-11-12 10:19:41 +08:00
孙广明 278bb30646 * Fix bug #16055. 2021-11-12 09:45:18 +08:00
孙广明 d9da6613ac * Fix bug #16050. 2021-11-12 09:32:34 +08:00
孙广明 a075c72531 * Fix execution update order. 2021-11-12 09:28:37 +08:00
liyuchun 7d4e1240cd * Fix bug #16174. 2021-11-12 09:12:20 +08:00
liyuchun cc75d05280 * Adjust lane name when update kanban lane. 2021-11-12 09:05:52 +08:00
liyuchun af1c32a406 * Fix bug #16208. 2021-11-12 08:43:50 +08:00
tanghucheng af0b70bb6a * Adjust index.js for zentaomax. 2021-11-12 08:20:33 +08:00
孙广明 9eed12e7f4 Merge branch 'sprint/168_liyuchun_44216' into 'sprint/168'
* Finish task #44217,#44218,#44219,#44220.

See merge request easycorp/zentaopms!405
2021-11-11 08:46:24 +00:00
孙广明 a742b36ef7 * Finish task #43987. 2021-11-11 16:40:53 +08:00
liyuchun 06c1daf5fd * Finish task #44216. 2021-11-11 15:12:16 +08:00
liyuchun 5bb53b1000 * Finish task #44216. 2021-11-11 15:02:56 +08:00
孙广明 b0d73a4e6c Merge branch 'sprint/168_liyuchun_16054' into 'sprint/168'
* Fix bug #16054.

See merge request easycorp/zentaopms!374
2021-11-11 05:32:19 +00:00
孙广明 e7d84b1d8a Merge branch 'sprint/168_sunhao/doc_tree_sortable' into sprint/168 2021-11-11 13:31:03 +08:00
孙广明 00912a7d52 * Finish task #43985. 2021-11-11 13:26:33 +08:00
liyuchun 4604c3d496 * Finish task #44217,#44218,#44219,#44220. 2021-11-11 12:32:20 +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
孙广明 0db6339cb8 * Hidden close project count. 2021-11-11 10:34:00 +08:00
liyuchun e79a153a1f * Adjust code for error name. 2021-11-11 09:19:05 +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
liyuchun bb426aaabe * Fix bug #16054. 2021-11-10 09:19:25 +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