Commit Graph

106 Commits

Author SHA1 Message Date
mayue
01fd78720c * Fix bug #24639. 2022-06-30 16:17:47 +08:00
mayue
2e3416c4c8 * Fix bug #24639. 2022-06-30 16:15:10 +08:00
孙广明
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
王怡栋
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
王怡栋
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
mayue
0ae4dc0878 * Fix bug #23982. 2022-06-22 09:19:32 +08:00
sunjun
eafcb352c6 * Finish task #57891 #57890 #57889 #57886 #57885 #57892 #57887 2022-06-21 05:17:09 +00:00
mayue
179191fd7d * Fix bug #23183. 2022-06-16 16:15:13 +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
zhujinyong
37b486ad1c * Replace htmlspecialchars to htmlSpecialString for compatibility. 2021-11-10 14:57:48 +08:00
zhujinyong
664e290f97 * Rename openApp to tab. 2021-08-31 00:30:48 +08:00
tianshujie
7d95dc55d9 * Modify the back link of the testtask. 2021-08-30 16:04:50 +08:00
holan20180123
c913b9a95d * Finish task #41543. 2021-08-19 08:28:57 +08:00
holan20180123
e107e0a660 * Finish task #41245. 2021-08-12 17:28:41 +08:00
wangyidong
bbe793a8aa Merge branch '15.2' 2021-08-02 16:31:42 +08:00
wangyidong
750ef9fad3 * finish task #40469. 2021-07-23 14:48:30 +08:00
holan20180123
bbd03f9756 * Finish task #40500. 2021-07-23 10:46:27 +08:00
tianshujie98
506eaa5fdd * Fix bug #11867. 2021-04-09 10:30:21 +08:00
hufangzhou
570078911b * Fix a bug. 2021-01-29 11:18:53 +08:00
hufangzhou
7bd91e9b45 * Adjust the code. 2021-01-28 16:12:39 +08:00
hufangzhou
d1a4c28e5f * Finish task #9102. 2021-01-28 16:06:09 +08:00
leiyong
235c393707 * Finish task#8964. 2021-01-15 10:20:03 +08:00
tianshujie98
877dc32f88 * Finish task #8393. 2020-11-17 13:33:20 +08:00
tianshujie98
97cc8034be * Adjust code style. 2020-11-06 13:06:22 +08:00
tianshujie98
a2a50698ee * Finish task #8199. 2020-11-03 17:25:01 +08:00
z
a9df6f3b9c * merge after 12.4.1 changes. 2020-08-31 15:31:55 +08:00
wangyidong
d9b43a8c5e * finish task #6033. 2019-07-05 11:09:08 +08:00
wangyidong
9910fa461c * finish task #6034. 2019-07-05 10:52:30 +08:00
Yagami
e481cba1e7 * Fix css file. 2019-07-01 15:35:19 +08:00
wangyidong
f122d6977d * change ueditor to kindeditor. 2019-05-31 15:59:03 +08:00
Yagami
cf6c4f9359 * Fix story and doc span style. 2019-05-31 10:14:18 +08:00
Yagami
48bb8fea4e * Finish task #5342. 2019-03-19 16:59:36 +08:00
wangyidong
1d317c5fb3 * finish task #5278. 2019-02-20 18:01:00 +08:00
Yagami
6efbe82455 * Finish task #5309. 2019-02-20 15:53:47 +08:00
Yagami
1c7e1a6ece * Finish task #5112. 2018-11-13 15:32:15 +08:00
wangyidong
e0950c3e8b * finish task #4940. 2018-09-26 15:11:54 +08:00
wangyidong
1148ff0f7c * finish task #4892. 2018-09-19 16:00:38 +08:00
Catouse
07dcbac2fe * add title attributes. 2018-07-09 15:35:56 +08:00
wangyidong
ef8ffca2e8 * finish task #4574. 2018-07-03 16:29:58 +08:00
daitingting
92e63812b1 * Adjust space between btn. 2018-05-25 09:52:56 +08:00
daitingting
0056609d9c * Adjust button style. 2018-05-16 17:44:42 +08:00
Catouse
e522af53b4 * remove btn-gray. 2018-05-15 15:33:33 +08:00
daitingting
1e7406d4a3 * Rewrite edit page of doc. 2018-05-03 17:01:14 +08:00