Commit Graph
1224 Commits
Author SHA1 Message Date
zhouxudong da24c3abf9 * Fix bug #15442. 2022-04-08 09:21:39 +08:00
zhouxudong 3bf6c7fd5e * Fix bug #15442. 2022-04-07 17:26:23 +08:00
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
王怡栋 dec6eba5b2 Merge branch 'sprint/master_fixbug' into 'master'
* Fix bug #21336,21296.

See merge request easycorp/zentaopms!2700
2022-04-01 03:29:18 +00:00
tanghucheng b8aec834dd * Fix bug #21296,21336. 2022-04-01 10:56:35 +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
zenggang 40f9a85a6f * Fix bug#21097,21096 2022-03-31 01:35:50 +00:00
tanghucheng ab4053b372 * Fix bug#21208. 2022-03-28 13:50:48 +08:00
王怡栋 15a3516aca Merge branch 'master' into 165_package 2022-03-28 08:50:18 +08:00
李玉春 7e0cf1500e Merge branch 'fixbug_cyy' into 'master'
* Fix bug #19745.

See merge request easycorp/zentaopms!2555
2022-03-28 00:38:56 +00:00
caoyanyi f58099b204 * Add app language. 2022-03-25 09:17:21 +08:00
hufangzhou a3c79e6a10 Merge branch 'sprint/165_package' of https://gitlab.zcorp.cc/easycorp/zentaopms into sprint/165_package 2022-03-25 09:14:25 +08:00
hufangzhou 96de3c81b2 * Fix bug #21145. 2022-03-25 09:13:31 +08:00
tianshujie 9f3f0bd8c6 * Fix bug #20858. 2022-03-24 16:01:18 +08:00
liyuchun 57d6407fba * Fix bug #13732. 2022-03-24 10:51:43 +08:00
李玉春 6729298c92 Merge branch 'bugfix_cyy' into 'master'
Modify app language and API

See merge request easycorp/zentaopms!2488
2022-03-24 00:29:54 +00:00
caoyanyi b7b3a26e33 * Add app language. 2022-03-23 16:26:51 +08:00
王怡栋 fb917029b7 Merge branch 'fixbug' into 'master'
* Fix bug #21032.

See merge request easycorp/zentaopms!2478
2022-03-23 08:17:24 +00:00
tanghucheng c9fc9cfc65 * Fix bug #21032. 2022-03-23 14:28:33 +08:00
孙广明 0c79df3fb6 Merge branch 'wyd_fixbug' into 'master'
Wyd fixbug

See merge request easycorp/zentaopms!2461
2022-03-23 00:53:36 +00:00
王怡栋 fe91dc8481 Merge branch 'pailei2' 2022-03-22 09:01:03 +08:00
王怡栋 7e0a6e8b11 * fix bug #19267. 2022-03-17 09:41:28 +08:00
王怡栋 69d7749489 * code for welcome block. 2022-03-16 16:35:33 +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
王怡栋 1e7e9f961b * fix bug #20675. 2022-03-11 13:16:27 +08:00
tianshujie a1bd5d6d48 * Finish task #50329. 2022-03-07 14:29:01 +08:00
tanghucheng 79a38cc9ad * Fix bug. 2022-03-07 13:04:06 +08:00
孙广明 df55b0af1b Merge branch '185' 2022-02-28 08:58:20 +08:00
songchenxuan a2a4ec8d6f *Translate. 2022-02-25 11:16:41 +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
tanghucheng 6b2bc49830 * Finish task #49409. 2022-02-22 16:59:09 +08:00
zhujinyong 1f8e1b0021 * Fix return print() -> return. 2022-02-22 09:35:25 +08:00
zhujinyong b17c3c8206 * Move die to return print. 2022-02-22 08:42:32 +08:00