 孙广明
|
85ac450243
|
Merge branch 'sprint/207_mayue_bug#24049' into 'master'
* Fix bug #24049.
See merge request easycorp/zentaopms!4155
|
2022-06-27 08:54:19 +00:00 |
|
|
mayue
|
35383bc86f
|
* Fix bug #24049.
|
2022-06-24 18:42:44 +08:00 |
|
|
liumengyi
|
3cbc219ad5
|
* Code review.
|
2022-06-24 14:18:31 +08:00 |
|
|
王怡栋
|
176239c74d
|
Merge branch 'master_xieqiyu_57850' into 'master'
* Code for task#57850.
See merge request easycorp/zentaopms!4122
|
2022-06-23 09:27:32 +00:00 |
|
|
xieqiyu
|
d4ac1b4a5f
|
* Code for task#57850.
|
2022-06-23 17:20:19 +08:00 |
|
|
mayue
|
fcb8b6bc9e
|
* Fix bug #24175.
|
2022-06-23 16:32:06 +08:00 |
|
|
liumengyi
|
9b024fb293
|
* Fix bug #24166.
|
2022-06-23 15:48:48 +08:00 |
|
|
liumengyi
|
6f93912640
|
* Fix bug for doc search flipping.
|
2022-06-23 10:55:13 +08:00 |
|
|
王怡栋
|
c69384617a
|
Merge branch 'master_xieqiyu_57850' into 'master'
* Code for task#57850.
See merge request easycorp/zentaopms!4083
|
2022-06-23 00:39:25 +00:00 |
|
|
孙广明
|
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 |
|
|
sunjun
|
b76b5ae8fc
|
fixbug_custom
|
2022-06-22 09:29:11 +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 |
|
|
xieqiyu
|
21b0217aa8
|
* Code for task#57850.
|
2022-06-22 13:15:44 +08: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
|
179191fd7d
|
* Fix bug #23183.
|
2022-06-16 16:15:13 +08:00 |
|
|
孙广明
|
a55b27a1c0
|
* Fix html tag bug.
|
2022-06-09 09:17:10 +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 |
|
|
Hao Sun
|
4185bd47e1
|
* bug #23284, fix simplemde error.
|
2022-06-07 03:14:44 +00:00 |
|
|
孙广明
|
42ed017780
|
* Fix bug #23252.
|
2022-06-06 13:13:38 +08:00 |
|
|
孙广明
|
358ff4bd2f
|
* Fix doc bug.
|
2022-06-01 15:05:43 +08:00 |
|
|
孙广明
|
226ea6ef16
|
* Finish task #55844.
|
2022-06-01 14:25:59 +08:00 |
|
|
hufangzhou
|
79f28c9cb2
|
* Finish task #54985.
|
2022-05-24 16:02:05 +08:00 |
|
|
wangyidong
|
d6cf08b9d7
|
Merge branch 'tid'
|
2022-05-18 10:20:48 +08:00 |
|
|
tianshujie
|
10e48b66d9
|
* Fix bug #22378.
|
2022-05-12 15:50:05 +08:00 |
|
|
tianshujie
|
b715ecd177
|
* Finish task #53655.
|
2022-05-11 11:13:41 +08:00 |
|
|
hufangzhou
|
0424801e4e
|
* Fix bug #15654.
|
2022-04-27 10:48:28 +08:00 |
|
|
hufangzhou
|
bdc7323b19
|
* Fix bug #21829.
|
2022-04-18 16:32:30 +08:00 |
|
|
Zongjun Lan
|
931c3ccc38
|
Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms into sprint/master_lanzongjun_fixbug
|
2022-04-07 16:17:21 +08:00 |
|
|
hufangzhou
|
3791f6520c
|
* Fix bug #16198.
|
2022-04-06 16:27:42 +08:00 |
|
|
Zongjun Lan
|
f22d8882eb
|
* fix bug #21489
|
2022-04-06 11:26:29 +08:00 |
|
|
hufangzhou
|
4eeaa81691
|
* Rename the method name.
|
2022-04-02 16:05:19 +08:00 |
|
|
hufangzhou
|
c155d3aa96
|
* Fix bug #17362.
|
2022-04-02 15:05:39 +08:00 |
|
|
hufangzhou
|
9ff0537cda
|
* Fix bug #17362.
|
2022-04-02 14:57:33 +08:00 |
|
|
zenggang
|
1357480ac6
|
* Finish task#51109,51108,51128
|
2022-03-23 07:54:03 +00:00 |
|
|
hufangzhou
|
350c84440e
|
* Fix bug #14233.
|
2022-03-23 11:29:55 +08:00 |
|
|
王怡栋
|
2684fd08fe
|
* code for task #51330.
|
2022-03-22 16:27:54 +08:00 |
|
|
王怡栋
|
fe91dc8481
|
Merge branch 'pailei2'
|
2022-03-22 09:01:03 +08:00 |
|
|
tianshujie
|
0fde764778
|
* Fix bug #17944.
|
2022-03-15 10:27:27 +08:00 |
|
|
tanghucheng
|
d32f3d2664
|
* Fix bug #19820,20528.
|
2022-03-14 14:51:03 +08:00 |
|
|
tanghucheng
|
b4726315ba
|
* Fix bug.
|
2022-03-09 17:27:01 +08:00 |
|
|
唐胡成
|
4c7b17eed2
|
Update create.html.php
|
2022-03-07 08:47:46 +00:00 |
|