Commit Graph
43686 Commits
Author SHA1 Message Date
liuhong f0cdfea18a *Fix bug 2022-08-19 02:39:40 +00:00
liuhong 06e7729212 *Fix bug 2022-08-19 00:47:06 +00:00
liuhong 7dee834681 *Fix bug #64880 2022-08-18 05:28:28 +00:00
liuhong c7ef31df8c Merge branch 'master_liuhong_64880' into sprint_liuhong 2022-08-18 04:11:20 +00:00
liuhong 8ad00314f0 *Finish task #64880. 2022-08-18 04:09:55 +00:00
liuhong cd63f9434c Merge branch 'master_liuhong_64878' into sprint_liuhong 2022-08-18 03:10:03 +00:00
liuhong c8497c2b78 Merge branch 'master_liuhong_26228' into sprint_liuhong 2022-08-18 02:55:01 +00:00
liuhong a6a3a08a34 *Fix bug #26182. 2022-08-18 02:51:35 +00:00
liuhong 3fcef9c093 *Finish task #64879. 2022-08-18 02:51:35 +00:00
liuhong 6b6f9c39ee *Finish task #64879. 2022-08-18 02:51:35 +00:00
liuhong 24ea56af1c *Finish task #64880. 2022-08-18 02:51:35 +00:00
liuhong fda5a1b952 *Finish task #64883. 2022-08-18 02:51:35 +00:00
liuhong ebae24048d *Finish task #64883. 2022-08-18 02:51:35 +00:00
王怡栋 b959dfd2cc Merge branch 'master_liuhong_26203' into 'sprint_liuhong'
*Fix bug #26203

See merge request easycorp/zentaopms!5003
2022-08-18 02:31:02 +00:00
王怡栋 dd433841b6 Merge branch 'master_liuhong_26210' into 'sprint_liuhong'
*Fix bug #26210.

See merge request easycorp/zentaopms!5002
2022-08-18 02:30:31 +00:00
王怡栋 3365e8a10c Merge branch 'master_liuhong_26230' into 'sprint_liuhong'
*Fix bug #26230.

See merge request easycorp/zentaopms!5001
2022-08-18 02:26:48 +00:00
liuhong 0ec7394ed8 *Fix bug #2622.8 2022-08-18 02:02:47 +00:00
sunguangming b175607c41 * Code for file checkpriv bug. 2022-08-18 08:25:37 +08:00
王怡栋 74b66c9bb3 Merge branch 'master_xieqiyu_26414' into 'master'
* Fix bug#26414.

See merge request easycorp/zentaopms!4994
2022-08-17 07:22:40 +00:00
xieqiyu 6f6491148a * Fix bug#26414. 2022-08-17 15:19:53 +08:00
李玉春 2387129821 Merge branch 'zhouxin_fixbug_001' into 'master'
* Fix bug of doc-objectLib.

See merge request easycorp/zentaopms!4987
2022-08-17 02:18:37 +00:00
zhouxin 607fa5a010 * Fix bug of doc-objectLib. 2022-08-17 02:16:03 +00:00
liuhong 3a68c5bb18 *Finish task #64878 2022-08-17 00:29:16 +00:00
liuhong 05fcb51357 *Finish task #64880. 2022-08-16 10:03:52 +00:00
王怡栋 9c18c3013c Merge branch 'sprint/hufangzhou_unusedfile' into 'master'
* Fix bug #26548.

See merge request easycorp/zentaopms!4982
2022-08-16 09:06:08 +00:00
王怡栋 3256ca241e Merge branch 'master_xieqiyu_26545' into 'master'
* Fix bug#26545.

See merge request easycorp/zentaopms!4983
2022-08-16 09:05:54 +00:00
孙广明 1ec773d7d2 Merge branch 'sprint/228_tianshujie_fixbug' into 'master'
* Fix bug #26553.

See merge request easycorp/zentaopms!4984
2022-08-16 08:56:56 +00:00
tianshujie 572b14f05f * Fix bug #26553. 2022-08-16 16:46:25 +08:00
tianshujie d5ba096809 * Fix bug #26553. 2022-08-16 16:44:39 +08:00
xieqiyu 7ecf79a163 * Fix bug#26545. 2022-08-16 16:36:03 +08:00
hufangzhou 6a6b04db11 * Fix bug #26548. 2022-08-16 15:16:19 +08:00
zhujinyong 61802828b3 Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms 2022-08-16 15:02:50 +08:00
zhujinyong c8f3aec35b + Add vendor of sqlparser. 2022-08-16 15:02:27 +08:00
王怡栋 9f7de89251 Merge branch 'importExport' into 'master'
* Fix bug #26520,26520.

See merge request easycorp/zentaopms!4979
2022-08-16 06:16:21 +00:00
tanghucheng eaaf6e7498 * Update lang for lite. 2022-08-16 14:00:50 +08:00
tanghucheng 68f35f5262 * Fix bug #26520,26520. 2022-08-16 13:58:19 +08:00
王怡栋 4e2df94bdf Merge branch 'sprint/zentaomax42_lanzongjun' into 'master'
* fix bug cp project

See merge request easycorp/zentaopms!4976
2022-08-16 05:07:32 +00:00
lanzongjun 572021a1bd * fix params 2022-08-16 13:06:58 +08:00
sunguangming 3e6052ae5f * Fix bug #26465. 2022-08-16 13:02:25 +08:00
lanzongjun 4b21f31e5c * fix bug #26462 2022-08-16 11:22:57 +08:00
孙广明 64b7bb8460 Merge branch 'importExport' into 'master'
* Fix bug #26256.

See merge request easycorp/zentaopms!4977
2022-08-16 01:54:10 +00:00
tanghucheng e2865a49c6 Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms into importExport 2022-08-16 09:32:04 +08:00
tanghucheng d3314f22aa * Fix bug #26256. 2022-08-16 09:28:41 +08:00
lanzongjun 5b380fedb4 * fix bug cp project 2022-08-16 09:19:27 +08:00
wangyidong 97700ca723 * fix for MYISAM to InnoDB. 2022-08-16 08:27:17 +08:00
wangyidong ab83e773d9 Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms 2022-08-15 17:57:14 +08:00
wangyidong 0d6be2f360 * fix for sql error when change table engine. 2022-08-15 17:56:30 +08:00
王怡栋 d1ccbe14ae Merge branch 'sprint/liuruogu_fixbug#26456' into 'master'
* Fix bug #26456.

See merge request easycorp/zentaopms!4974
2022-08-15 09:28:11 +00:00
liuruogu f488c11146 * Fix bug #26456. 2022-08-15 09:23:06 +00:00
孙广明 7a92f78f16 Merge branch 'importExport' into 'master'
* Fix bug for gantt menu.

See merge request easycorp/zentaopms!4973
2022-08-15 07:48:14 +00:00