Commit Graph
883 Commits
Author SHA1 Message Date
王怡栋 8ad9dea460 Merge branch 'sprint/xuan_106' into 'master'
Sprint/xuan 106

See merge request easycorp/zentaopms!4126
2022-06-24 01:35:58 +00:00
dingyongliang 7963845b6b * mv style to x.style.css. 2022-06-24 01:32:03 +00:00
宋辰轩 9460102a29 * Format. 2022-06-20 15:11:29 +08:00
宋辰轩 0b83f28fe9 * CommonLang. 2022-06-20 15:09:59 +08:00
dingyongliang 0774bce6ef * electron/zentao: merge navigation bar and control bar. 2022-06-17 09:18:07 +00:00
leiyong ae55e2c31e * Fix bug#23841. 2022-06-17 01:30:09 +00:00
tianshujie 604996bcae * Changing variable names. 2022-06-16 11:38:32 +08:00
王怡栋 504319fcef Merge branch 'leiyong_fix_bug_23735' into 'master'
* Fix bug#23793.

See merge request easycorp/zentaopms!3953
2022-06-16 01:03:22 +00:00
leiyong 32642d45ae * Fix bug#23793. 2022-06-15 10:00:58 +00:00
孙广明 1f13b14799 Merge branch 'master' into 'sprint/204_tianshujie_57095'
# Conflicts:
#   module/execution/css/all.css
2022-06-15 09:03:47 +00:00
tianshujie 2c176439d3 * Finish task #57095. 2022-06-15 15:09:34 +08:00
leiyong b79aab5d93 * Adjust style. 2022-06-14 10:25:10 +00:00
leiyong 8054e4f631 * Finish task#56925. 2022-06-14 08:55:28 +00:00
xieqiyu c03d486fab * Finish task#56919. 2022-06-14 15:55:48 +08:00
孙广明 b896377846 * Change zentao license. 2022-06-08 10:02:29 +08:00
孙广明 b528156589 * Change license. 2022-06-08 09:34:46 +08:00
宋辰轩 328aea3be5 * Modify supportLang to defaultLang. 2022-06-07 10:56:42 +08:00
宋辰轩 d50f757397 * SupportLang. 2022-06-07 09:52:57 +08:00
孙华伟 34b536605a Update action.html.php 2022-05-30 01:14:45 +00:00
孙华伟 dc2ba1c238 *Fix bug #22873. 2022-05-27 15:41:16 +08:00
leiyong 541e961882 * Fix bug#22912. 2022-05-26 01:50:41 +00:00
wangyidong d6cf08b9d7 Merge branch 'tid' 2022-05-18 10:20:48 +08:00
hufangzhou 5b20d429b4 * Fix the bug of login failed. 2022-05-16 09:03:13 +08:00
zhujinyong 9efef2692b + Add no-referrer. 2022-05-14 16:47:44 +08:00
王怡栋 a0c13f4d80 Merge branch 'fixbug' into 'master'
* Fix bug #22025,22028.

See merge request easycorp/zentaopms!3181
2022-04-28 08:46:46 +00:00
sunjun 7f7f3013ea *Fixbug_sunjun_17329 2022-04-28 06:18:13 +00:00
tanghucheng c04c165276 * Fix bug #21429. 2022-04-28 13:50:48 +08:00
liyuchun 7cc557e528 * Fix bug #7008. 2022-04-22 09:01:32 +08:00
王怡栋 54040e5777 * code for bug #16770. 2022-04-20 17:19:07 +08:00
王怡栋 f7ded5c5cf Merge branch 'sprint/xuanxuan_96' into 'master'
Sprint/xuanxuan 96

See merge request easycorp/zentaopms!2769
2022-04-07 08:38:10 +00:00
Hao Sun 2b9068f51c fix z-index conflict with pager dropmenu for fixed header in datatable. 2022-04-06 17:09:24 +08:00
Chenjianyu f0eaee1739 * Fix bug #52077, overwrite .main-actions-holder style to block infinite scrolling. 2022-04-06 17:04:36 +08:00
李玉春 82647a8138 Merge branch 'sunhuawei_fixbug_19073' into 'master'
*Fix bug#19073.

See merge request easycorp/zentaopms!2707
2022-04-01 09:20:25 +00:00
王怡栋 4fa721b0bb Merge branch '165_package' 2022-04-01 15:30:36 +08:00
孙华伟 2c5a94c243 *Fix bug#19073. 2022-04-01 14:12:09 +08:00
王怡栋 f5c9b94b82 Merge branch 'sprint/xuanxuan_96' into 'master'
Sprint/xuanxuan 96

See merge request easycorp/zentaopms!2687
2022-04-01 01:54:46 +00:00
Wenrui LI 7ecc17b836 * format code. 2022-04-01 08:57:30 +08:00
tianshujie a93dcb0ec7 * Modify the link in the executive board. 2022-03-30 15:55:45 +08:00
Wenrui LI 3446e4bf55 * fix xuan header hook not loaded. 2022-03-29 16:14:11 +08:00
Wenrui LI d1b1cb38c5 * fix xuan header hook not loaded. 2022-03-29 16:10:28 +08:00
qixinzhi 4e8cab4b66 * hide zentao client tutorial menu, task# 17992. 2022-03-29 14:54:12 +08:00
tianshujie 7b6e89c8d6 * Fix bug #21213. 2022-03-29 09:07:47 +08:00
朱金勇 7d6e2bac72 Merge branch 'sprint/sunhao/bug21174' into 'master'
* bug #21174, fix markdown preview not work as expected.

See merge request easycorp/zentaopms!2577
2022-03-28 09:01:06 +00:00
朱金勇 0bb360f80c Merge branch 'sprint/sunhao/bug20927' into 'master'
* bug #20927, limit affixed header in kanban container.

See merge request easycorp/zentaopms!2585
2022-03-28 09:00:40 +00:00
Hao Sun c39e01875c * bug #20928, support to affix region scrollbar in kanban. 2022-03-28 16:41:39 +08:00
Hao Sun cd4c0ae708 * bug #20927, limit affixed header in kanban container. 2022-03-28 15:50:08 +08:00
Hao Sun 0cf598f418 * bug #21174, fix markdown preview not work as expected. 2022-03-28 14:09:23 +08:00
xieqiyu f500822991 * Fix bug#20875. 2022-03-28 10:11:39 +08:00
王怡栋 15a3516aca Merge branch 'master' into 165_package 2022-03-28 08:50:18 +08:00
Wenrui LI aed115d5cf * remove score notice for lite vision, bug #21119. 2022-03-25 11:11:10 +08:00