Commit Graph
183 Commits
Author SHA1 Message Date
孙广明 234baf4594 Merge branch 'liyuchun_fixbug_22098' into 'master'
* Fix bug #21887.

See merge request easycorp/zentaopms!3222
2022-04-29 07:12:02 +00:00
liyuchun d1afd5983d * Delete unused code. 2022-04-29 06:57:57 +00:00
liyuchun a9223eac92 * Delete unused code. 2022-04-29 06:57:13 +00:00
liyuchun a0f8bda990 * Fix bug #21887. 2022-04-29 06:56:02 +00:00
孙广明 9d5cbd6c66 Merge branch 'liyuchun_fixbug_22098' into 'master'
Liyuchun fixbug 22098

See merge request easycorp/zentaopms!3211
2022-04-29 02:31:26 +00:00
孙华伟 92ccb504e0 Update buildform.html.php 2022-04-29 01:27:01 +00:00
liyuchun 0ac82f343c * Fix bug #21887. 2022-04-29 01:25:53 +00:00
孙华伟 d8a79b8ad9 Update buildform.html.php 2022-04-29 01:23:56 +00:00
孙华伟 92adbdef92 *Optimize the code. 2022-04-29 09:19:27 +08:00
孙华伟 ae1c8cbc61 *Fix bug#22072. 2022-04-29 09:10:39 +08:00
朱金勇 9c0e752948 Merge branch 'fixbug_wangxiaomeng#21650' into 'master'
fixbug_21650.

See merge request easycorp/zentaopms!3062
2022-04-22 01:37:26 +00:00
朱金勇 d17a38d658 Merge branch 'sprint/sunhao/optimize_picker_in_search' into 'master'
* fix picker control not initialized in search form.

See merge request easycorp/zentaopms!3039
2022-04-21 08:37:25 +00:00
wangxiaomeng 8cec8ea0bd fixbug_21650. 2022-04-21 16:00:44 +08:00
Hao Sun f0c120373f * fix picker control not initialized in search form. 2022-04-20 20:39:04 +08:00
朱金勇 17dbbe5401 Merge branch 'fixbug_wangxiaomeng_#21773_#21650' into 'master'
Fixbug wangxiaomeng #21773 ,21650.

See merge request easycorp/zentaopms!2990
2022-04-20 07:56:24 +00:00
wangxiaomeng b635d1bf59 fixbug_21650 edit getByID. 2022-04-20 15:55:24 +08:00
wangxiaomeng c18bceef35 Hidden Comment 2022-04-19 08:17:54 +08:00
zenggang 1c8c50724d * Fix bug#18642,21572 2022-04-18 07:25:46 +00:00
wangxiaomeng 6c6ff205cf fixbug_#21650,21773. 2022-04-18 14:52:18 +08:00
hufangzhou b79247398e * Fix bug #20174. 2022-04-14 10:04:48 +08:00
hufangzhou 7d807a5694 * Fix bug #19789. 2022-04-11 14:40:07 +08:00
孙广明 3627387370 Merge branch 'sprint/185_mayue_49285' into 'sprint/185'
* Finish task#49285.

See merge request easycorp/zentaopms!1871
2022-02-25 06:32:20 +00:00
mayue c763f12188 * Optimize code. 2022-02-25 13:20:18 +08:00
zhengrunyu b641170d85 * Fix bug 19941 19923 19922 19787. 2022-02-25 11:01:31 +08:00
mayue 6c2c72ff66 * Finish task#49285. 2022-02-17 17:38:59 +08:00
liyuchun d8c96a6430 * Fix bug #15867. 2021-11-01 16:13:13 +08:00
liyuchun f81ac5db58 * Code for task #41764. 2021-08-26 16:27:53 +08:00
hufangzhou c47fd750dd * Adjust the #userQueries width for different resolution. 2021-03-16 09:46:39 +08:00
zhujinyong c869d88cc2 * Fix css style of *.html.php 2021-03-10 23:35:56 +08:00
leiyong 105769df64 * Adjust code. 2021-01-21 13:07:41 +08:00
qiyu-xie 76381c1fd2 * Merge. 2020-08-05 11:16:37 +08:00
wangyidong 0222add8d5 * fix bug for less than php5.6 for search. 2020-01-13 14:22:53 +08:00
wangyidong fffcd64aa0 * finish task #6675. 2019-12-19 09:15:43 +08:00
wangyidong cf3c318d07 * adjust for find questions. 2019-10-16 17:14:40 +08:00
wangyidong caec432f48 * finish task #6419. 2019-10-14 14:26:37 +08:00
wangyidong 17b53acaa9 * finish task #6161. 2019-07-30 15:38:49 +08:00
jinianlan c90aac3512 * finish task #6166,#6149,6139 2019-07-29 15:54:08 +08:00
Yagami 1928dc0e69 * Finish task #8350. 2019-07-26 15:19:48 +08:00
wangyidong 2671f7a044 * finish task #6090. 2019-07-15 15:56:31 +08:00
wangyidong 836c00918b * finish task #5956. 2019-07-10 15:56:35 +08:00
wangyidong fa412abc6a * adjust for style. 2019-06-11 13:24:19 +08:00
wangyidong 46502d5fba * code for task #5681. 2019-06-04 14:31:16 +08:00
Yagami e56e932723 * Finish task #5759. 2019-06-03 14:49:16 +08:00
wangyidong 92c223589f * adjust for task #5563. 2019-05-31 15:51:39 +08:00
wangyidong aca82aeded * finish task #5578. 2019-05-30 17:41:44 +08:00
Yagami 495d38d0c3 * Finish task #5533. 2019-05-30 13:59:02 +08:00
Yagami 5e9c7c10ea * Finish task #5533. 2019-05-30 13:41:33 +08:00
wangyidong d78546eea5 * adjust for task #5357. 2019-03-22 16:49:47 +08:00
wangyidong 7dfdbe841d * finish task #5357. 2019-03-20 13:33:17 +08:00
wangyidong f102fd782c * finish task #5281. 2019-02-21 10:55:22 +08:00