Commit Graph
680 Commits
Author SHA1 Message Date
Hao Sun 025a6f32b0 * bug #18928, fix switch button not work when statistic block place in right side. 2022-04-02 16:25:02 +08:00
李玉春 315c7e1041 Merge branch 'sprint/master_zhouxudong_13789' into 'master'
* Fix bug #13789.

See merge request easycorp/zentaopms!2739
2022-04-02 06:59:11 +00:00
李玉春 8329ed43fa Merge branch 'devops24_zenggang' into 'master'
Fix bug#13131,16610

See merge request easycorp/zentaopms!2718
2022-04-02 06:32:21 +00:00
mayue f54b38b241 * Fix bug #21435. 2022-04-02 10:15:33 +08:00
zhouxudong 4a82fa28cd * Fix bug #13789. 2022-04-02 09:18:24 +08:00
zenggang 8c1b36fb3d * Fix bug#13131,16610 2022-04-01 07:49:52 +00:00
王怡栋 4fa721b0bb Merge branch '165_package' 2022-04-01 15:30:36 +08:00
zhouxudong bd13abc6b4 * Fix bug #13765. 2022-04-01 10:47:35 +08:00
zhouxudong 0e710b9f82 * Fix bug #13765. 2022-04-01 09:36:18 +08:00
王怡栋 15a3516aca Merge branch 'master' into 165_package 2022-03-28 08:50:18 +08:00
hufangzhou 96de3c81b2 * Fix bug #21145. 2022-03-25 09:13:31 +08:00
liyuchun 57d6407fba * Fix bug #13732. 2022-03-24 10:51:43 +08:00
王怡栋 fe91dc8481 Merge branch 'pailei2' 2022-03-22 09:01:03 +08:00
tianshujie 305ec3c69a * Modify code location. 2022-03-15 09:57:56 +08:00
tianshujie ffe15a3b23 * Fix bug #20751. 2022-03-15 09:54:53 +08:00
tianshujie ff24c06fc9 * Modify the code judgment logic. 2022-03-15 09:41:54 +08:00
tianshujie 91e99b699b * Fix bug #20751. 2022-03-15 09:36:13 +08:00
sunjun 395314f726 fixbug #50432 2022-03-14 11:31:09 +08:00
sunjun d4b8dfef02 fix bug #50432 2022-03-11 15:09:59 +08:00
sunjun 0b0a1011e9 fix bug #50432 2022-03-11 15:02:14 +08:00
sunjun bbd2ccff01 bug优化 2022-03-11 14:25:56 +08:00
sunjun 00aaefa61c 地盘里看板项目icon显示看板 2022-03-11 13:35:03 +08:00
tianshujie 9f76842034 * Modify the code format. 2022-02-24 17:03:19 +08:00
tianshujie 34752d2c04 * Modify version judgment logic. 2022-02-24 16:49:56 +08:00
tianshujie b7c3e92e95 * Modify version judgment logic. 2022-02-24 16:17:26 +08:00
zhujinyong d02ddc138c Merge branch 'lite' into sprint/185 2022-02-17 10:20:50 +08:00
周旭东 27fcc308e1 Update sprintblock.html.php 2022-02-15 05:14:07 +00:00
zhouxudong a0aa2260d6 *Fix bug #19555.*Fix bug #19555.*Fix bug #19555.*Fix bug #19555.*Fix bug #19555.*Fix bug #19555.*Fix bug #19555.*Fix bug #19555. 2022-02-15 11:19:34 +08:00
tanghucheng 41e0b66473 * finish task #49013. 2022-02-14 13:17:56 +08:00
孙广明 a2477a59bf * Delete unused lang. 2022-01-21 14:33:58 +08:00
liyuchun 7e96eb9f68 Merge branch 'devops19' 2022-01-19 16:55:57 +08:00
liyuchun 5724bd4fc5 * Fix bug #18435,#18437. 2022-01-17 13:37:11 +08:00
孙广明 b01b6a90eb Merge branch 'kanban' 2022-01-17 10:34:08 +08:00
liumengyi 582ddf2a06 * Fix bug #18436.Finish task #47361. 2022-01-14 10:14:40 +08:00
zhouxudong 96fdc4465a *Fix bug #17388. 2022-01-12 09:10:47 +08:00
zhouxudong 0f958a378d *Fix bug #17388. 2022-01-12 09:07:01 +08:00
zhouxudong 84c9e3aa58 *Fix bug #17388. 2022-01-12 08:34:41 +08:00
songchenxuan 8927059720 *Code for code review. 2022-01-06 13:08:46 +08:00
孙广明 c8db935f34 Merge branch '180' 2022-01-04 22:41:23 +08:00
tianshujie 839d71137a * Fix the error of product dashboard block. 2021-12-31 10:19:25 +08:00
xieqiyu ed73332c41 * Modify the problems. 2021-12-30 17:17:46 +08:00
王怡栋 cf280763b2 Merge branch 'sprint/devops16_liyuchun_45491' into 'master'
* Finish task #45491.

See merge request easycorp/zentaopms!803

(cherry picked from commit ff06288dc8)

b11dd3af  * Finish task #45491.
2021-12-07 08:49:16 +00:00
孙广明 9ddee1bcea * Fix bug #17008. 2021-12-02 13:53:56 +08:00
王怡栋 a44472fb45 Merge branch '15.6' into sprint/167 2021-10-14 15:48:14 +08:00
zenggang 8e95a7f98d * Fix bug#15466 2021-10-14 06:25:19 +00:00
liyuchun 5cd7ed9d74 * Fix bug #15495. 2021-10-13 14:35:09 +08:00
朱金勇 1173e8b65d Merge branch 'sprint/165_wangyidong' into 'sprint/165'
Sprint/165 wangyidong

See merge request easycorp/zentaopms!37
2021-09-28 07:31:10 +00:00
王怡栋 f30eb20fbd * code for task #42835. 2021-09-27 14:50:09 +08:00
zenggang 40d848f03f * Fix bug#15282 2021-09-26 17:06:13 +08:00
tianshujie 2a4b2497dc * Finish task #42847. 2021-09-23 08:56:40 +08:00