Commit Graph
1730 Commits
Author SHA1 Message Date
mayue a0efdf92a8 * Fix bug #16333. 2021-11-18 09:58:40 +08:00
李玉春 87597eccbb Merge branch 'sprint/170_mayue_44493,44494' into 'sprint/170'
* Finish task #44493,44494.

See merge request easycorp/zentaopms!477
2021-11-17 02:33:33 +00:00
mayue 0dd5dd1955 * Finish task #44493,44494. 2021-11-17 10:27:02 +08:00
mayue 8cce5342f4 * Finish task #44493,44494. 2021-11-17 09:35:30 +08:00
mayue 8b8c4fe180 * Finish task #44493,44494. 2021-11-17 09:30:34 +08:00
mayue 65ef0c6f1b * Finish task #44493,44494. 2021-11-17 08:41:04 +08:00
mayue 102561019d * Finish task #44493,44494. 2021-11-16 18:20:35 +08:00
mayue 7d496eebc2 * Finish task #44493,44494. 2021-11-16 17:05:03 +08:00
songchenxuan f262ca14d1 *Finish task 44492 2021-11-16 15:23:13 +08:00
songchenxuan f495a6cb62 * Finish task 44492 2021-11-16 14:46:14 +08:00
xieqiyu cce14cef80 * Fix bug#16188. 2021-11-14 10:47:12 +08:00
hufangzhou 8352d145f5 * Deal with the branch is empty. 2021-11-12 15:22:47 +08:00
hufangzhou 7d9793eaa3 * Modify the get by search. 2021-11-11 11:29:54 +08:00
hufangzhou 8e9f8b860e * Fix bug #16092. 2021-11-11 11:07:23 +08:00
zhujinyong 37b486ad1c * Replace htmlspecialchars to htmlSpecialString for compatibility. 2021-11-10 14:57:48 +08:00
李玉春 b9bdc8a517 Merge branch 'sprint/170_mayue_15688' into 'sprint/170'
* Fix bug #15688.

See merge request easycorp/zentaopms!356
2021-11-09 01:49:16 +00:00
mayue cafb5d08a8 * Fix bug #15688. 2021-11-09 09:47:10 +08:00
mayue 6c23d4a336 * Fix bug #15688. 2021-11-09 09:37:33 +08:00
李玉春 7e1412258c Merge branch 'sprint/170_mayue_15688' into 'sprint/170'
* Fix bug #15688.

See merge request easycorp/zentaopms!339
2021-11-08 07:06:48 +00:00
mayue b305831daf * Fix bug #15688. 2021-11-08 15:04:55 +08:00
李玉春 261d027273 Merge branch 'sprint/170_mayue_15688' into 'sprint/170'
* Fix bug #15688.

See merge request easycorp/zentaopms!336
2021-11-08 06:40:53 +00:00
mayue 35b6e284b7 * Fix bug #15688. 2021-11-08 14:28:42 +08:00
李玉春 db0c5df00e Merge branch 'sprint/170_mayue_15688' into 'sprint/170'
* Fix bug #15688.

See merge request easycorp/zentaopms!333
2021-11-08 05:30:29 +00:00
mayue aa116136d0 * Fix bug #15688. 2021-11-08 13:24:23 +08:00
孙广明 5812a1e510 Merge branch 'sprint/170_tianshujie_43903' into 'sprint/170'
* Finish task  #43903

See merge request easycorp/zentaopms!319
2021-11-05 03:22:17 +00:00
mayue 1fbae29f29 * Fix bug #15688. 2021-11-05 10:53:36 +08:00
tianshujie 6cb70ab01d * Finish task #43903. 2021-11-05 08:59:55 +08:00
孙广明 7377b40c00 Merge branch 'sprint/170_mayue_15690' into 'sprint/170'
* Fix bug #15690.

See merge request easycorp/zentaopms!316
2021-11-05 00:58:50 +00:00
mayue 2ee7793126 * Fix bug #15690. 2021-11-05 08:55:33 +08:00
mayue 150a1395e1 * Fix bug #15690. 2021-11-04 17:30:11 +08:00
root f79d676ad3 * Fix bug #15695 2021-11-04 09:51:54 +08:00
root 66f83b187d * Fix bug #15695 2021-11-04 09:50:51 +08:00
root 4dc9c7c5df * Fix bug #15695 2021-11-04 09:33:56 +08:00
root eafd443fca * Fix bug #15695 2021-11-04 09:31:17 +08:00
hufangzhou 70c21e6a28 * Fix bug #15838. 2021-11-02 08:56:20 +08:00
王怡栋 a44472fb45 Merge branch '15.6' into sprint/167 2021-10-14 15:48:14 +08:00
hufangzhou 52e49919d2 * Code for bug #15518. 2021-10-14 13:51:59 +08:00
hufangzhou 4ca1a13e34 * Fix bug #15504. 2021-10-13 17:46:10 +08:00
xieqiyu 836a35ab82 * Code for bug#15504. 2021-10-13 17:25:08 +08:00
xieqiyu 28d62ece60 * Fix bug#15501. 2021-10-13 16:11:07 +08:00
孙广明 0f546a39e2 * Fix bug #15489. 2021-10-13 09:10:12 +08:00
hufangzhou bf78fe9be4 * Add the 15.6 version and upgrade. 2021-10-12 09:35:39 +08:00
hufangzhou 7a1fa1ef3b * Finish task #43188. 2021-10-11 16:11:48 +08:00
王怡栋 96a8ef6b04 Merge branch '15.5' into 165 2021-10-09 10:06:05 +08:00
liyuchun 9b5a28392b * Finish task #42854. 2021-09-28 12:31:59 +08:00
王怡栋 9efcf7e686 Merge branch '15.5' of https://gitlab.zcorp.cc/easycorp/zentaopms into 15.5 2021-09-22 08:45:36 +08:00
王怡栋 7ed13fff0a * fix bug #15215. 2021-09-22 08:45:09 +08:00
zenggang c6b7f25fa3 * Adjust code style. 2021-09-18 14:08:31 +08:00
zenggang 4380f4d4b0 * Fix bug#14580 2021-09-18 11:01:08 +08:00
dingna a3dc73a6dc * Fix bug #15201. 2021-09-16 10:26:55 +08:00