Design/EasySoft-ZenTaoPMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 30 Wiki Activity
40,844 Commits 2 Branches 292 Tags
0400a2628afcd2d7833babbcaabf80d74d76dce2
Commit Graph
184 Commits
Author SHA1 Message Date
孙广明 4b1d8f4fe5 Merge branch 'sprint/206_liumengyi_24133' into 'master' 
* Fix bug #24133.

See merge request easycorp/zentaopms!4078
 2022-06-23 00:27:35 +00:00
liumengyi 2bc2c16cc5 * Fix bug #24133. 2022-06-22 17:27:36 +08:00
sunjun ddd5818fc1 fixbug_doc 2022-06-22 09:10:27 +00:00
王怡栋 03c76b1565 Merge branch 'master' into 'sprint/206' 
# Conflicts:
#   db/update17.1.sql
 2022-06-22 07:26:11 +00:00
孙广明 1b562972e8 Merge branch 'sprint/206' into 'sprint_206_57892' 
# Conflicts:
#   module/doc/model.php
 2022-06-22 03:10:18 +00:00
liumengyi 5ce8133079 * Fix bug for task #57891 #57890 #57889 #57886 #57885 #57892 #57887. 2022-06-22 10:58:57 +08:00
mayue 0ae4dc0878 * Fix bug #23982. 2022-06-22 09:19:32 +08:00
liumengyi 8c229fa6bc * Finish task #58063. 2022-06-22 08:59:29 +08:00
sunjun eafcb352c6 * Finish task #57891 #57890 #57889 #57886 #57885 #57892 #57887 2022-06-21 05:17:09 +00:00
mayue 2295ee69d5 * Fix bug #23868. 2022-06-17 14:55:25 +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
tianshujie 2bdfa7449d * Finish task #53831. 2022-05-11 14:44:16 +08:00
tianshujie e316483175 * Finish task #53831. 2022-05-11 14:13:30 +08:00
hufangzhou 0424801e4e * Fix bug #15654. 2022-04-27 10:48:28 +08:00
hufangzhou d4f1453db1 * Fix bug #19984. 2022-04-21 09:26:15 +08:00
hufangzhou cc140db6a1 * Fix bug #11808. 2022-04-18 14:08:31 +08:00
hufangzhou 07a887f62c * Fix bug #17974 for objectlibs method. 2022-04-12 15:10:20 +08:00
hufangzhou 0608a7dadb * Fix bug #21304. 2022-04-02 10:55:16 +08:00
hufangzhou 3a38d4787d * Fix bug #17974. 2022-03-28 10:19:44 +08:00
zenggang 1357480ac6 * Finish task#51109,51108,51128 2022-03-23 07:54:03 +00: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 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
孙广明 c42cca1249 Merge branch 'sprint/168' 2021-11-30 14:38:32 +08:00
王怡栋 90a913ca4b Merge branch 'sprint/170' 2021-11-22 16:59:40 +08:00
liugang de56fc1253 * Fix that can't toggle fullscreen mode in IE11. 2021-11-04 10:30:01 +08:00
hufangzhou 8418711168 * Fix bug #15953. 2021-11-03 10:50:10 +08:00
tianshujie 896300727d * Fix bug #43537. 2021-10-27 16:54:43 +08:00
liyuchun 9c2cd403d7 * Fix bug #14558. 2021-09-15 15:08:47 +08:00
liyuchun 2f776b61a1 * Finish task #42379. 2021-09-09 09:06:18 +08:00
liyuchun 302e3636da * Fix bug #14990. 2021-09-08 08:52:38 +08:00
liyuchun 28be8dbc61 * Finish task #42137. 2021-09-02 17:43:59 +08:00
hufangzhou 79e6601360 * Fix bug #14839. 2021-09-01 11:22:23 +08:00
tianshujie 8167e53ad8 * Fix bug #14779. 2021-08-31 10:12:24 +08:00
zhujinyong 664e290f97 * Rename openApp to tab. 2021-08-31 00:30:48 +08:00
liyuchun 8e93990427 * Finish task #41701. 2021-08-30 15:55:48 +08:00
liyuchun 6e4be017b0 * Finish task #41692. 2021-08-30 13:29:49 +08:00
tianshujie 8993bbe8db * Finish task #41551. 2021-08-26 14:33: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
holan20180123 276c78f1f0 * Finish task #41702. 2021-08-25 11:09:04 +08:00
holan20180123 54bf6bc829 * Finish task #41550. 2021-08-19 08:54:49 +08:00
holan20180123 c913b9a95d * Finish task #41543. 2021-08-19 08:28:57 +08:00