Commit Graph
1822 Commits
Author SHA1 Message Date
xieqiyu d02933e690 * Fix bug#22009. 2022-04-27 16:16:33 +08:00
zhouxin 0fc5c5cba6 * Fix bug #21934. 2022-04-22 05:14:53 +00:00
Zongjun Lan 2414c6d1dc * fix bug #18934 2022-04-21 16:23:16 +08:00
Zongjun Lan 7e63a02e20 * fix bug #18934 2022-04-21 16:09:34 +08:00
孙广明 57a39efdea * Fix bug #17618. 2022-04-21 10:17:47 +08:00
zhujinyong 864694faab Merge branch 'sprint/sunhao/bug6910' 2022-04-18 17:16:17 +08:00
tianshujie 685a583d99 * Fix bug #17551. 2022-04-18 10:50:50 +08:00
Hao Sun af43ca6bb3 * bug #6910, optimize helper "text-limit" and support for displaying html. 2022-04-18 10:25:28 +08:00
caoyanyi b27e1f76d7 * Modify field name. 2022-04-18 10:06:35 +08:00
caoyanyi e98d1ac4ab * Fix bug #21763. 2022-04-18 10:03:47 +08:00
tianshujie 27b6817c2c * Fix bug #17551. 2022-04-14 17:11:36 +08:00
tianshujie 90a1fea2d8 * Fix bug #17551. 2022-04-13 13:35:02 +08:00
孙广明 92eb57d9ef Merge branch 'shunhuawei_fixbug_21488' into 'master'
*Beautify the interface.

See merge request easycorp/zentaopms!2894
2022-04-12 07:50:54 +00:00
孙华伟 6c85c8f49c *Beautify the interface. 2022-04-12 15:47:01 +08:00
孙广明 1e86d0872a Merge branch 'shunhuawei_fixbug_21488' into 'master'
Shunhuawei fixbug 21488

See merge request easycorp/zentaopms!2879
2022-04-12 06:44:47 +00:00
孙华伟 91597abdb7 *Optimize the code. 2022-04-12 14:39:27 +08:00
孙华伟 03cf60bdcb *project,execution,bug have the same problem. 2022-04-12 14:26:12 +08:00
xieqiyu ff1f998bf7 * Fix bug#19197. 2022-04-11 13:24:35 +08:00
Hao Sun 281ad7e876 * fix search and redirect in ajax dropmenu not work as expected sometimes. 2022-04-08 11:43:35 +08:00
tianshujie 2017a13bc8 * Fix bug #14961. 2022-04-07 08:19:04 +08:00
王怡栋 4fa721b0bb Merge branch '165_package' 2022-04-01 15:30:36 +08:00
tianshujie 7407aabc00 * Fix bug #19104. 2022-04-01 14:32:00 +08:00
tianshujie f8981467e4 * Fix bug #19714. 2022-03-31 16:44:45 +08:00
tianshujie 1d91f13687 * Fix bug #17551. 2022-03-31 14:22:35 +08:00
tianshujie 04316599a4 * Modify the error. 2022-03-30 10:26:17 +08:00
tianshujie 93d7e2dd1d * Fix bug #14873. 2022-03-29 11:27:25 +08:00
tianshujie 6617f8747c * Fix bug #19397. 2022-03-28 16:46:15 +08:00
王怡栋 15a3516aca Merge branch 'master' into 165_package 2022-03-28 08:50:18 +08:00
tianshujie d3e63841fa * Fix bug #20559. 2022-03-25 15:00:30 +08:00
tianshujie 7c46d9c61d * Fix bug #17291. 2022-03-25 12:51:59 +08:00
朱金勇 b2b30ea4bc Merge branch 'sprint/sunhao/optimize_dropmenu' into 'master'
* optimize UI for dropmenu.

See merge request easycorp/zentaopms!2519
2022-03-24 09:20:45 +00:00
李玉春 eef0da7fd0 Merge branch 'sprint/tianshujie_fixbug' into 'master'
Sprint/tianshujie fixbug

See merge request easycorp/zentaopms!2517
2022-03-24 09:16:36 +00:00
Hao Sun 539c797bd5 * bug #14569, optimize style for dropmenu. 2022-03-24 17:01:41 +08:00
zhouxin 3291a491c9 Fix bug. 2022-03-24 08:55:56 +00:00
Wenrui LI b6cc4de226 * set z-index to table-footer, fix bug #21053. 2022-03-24 14:25:57 +08:00
tianshujie 69bac81a9d * Fix bug #17395. 2022-03-24 11:01:00 +08:00
zhouxin cebd0a33d5 Fix bug #13855. 2022-03-22 07:38:24 +00:00
王怡栋 fe91dc8481 Merge branch 'pailei2' 2022-03-22 09:01:03 +08:00
孙华伟 9270dbf6fa *Fix bug #17639 2022-03-17 08:45:04 +08:00
孙华伟 a2d2db7b27 *Fix bug#17639 2022-03-15 13:21:14 +08:00
tianshujie 19017161b6 * Delete useless variables. 2022-03-08 09:45:21 +08:00
tianshujie 23f8d33293 * Add variable judgment. 2022-03-08 08:59:15 +08:00
tianshujie c2f14bb9c2 * Finish task #50318. 2022-03-08 08:53:55 +08:00
liumengyi 86d19f82f7 * Fix bug #20290. 2022-03-03 14:53:58 +08:00
Hao Sun aa30172fea * Task #49295, optimize UI for avatar. 2022-03-01 13:24:13 +08:00
王怡栋 44be255e67 * adjust task #49362 and check priv. 2022-03-01 11:23:44 +08:00
zhengrunyu b641170d85 * Fix bug 19941 19923 19922 19787. 2022-02-25 11:01:31 +08:00
孙广明 e6338d280e Merge branch 'sprint/185_zhangzilong_49280' into 'sprint/185'
* Finish task #49280.

See merge request easycorp/zentaopms!1936
2022-02-24 02:46:43 +00:00
zhangzilong a9e3772439 * Finish task #49280. 2022-02-24 09:30:52 +08:00
李玉春 9405f7bf71 Merge branch 'sprint/185' into 'sprint/185_zhengrunyu_49283'
# Conflicts:
#   db/update16.4.sql
#   module/user/view/story.html.php
2022-02-23 01:33:37 +00:00