Commit Graph
52908 Commits
Author SHA1 Message Date
zhaoke df18d11db0 * Fix lose automation case in testcases api. 2023-04-03 17:03:00 +08:00
zhaoke e7119d4217 Merge remote-tracking branch 'origin/master' into zenops_66 2023-04-03 09:36:20 +08:00
王怡栋 38bf8ab00a Merge branch 'bugfix/liumengyi_sql' into 'master'
* Add sql for 18.3.

See merge request easycorp/zentaopms!7284
2023-04-03 00:23:26 +00:00
王怡栋 891c84525f Merge branch 'daitingting_process_upgrade' into 'master'
* Process upgrade.

See merge request easycorp/zentaopms!7283
2023-04-03 00:22:59 +00:00
zenggang 2ac25e8aff * Optimize maintain page speed 2023-03-31 06:36:38 +00:00
daitingting 790df501b0 * Process upgrade. 2023-03-31 13:40:17 +08:00
孙广明 fbb79f1cdd Merge branch 'sprint/scx_addzentao-sql' into 'master'
* Add sql from update18-3 to zentao-sql.

See merge request easycorp/zentaopms!7281
2023-03-31 05:38:18 +00:00
liumengyi 5ad87efbc0 * Add sql for 18.3. 2023-03-31 13:33:03 +08:00
宋辰轩 17dab4c121 * Add sql from update18-3 to zentao-sql. 2023-03-31 13:28:13 +08:00
Yagami 96dbcdc12b Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms 2023-03-31 09:39:44 +08:00
Yagami 7e54b48e64 * Fix bug https://www.zentao.net/thread/293693/p1.html?rand=62#106742. 2023-03-31 09:39:19 +08:00
王怡栋 842b03ea17 Merge branch 'sprint/scx_exportpivot' into 'master'
* Add exportdata page.

See merge request easycorp/zentaopms!7279
2023-03-31 01:30:42 +00:00
宋辰轩 97b9492920 * Modify php5-3 2023-03-31 09:28:16 +08:00
宋辰轩 c60d1d9785 * Add exportdata page. 2023-03-31 09:11:58 +08:00
wangyidong fd043f0b9b Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms 2023-03-31 08:59:38 +08:00
wangyidong f2a164ffb8 Merge branch 'sprint/biz17' 2023-03-31 08:58:40 +08:00
daitingting d75d5e9b5a * Adjust current version. 2023-03-30 17:29:44 +08:00
daitingting ae8ade1cef * Process columns settings. 2023-03-30 15:34:17 +08:00
zenggang c0ec9f9a9c * Fix bug#32158,32869 2023-03-30 06:59:10 +00:00
qixinzhi 284a4ccfae * Finish task#88964. 2023-03-30 14:19:26 +08:00
王怡栋 abf82c9a0d Merge branch 'fixfeedback/liumengyi_2649' into 'master'
* Fix feedback #2649.

See merge request easycorp/zentaopms!7277
2023-03-30 06:12:42 +00:00
liumengyi 0156a1eddc * Fix bug of update sql. 2023-03-30 14:09:13 +08:00
daitingting 9010cb15ff * Process privilege.
* Adjust codes for program.
2023-03-30 13:41:04 +08:00
liumengyi 78a4bb181f * Fix feedback #2649. 2023-03-30 13:36:09 +08:00
宋辰轩 03ac074ea2 * Add filesaver js. 2023-03-30 11:25:24 +08:00
qixinzhi 343f01d304 * Update go view dist. 2023-03-30 10:29:11 +08:00
王怡栋 163088f2f4 Merge branch 'cyy_compatible' into 'master'
* Compatible with IE.

See merge request easycorp/zentaopms!7276
2023-03-30 00:42:02 +00:00
caoyanyi b883f56dfc * Compatible with IE. 2023-03-30 08:30:17 +08:00
宋辰轩 120584f692 * Do not judge pivot when preview pivot. 2023-03-29 17:31:32 +08:00
宋辰轩 d0ce8a9f7b Merge branch 'sprint/biz17' of https://gitlab.zcorp.cc/easycorp/zentaopms into sprint/biz17 2023-03-29 17:26:40 +08:00
宋辰轩 cc1c1c0838 * Move code to biz. 2023-03-29 17:26:35 +08:00
daitingting 000179d422 Merge branch 'sprint/biz17' of https://gitlab.zcorp.cc/easycorp/zentaopms into sprint/biz17 2023-03-29 17:13:37 +08:00
daitingting 4a28d27be0 * Process stat type. 2023-03-29 17:13:08 +08:00
宋辰轩 051a55e68e * Add biz and max export button and design button in pivot-preview. 2023-03-29 17:09:33 +08:00
宋辰轩 d959fa669f * Check priv except pivot-show. 2023-03-29 16:04:24 +08:00
daitingting d65eda5362 * Check sql is not empty when getFields by sql. 2023-03-29 15:33:40 +08:00
liugang 19fe082665 * Replace the subNavbar of pivot with mainMenu. 2023-03-29 07:31:15 +00:00
王怡栋 9f19893d26 Merge branch 'bugfix/screen' into 'master'
* Fix bug of screen and remove unused parameters.

See merge request easycorp/zentaopms!7275
2023-03-29 07:15:15 +00:00
xieqiyu 2a6f0647ed * Fix bug of dataset upgrade. 2023-03-29 07:12:28 +00:00
liumengyi d86aa233eb * Remove unused parameters. 2023-03-29 15:05:17 +08:00
宋辰轩 23c0839060 * Fix static error. 2023-03-29 13:18:16 +08:00
宋辰轩 96d5217d55 * Remove bi sql file. 2023-03-29 13:05:18 +08:00
宋辰轩 c590e94f0c * Modify bi sql. 2023-03-29 13:01:45 +08:00
daitingting 8edc327784 * Optimize codes. 2023-03-29 11:13:19 +08:00
宋辰轩 983d1e4f49 Merge branch 'sprint/biz17' of https://gitlab.zcorp.cc/easycorp/zentaopms into sprint/biz17 2023-03-29 10:56:49 +08:00
宋辰轩 d3861768fc * Upgrade 18beta2 will execute sql,but the installation does not, so add it to upgrade and install again. 2023-03-29 10:56:42 +08:00
daitingting e18e7525b8 * Callback upgrade program when upgrade from biz8.4. 2023-03-29 10:50:33 +08:00
liugang c3cae43d8c * Display the subNavbar in left side. 2023-03-29 02:39:05 +00:00
liumengyi 9842006745 * Fix bug of screen. 2023-03-29 10:32:47 +08:00
liumengyi fc9f1a510a * Fix bug of screen. 2023-03-29 10:31:15 +08:00