Commit Graph
75 Commits
Author SHA1 Message Date
wangyidong 1d27666ded * code for fromGlobal param. 2023-03-29 15:56:42 +08:00
liumengyi eb182b1874 * Fix bug #33461. 2023-03-29 13:36:16 +08:00
wangyidong 0677d7b5f5 Merge branch 'release/zentaopms_18.3' of https://gitlab.zcorp.cc/easycorp/zentaopms into release/zentaopms_18.3 2023-03-29 10:40:11 +08:00
wangyidong efee93ff21 * code for task #89136. 2023-03-29 10:39:48 +08:00
liumengyi d4a8dbb88b * Fix bug of task #89149. 2023-03-29 09:16:48 +08:00
liumengyi be75bd716f * Finish task #89149, and fix bug of merge code. 2023-03-29 08:55:25 +08:00
wangyidong bb3c743d75 Merge branch 'release/zentaopms_18.3' of https://gitlab.zcorp.cc/easycorp/zentaopms into release/zentaopms_18.3 2023-03-29 08:28:20 +08:00
wangyidong 4910b9b8e7 * code for task #89150. 2023-03-29 08:24:27 +08:00
tianshujie 3f6292ad7b * Code for task #89152. 2023-03-27 17:25:00 +08:00
tianshujie f818d387f2 * Code for task #89152. 2023-03-27 16:45:03 +08:00
liumengyi 28e31e4f23 * Code for task #89141. 2023-03-27 15:50:39 +08:00
tianshujie 26c1ccbb25 * code for task #89148. 2023-03-27 15:34:29 +08:00
mayue 933694703e * Fix bug #24580. 2022-06-30 11:00:28 +08:00
mayue 6fd3657052 * Fix bug #24479. 2022-06-28 16:34:27 +08:00
mayue 35383bc86f * Fix bug #24049. 2022-06-24 18:42:44 +08:00
mayue 49db5d2b2e * Fix bug #23870#23868. 2022-06-17 14:12:47 +08:00
mayue dc8e372a00 * Fix bug #23865#23869. 2022-06-17 11:18:25 +08:00
mayue 179191fd7d * Fix bug #23183. 2022-06-16 16:15:13 +08:00
hufangzhou 0424801e4e * Fix bug #15654. 2022-04-27 10:48:28 +08:00
孙广明 bff2f36c90 Merge branch 'sprint/181_liumengyi_fixbug' into 'master'
* Finish task #47090 #47098.

See merge request easycorp/zentaopms!1303
2022-01-06 09:25:15 +00:00
liumengyi b6ea0afcb4 * Finish task #47090 #47098. 2022-01-06 16:56:27 +08:00
mayue f151953a49 * Optimize code. 2022-01-06 15:55:49 +08:00
mayue 0cd9411371 * Finish task #46526. 2022-01-04 10:28:53 +08:00
mayue 3e3741796e * Finish task #46526. 2021-12-31 13:03:18 +08:00
mayue 7ac03ddd38 * Optimized code. 2021-12-28 17:14:32 +08:00
hufangzhou 8418711168 * Fix bug #15953. 2021-11-03 10:50:10 +08:00
tianshujie b11ac8d119 * Finish task #41549. 2021-08-25 15:31:45 +08:00
holan20180123 c4f059793a * Finish task #41549. 2021-08-25 13:21:51 +08:00
Hao Sun 54aef9129b * refactor: format. 2021-08-03 12:28:55 +08:00
zhujinyong adeec9e34a * Format code style. 2021-03-17 11:33:57 +08:00
jinianlan c6cba5483e * finish task #6173,#6174,#6175,#6183,#6186,#6187. 2019-08-12 08:23:00 +08:00
wangyidong a1bf91fb7b * cache file read image. 2019-07-23 13:45:54 +08:00
wangyidong a8063e8b19 * adjust for side width. 2019-06-05 11:51:58 +08:00
wangyidong e9dc74bfda * code for task #5626. 2019-06-04 14:20:33 +08:00
wangyidong 67f21ea76e * finish task #5626. 2019-06-03 11:52:54 +08:00
chenfeiCF 8ec8643dd6 * Adjust doc lib acl. 2019-02-27 10:22:53 +08:00
Yagami 34555b1e8d Merge branch 'master' of https://github.com/easysoft/zentaopms 2019-02-22 11:16:57 +08:00
Yagami 4305c3a54c * Finish task #5299. 2019-02-22 11:16:32 +08:00
wangyidong adfd61aa66 * finish task #5275. 2019-02-22 10:36:16 +08:00
wangyidong 1d317c5fb3 * finish task #5278. 2019-02-20 18:01:00 +08:00
wangyidong 87209adcb7 * finish task #5152. 2018-12-12 16:39:34 +08:00
Yagami 9b68e5c1ae * Fix doc button. 2018-11-07 10:42:27 +08:00
wangyidong 84f178f3aa * finish task #5031. 2018-10-17 15:14:31 +08:00
wangyidong f74a4b1e36 * finish task #5030,5029. 2018-10-16 16:41:40 +08:00
Catouse 819f035bd9 * improve UI of doc views, code for task #5032. 2018-10-15 15:35:25 +08:00
Yagami efaf41683c * Fix doc side height. 2018-10-15 14:55:15 +08:00
liugang d7cd324f90 * Remove defaultChosenOptions. 2018-07-12 09:17:50 +08:00
liugang f7bd51a861 * Finish task #4549, 4550 2018-07-04 14:05:59 +08:00
wangyidong 6506886dc3 * adjust for ux. 2018-06-19 10:59:20 +08:00
滔哥 a104f067f3 * Finish task#4369. 2018-06-01 16:14:37 +08:00