Commit Graph
1676 Commits
Author SHA1 Message Date
hufangzhou 4c1d975f49 * Fix bug #35313. 2023-05-19 13:19:17 +08:00
tianshujie 2619c0b5f2 * Fixed incorrect document type. 2023-04-28 11:22:47 +08:00
wangyuting2 1d4aab6f14 * Add delete file config. 2023-04-28 10:57:24 +08:00
xieqiyu 0a57ff808d * Code for bug#34828. 2023-04-27 13:06:24 +00:00
daitingting eb3febc31c * Fix bug #34576,#34580. 2023-04-27 12:40:34 +00:00
daitingting 7032ccdb45 * Set the default of date field is null. 2023-04-27 08:46:06 +00:00
liugang b56bf29d92 * Update the file list to delete when upgrade. 2023-04-27 08:13:24 +00:00
daitingting 17804cf23d * Insert pivot sql in pms. 2023-04-27 07:01:16 +00:00
宋辰轩 19114cc35b * Fix upgrade bug. 2023-04-27 10:47:23 +08:00
wangyuting2 218b70f8c3 * Fix upgrade bug. 2023-04-27 10:16:05 +08:00
tianshujie 96b7ae1f55 * Fix bug #34710. 2023-04-26 18:14:45 +08:00
宋辰轩 bcc7ce83cd * Remove param. 2023-04-26 15:28:21 +08:00
宋辰轩 7d90548456 * Fix bug for upgrade. 2023-04-26 10:24:13 +08:00
宋辰轩 3ae41cd8ff * Modify updatepivotgroup. 2023-04-26 09:54:48 +08:00
宋辰轩 675a5d3245 * Update pivot group. 2023-04-25 16:24:29 +08:00
宋辰轩 18f0a9e65c * Modify dataview -> chart. 2023-04-24 20:41:18 +08:00
liugang dcd6b98583 - Don't delete blockreportlist.html.php. 2023-04-24 10:36:04 +00:00
daitingting b38747f700 * Fix bug #33665. 2023-04-24 16:03:11 +08:00
daitingting ddf2339b06 * Fix bug #34576. 2023-04-23 11:26:27 +08:00
wangyidong 36889a4ea2 * fix bug. 2023-04-21 14:20:43 +08:00
刘刚 24f40ceb4d Merge branch 'daitingting_bug_#34553' into 'master'
* Fix bug #34553.

See merge request easycorp/zentaopms!7543
2023-04-21 05:50:17 +00:00
hufangzhou e0d28390ab * Add the new version. 2023-04-21 13:35:49 +08:00
daitingting 9d8220fdf9 * Fix bug #34553. 2023-04-21 11:31:32 +08:00
xieqiyu 1d4726faaf * Process dataset update. 2023-04-21 03:20:34 +00:00
刘刚 10ea035d40 Merge branch 'daitingting_bug_#34554' into 'master'
* Fix bug #34554.

See merge request easycorp/zentaopms!7537
2023-04-21 03:12:13 +00:00
daitingting eb61d3c874 * Fix bug #34554. 2023-04-21 11:07:03 +08:00
wangyuting2 5e53c75057 * Fix upgrade bug. 2023-04-21 10:22:44 +08:00
刘刚 2a0661d59d Merge branch 'daitingting_upgrade' into 'master'
* Process privelege for dataview.

See merge request easycorp/zentaopms!7520
2023-04-20 09:44:02 +00:00
daitingting b19b86f789 * Process privelege for dataview. 2023-04-20 17:31:28 +08:00
王怡栋 e0d163f5fd Merge branch 'zentaopms_304' into 'master'
Zentaopms 304

See merge request easycorp/zentaopms!7518
2023-04-20 09:31:13 +00:00
daitingting 63580d733e * Process fields to match dataview. 2023-04-20 16:41:18 +08:00
liumengyi 01ffcbef5d Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms into zentaopms_304 2023-04-20 15:22:32 +08:00
daitingting c4484f1ff9 * Match the group of dimension 1. 2023-04-20 13:19:40 +08:00
hufangzhou e18b37128f Merge branch 'master' into zentaopms_304 2023-04-20 13:03:30 +08:00
daitingting d4ae238ed9 * Remove note. 2023-04-19 17:49:23 +08:00
daitingting 5c746f6757 * Fix bug for upgrading. 2023-04-19 17:46:43 +08:00
liumengyi 19870de8a0 Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms into zentaopms_304 2023-04-19 17:23:44 +08:00
宋辰轩 4a17fc7e7a *Modify chart group. 2023-04-19 16:41:28 +08:00
liumengyi 7fe3662ea7 Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms into zentaopms_304 2023-04-19 14:09:20 +08:00
王怡栋 5d56042091 Merge branch 'cyy_fixbug' into 'master'
* Modify book doc type.

See merge request easycorp/zentaopms!7468
2023-04-19 05:34:00 +00:00
caoyanyi e8a3ca0fc7 * Modify book doc type. 2023-04-19 09:28:15 +08:00
tianshujie 3062276963 * Check whether the field already exists. 2023-04-19 09:05:13 +08:00
liumengyi 17ee6ad3f4 Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms into zentaopms_304 2023-04-18 11:06:01 +08:00
liugang 44387b7b97 * Remove unused files extened in the report extension. 2023-04-18 03:00:10 +00:00
liumengyi d971d4b4b7 Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms into zentaopms_304 2023-04-18 08:38:14 +08:00
王怡栋 dd33c54395 Merge branch 'sprint/scx_addUpdate2BI_func' into 'master'
Add func for update18_3.

See merge request easycorp/zentaopms!7436
2023-04-17 07:34:35 +00:00
宋辰轩 7374a11495 Add func for update18_3. 2023-04-17 15:23:30 +08:00
liugang 07fa17e142 * Remove unused files when upgrade. 2023-04-17 06:42:56 +00:00
liugang 5163c5e658 * Remove unused files. 2023-04-17 06:18:08 +00:00
liumengyi 98e1cf39f0 Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms into zentaopms_304 2023-04-17 13:21:13 +08:00