Commit Graph
984 Commits
Author SHA1 Message Date
qixinzhi 4580fb13ed Merge branch 'master' into sprint/biz17 2023-02-17 15:24:51 +08:00
tianshujie 484f34396c Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms into zentaopms_284 2023-02-16 08:59:00 +08:00
hufangzhou f3cd2e7d4d * Change the Easy Soft to ZenTao Software. 2023-02-15 17:01:22 +08:00
qixinzhi affd946bc0 * Add pivot module init. 2023-02-15 09:13:04 +08:00
tianshujie dbad8ab513 Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms into zentaopms_284 2023-02-14 08:52:02 +08:00
hufangzhou 7108816fa5 * Fix bug #32073. 2023-02-13 16:30:13 +08:00
zhujinyong d9d47b9229 Merge branch 'zentaopms_284' of https://gitlab.zcorp.cc/easycorp/zentaopms into zentaopms_284 2023-02-13 14:53:24 +08:00
zhujinyong bab89d1e32 * Fix upgrading for mix stage. 2023-02-13 14:51:08 +08:00
hufangzhou 8d26dceb4b * Compatible with php5.3. 2023-02-09 05:54:15 +00:00
孙广明 99446cf8d3 Merge branch 'zhouxin_feedback_313' into 'master'
* Resolve feedback #313.

See merge request easycorp/zentaopms!6861
2023-02-08 03:23:03 +00:00
hufangzhou 025aa5dc4b * Add the new version. 2023-02-08 02:44:44 +00:00
zhouxin 26abc21883 * Adjust code. 2023-02-08 09:26:12 +08:00
zhouxin c7a767521c * Resolve feedback #313. 2023-02-06 14:27:23 +08:00
hufangzhou c27e0ae9a6 * Add the mark for auto pack, and integrate the table creation statement. 2023-02-02 08:48:58 +00:00
chaideqing 0ebc9cd0d3 * Fix feedback 2047. 2023-02-01 01:52:20 +00:00
田淑杰 c2304d1197 * Fix bug #31571. 2023-01-10 08:21:02 +08:00
hufangzhou b5859c7dc3 * Add the new version. 2023-01-03 13:56:27 +08:00
田淑杰 866b4086e8 Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms into sprint/272 2022-12-29 15:22:13 +08:00
hufangzhou 464cd34cd5 * Fix bug for add module. 2022-12-27 01:28:22 +00:00
hufangzhou 3a51b751ef * Add the new Version. 2022-12-27 00:54:30 +00:00
liugang 9a89860dc4 * Comment codes. 2022-12-27 08:40:48 +08:00
liugang 8100689bb2 Merge branch 'sprint/biz17' 2022-12-26 08:50:31 +08:00
田淑杰 d6bad0942f * Add update function of task #79622. 2022-12-19 11:11:28 +08:00
hufangzhou 6cef691b39 * Add the new version. 2022-12-14 05:28:51 +00:00
wangyidong cb5af075f0 * adjust for upgrade. 2022-12-06 17:27:53 +08:00
Lufei 12e1539301 * Fix baseUrl scheme error for api createDemoData. 2022-11-29 18:28:13 +08:00
wangyuting 84f9b7b36a * Fix bug #30193. 2022-11-24 02:12:02 +00:00
liugang b688d08312 Merge branch 'master' into sprint/biz17 2022-11-23 10:10:30 +08:00
wangyuting 5835a11610 * Fix bug #29994. 2022-11-23 01:40:30 +00:00
liumengyi a3b23cffcd * Modify bi upgrade method. 2022-11-21 14:01:54 +08:00
liugang 7c62eef9dc Merge branch 'master' into sprint/biz17 2022-11-21 13:08:59 +08:00
wangyuting 182f1abc9a * Fix bug #30003. 2022-11-21 01:51:24 +00:00
王怡栋 1c0129945c * code for task #76439,76440. 2022-11-18 14:25:24 +08:00
hufangzhou 3dae19302b * Add the new version. 2022-11-16 06:34:29 +00:00
宋辰轩 97b5a52b78 *Modify default dimension code. 2022-11-16 09:06:14 +08:00
宋辰轩 7594ccbfc1 * Delete sql and update function. 2022-11-14 13:59:31 +08:00
wangyuting 2f5e0ac70d * Finish task #75239. 2022-11-11 00:46:54 +00:00
wangyidong 2e6e289f1a * fix bug #29528. 2022-11-10 12:08:21 +08:00
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
wangyidong 9761648d59 Merge branch 'zentaopms_239' 2022-11-08 08:41:28 +08:00
wangyuting2 b59ceb1038 * Finish task #72273. 2022-11-03 05:28:49 +00:00
hufangzhou d095daee76 * Add the sql in confirm page. 2022-11-02 08:33:05 +00:00
hufangzhou b08746ca3c * Fix an error. 2022-11-02 08:06:59 +00:00
daitingting cb90a2e25b * Finish task #74176. 2022-11-02 06:30:01 +00:00
hufangzhou d09093f42b * Add the new version. 2022-11-02 06:24:20 +00:00