Commit Graph
38157 Commits
Author SHA1 Message Date
liugang 4d8529153f * Fix syntax error. 2022-11-09 15:36:02 +08:00
liugang c8df5b435f * Save report module to the collector field. 2022-11-09 15:35:21 +08:00
宋辰轩 83854baa14 *Remove unused sql. 2022-11-09 10:13:23 +08:00
liugang beb32b483c * Set dimension as root. 2022-11-09 09:52:27 +08:00
liugang 1d659c90ca * Refactor function to add default modules and process report modules. 2022-11-09 09:46:52 +08:00
liugang f5e453c1cd * Add default modules of report and process report modules when upgrade. 2022-11-08 14:49:53 +08:00
liugang 6c915bb8c2 * Finish task #75077. 2022-11-08 14:22:18 +08:00
zhujinyong a65662436d Merge branch 'sprint/biz17' of https://gitlab.zcorp.cc/easycorp/zentaopms into sprint/biz17 2022-11-08 14:09:44 +08:00
liumengyi 9c1f8b2be1 * Fix bug #29325. 2022-11-08 13:02:01 +08:00
liugang 39f4ea0e7a * Finish task #75169. 2022-11-08 10:36:53 +08:00
孙广明 3dc995919d Merge branch 'sprint/master_lanzongjun_fixbug' into 'master'
* fix bug #29363

See merge request easycorp/zentaopms!6069
2022-11-07 08:52:12 +00:00
lanzongjun 1e16357fe3 * fix bug #29363 2022-11-07 16:50:51 +08:00
Yagami 6413f85918 Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms 2022-11-07 16:37:35 +08:00
Yagami 7f1ac56f29 * Fix bug #29369. 2022-11-07 16:36:58 +08:00
孙广明 0d9ca308b0 Merge branch 'lyk_feedback_1380' into 'master'
* Resolve feedback #1380.

See merge request easycorp/zentaopms!6065
2022-11-07 07:21:41 +00:00
李玉春 62349c46b3 Merge branch 'sprint/tianshujie_fixbug' into 'master'
* Fix bug #29376.

See merge request easycorp/zentaopms!6064
2022-11-07 07:18:18 +00:00
李玉春 624bfcbeed Merge branch 'sprint/tianshujie_css' into 'master'
Sprint/tianshujie css

See merge request easycorp/zentaopms!6061
2022-11-07 07:17:15 +00:00
liuyongkai 50e118bea4 * Resolve feedback #1380. 2022-11-07 07:16:14 +00:00
tianshujie f6d526d916 * Fix bug #29376. 2022-11-07 15:12:30 +08:00
xieqiyu e5accc3154 * Fix bug#29356. 2022-11-07 06:54:28 +00:00
孙广明 8e4fe47631 Merge branch 'master_xieqiyu_fixbug' into 'master'
* Fix bug#29356,#29168.

See merge request easycorp/zentaopms!6062
2022-11-07 06:41:47 +00:00
caoyanyi 4e7bee9d32 Merge branch 'master' into sprint/tianshujie_css 2022-11-07 14:36:24 +08:00
李玉春 9030b0e194 Merge branch 'cyy_bug' into 'master'
* Fix bug #29355.

See merge request easycorp/zentaopms!6059
2022-11-07 06:35:30 +00:00
xieqiyu 3056c3d98b * Fix bug#29356,#29168. 2022-11-07 06:35:17 +00:00
tianshujie 941a2e5a59 * Fix bug #29347. 2022-11-07 14:31:29 +08:00
wangzemei 261eb124ae * fix bug 29345 2022-11-07 13:51:53 +08:00
caoyanyi dcdc7bd58a * Adjust code. 2022-11-07 13:49:12 +08:00
caoyanyi e6cbdb8182 * Fix bug #28992. 2022-11-07 13:44:11 +08:00
tianshujie 32c5c0550b * Adjust the page of the multiplayer task. 2022-11-07 13:30:17 +08:00
孙广明 0b501483ef Merge branch 'sprint/tianshujie_css' into 'master'
Sprint/tianshujie css

See merge request easycorp/zentaopms!6058
2022-11-07 03:14:03 +00:00
tianshujie 8e67ec5de9 * Optimize the form for recording work hours for multi-person tasks. 2022-11-07 11:04:45 +08:00
王怡栋 36fa636926 Merge branch 'fixbug' into 'master'
* Set memory_limit and max_execution_time for import.

See merge request easycorp/zentaopms!6055
2022-11-07 02:55:19 +00:00
孙广明 e22839b687 Merge branch 'feedback_zhouxin_1277' into 'master'
* Resolve feedback #1277.

See merge request easycorp/zentaopms!6057
2022-11-07 02:54:01 +00:00
孙广明 af5c2c5845 Merge branch 'sprint/master_lanzongjun_fixbug' into 'master'
* fix bug ticket count show

See merge request easycorp/zentaopms!6056
2022-11-07 02:52:21 +00:00
lanzongjun 30bae3ed2d * fix bug ticket count show 2022-11-07 10:51:18 +08:00
tianshujie 4ee897dc0d * Fix bug #27494. 2022-11-07 10:50:32 +08:00
zhouxin d6a2fcd325 * Resolve feedback #1277. 2022-11-07 10:44:27 +08:00
tanghucheng 76f830aad6 * Set memory_limit and max_execution_time for import. 2022-11-07 10:12:28 +08:00
李玉春 e8b42deef3 Merge branch 'sprint/tianshujie_fixbug' into 'master'
Sprint/tianshujie fixbug

See merge request easycorp/zentaopms!6054
2022-11-07 02:06:22 +00:00
李玉春 9a5c92a275 Merge branch 'cyy_bug' into 'master'
* Fix bug #27589.

See merge request easycorp/zentaopms!6052
2022-11-07 02:05:01 +00:00
tianshujie 280a37559e * Fix bug #29293. 2022-11-07 10:03:47 +08:00
tianshujie 91f6d1b9f0 * Fix bug #29293. 2022-11-07 09:54:41 +08:00
caoyanyi ddfade7db2 * Fix bug #27589. 2022-11-07 09:50:00 +08:00
tianshujie 5ea7567745 * Fix bug #27975. 2022-11-07 09:39:52 +08:00
tianshujie 0c3e7b8c70 * Fix bug #27978. 2022-11-07 09:33:24 +08:00
tianshujie 2176378af6 * Fix bug #29339. 2022-11-07 09:11:40 +08:00
liumengyi 0159cabcff * Fix bug #29272. 2022-11-07 09:05:56 +08:00
liumengyi a38461a20e * Fix bug for manage chart group. 2022-11-06 16:03:14 +08:00
tianshujie 26efc38fbb * Fix bug #29293. 2022-11-04 15:54:29 +08:00
孙广明 9d89b58f5d Merge branch 'fixbug' into 'master'
* Update picker select style for showimport.

See merge request easycorp/zentaopms!6045
2022-11-04 07:53:40 +00:00