Commit Graph

1499 Commits

Author SHA1 Message Date
hufangzhou
6da1c0d285 * Fix bug #17263. 2021-12-08 16:20:08 +08:00
孙广明
13f162edd2 * Merge 169 untrack file to master. 2021-12-08 11:07:06 +08:00
xieqiyu
bccefb7751 * Fix bug#17188. 2021-12-07 14:22:56 +08:00
李玉春
199577f068 Merge branch 'sprint/29_zhouxin_16905' into 'master'
Fix bug #16905.

See merge request easycorp/zentaopms!709
2021-12-02 03:19:57 +00:00
李玉春
b1cd56f4b3 Merge branch 'sprint/174_hufangzhou_45079' into 'master'
Sprint/174 hufangzhou 45079

See merge request easycorp/zentaopms!715
2021-12-02 02:53:09 +00:00
hufangzhou
3c8e265ab7 * Fix bug #16986. 2021-12-02 10:04:14 +08:00
tanghucheng
8164998a64 * Code task #45101. 2021-12-01 14:56:45 +08:00
zhouxin
126cc84b31 Finish task #16905. 2021-12-01 06:27:24 +00:00
tanghucheng
df91b19a57 * Code for task #45101. 2021-12-01 14:24:32 +08:00
tanghucheng
ff0b8d0c9c * Finish task #45101. 2021-12-01 13:01:54 +08:00
孙广明
c42cca1249 Merge branch 'sprint/168' 2021-11-30 14:38:32 +08:00
zhouxin
e732fd1a51 Finish task 45102. 2021-11-26 02:25:56 +00:00
王怡栋
01e9096140 * code for task #44946. 2021-11-25 17:00:24 +08:00
王怡栋
90a913ca4b Merge branch 'sprint/170' 2021-11-22 16:59:40 +08:00
王怡栋
fde5cb61da Merge branch 'sprint/app10' into sprint/170 2021-11-19 08:41:00 +08:00
王怡栋
75b3876193 * adjust for bug changed status. 2021-11-18 15:47:54 +08:00
王怡栋
26b110b73a * code for task #44331. 2021-11-18 13:45:32 +08:00
王怡栋
3510f6ef63 * code for task #44321. 2021-11-18 11:20:39 +08:00
孙广明
9c8c16a476 * Fix bug #16234. 2021-11-16 09:30:39 +08: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
孙广明
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
孙广明
a742b36ef7 * Finish task #43987. 2021-11-11 16:40:53 +08:00
孙广明
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
孙广明
b99febf1b3 * Remove unused btn. 2021-11-11 09:00:25 +08:00
zhujinyong
37b486ad1c * Replace htmlspecialchars to htmlSpecialString for compatibility. 2021-11-10 14:57:48 +08:00
孙广明
dc2e2cba79 * Adjust doc css. 2021-11-09 14:57:42 +08:00
Hao Sun
7e9f72ab57 * improve UI for dropdown menu in doc side tree. 2021-11-09 13:38:37 +08:00
liyuchun
ce439b9061 * Compatible php5.3. 2021-11-08 11:05:09 +08:00
孙广明
75d547998c * Code for task #44005. 2021-11-04 16:55:37 +08:00
liugang
de56fc1253 * Fix that can't toggle fullscreen mode in IE11. 2021-11-04 10:30:01 +08:00
孙广明
5db6060e90 * Code for task #43985. 2021-11-04 09:53:03 +08:00
孙广明
373b4746d0 * Code for task #43985,#43984. 2021-11-03 16:02:02 +08:00
hufangzhou
8418711168 * Fix bug #15953. 2021-11-03 10:50:10 +08:00
hufangzhou
8b1b92bdfc * Add the version. 2021-11-02 12:37:51 +08:00
reneeteng
cf5682ef5b * Edit api lang and related files. 2021-10-28 10:11:52 +08:00
tianshujie
896300727d * Fix bug #43537. 2021-10-27 16:54:43 +08:00
liyuchun
d92c073cb5 * Fix bug #15684. 2021-10-20 17:08:53 +08:00
liyuchun
fce0f3aafa * Fix bug #15592. 2021-10-20 16:04:44 +08:00
hufangzhou
e912a03df7 * Fix bug #15673. 2021-10-20 13:50:51 +08:00
xiawenlong
902d24ff14 fix code style 2021-10-20 13:48:18 +08:00
hufangzhou
02f2bd22c6 * Fix bug #15669. 2021-10-20 11:07:24 +08:00
xiawenlong
0ea60016a7 add permission. 2021-10-19 15:09:13 +08:00
王怡栋
6ee64dffe7 Merge branch 'api_doc' into sprint/167 2021-10-19 11:36:19 +08:00
xiawenlong
e1bed5bc55 finish api release. 2021-10-18 16:13:46 +08:00
hufangzhou
0541e5a87c * Code for bug #15518. 2021-10-14 16:01:31 +08:00