 孙广明
|
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 |
|
|
Hao Sun
|
6890e9535f
|
* fix drop shadow element position.
|
2021-11-12 11:35:50 +08:00 |
|
|
孙广明
|
fe230065c3
|
Merge branch 'spirnt/171_liyuchun_bug' into 'sprint/168'
Spirnt/171 liyuchun bug
See merge request easycorp/zentaopms!426
|
2021-11-12 02:45:01 +00: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 |
|
|
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 |
|
|
孙广明
|
be0606058f
|
Merge branch 'sprint/168_tanghucheng_index_js' into 'sprint/168'
* Adjust index.js for zentaomax.
See merge request easycorp/zentaopms!422
|
2021-11-12 00:39:18 +00: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 |
|
|
李玉春
|
198ef01629
|
Merge branch 'sprint/171_sgm_sortwiki' into 'sprint/168'
* Finish task #43987.
See merge request easycorp/zentaopms!417
|
2021-11-11 08:46:23 +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 |
|
|
孙广明
|
e63706cb54
|
Merge branch 'sprint/168' into 'sprint/168_sunhao/doc_tree_sortable'
# Conflicts:
# module/project/css/kanban.css
|
2021-11-11 05:28:40 +00: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 |
|
|
李玉春
|
deaaaf1da3
|
Merge branch 'sprint/168_sunhao/task43944' into 'sprint/168'
* Task #43944, fix iframe modal show double times on click at second time.
See merge request easycorp/zentaopms!371
|
2021-11-10 00:09:54 +00: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 |
|
|
孙广明
|
1576d443ff
|
Merge branch 'sprint/168_liyuchun_bug' into 'sprint/168'
* Sort execution kanban.
See merge request easycorp/zentaopms!370
|
2021-11-09 09:23:54 +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 |
|
|
孙广明
|
f13d696912
|
Merge branch 'sprint/168_liyuchun_43982' into sprint/168
|
2021-11-09 16:57:11 +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 |
|
|
李玉春
|
496ecd3c7a
|
Merge branch 'sprint/168_sgm_testcase' into 'sprint/168'
Sprint/168 sgm testcase
See merge request easycorp/zentaopms!365
|
2021-11-09 07:08:19 +00: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 |
|
|
孙广明
|
cbd2638dcd
|
Merge branch 'sprint/168_sunhao/improve_doc_dropdown' into 'sprint/168'
* Improve UI for dropdown menu in doc side tree.
See merge request easycorp/zentaopms!363
|
2021-11-09 05:43:12 +00:00 |
|
|
Hao Sun
|
7e9f72ab57
|
* improve UI for dropdown menu in doc side tree.
|
2021-11-09 13:38:37 +08:00 |
|
|
孙广明
|
c69f5877b5
|
Merge branch 'sprint/168_liyuchun_43954' into sprint/168
|
2021-11-09 13:04: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 |
|