Commit Graph
44445 Commits
Author SHA1 Message Date
tianshujie db036c9172 * Fix bug #26879. 2022-08-25 15:31:31 +08:00
xieqiyu 147cdbec67 * Fix bug#26881. 2022-08-25 15:31:02 +08:00
tianshujie ad240eab61 * Fix bug #26889. 2022-08-25 15:28:47 +08:00
tianshujie 704de14c41 * Fix bug #26880. 2022-08-25 15:22:56 +08:00
liumengyi 8afdaa7d27 * Fix bug #26887. 2022-08-25 15:15:14 +08:00
xieqiyu 84cd1e4835 * Fix bug#26878. 2022-08-25 14:56:39 +08:00
liuhong d1576572ff *Fix bug 2022-08-25 06:49:05 +00:00
tianshujie 766d166a5b * Fix bug #26879. 2022-08-25 14:46:07 +08:00
xieqiyu 6245e04233 * Fix bug#26870. 2022-08-25 14:45:02 +08:00
xieqiyu 1bef0993ae * Fix bug#26873. 2022-08-25 14:16:54 +08:00
王怡栋 3d9fd2352f Merge branch 'master_xieqiyu_26859' into 'master'
* Fix bug#26859.

See merge request easycorp/zentaopms!5118
2022-08-25 06:10:15 +00:00
李玉春 9acdb61b77 Merge branch 'cyy_api' into 'master'
* Modify api param and app error.

See merge request easycorp/zentaopms!5107
2022-08-25 05:53:31 +00:00
李玉春 b114bf2f6a Merge branch 'cyy_js' into 'zenops_44'
* Modify page style.

See merge request easycorp/zentaopms!5117
2022-08-25 05:53:07 +00:00
xieqiyu cebd16d8ea * Fix bug#26859. 2022-08-25 13:35:56 +08:00
mayue 3c7a896b3a * Fix bug #26607. 2022-08-25 13:33:56 +08:00
王怡栋 0ba0a91edd Merge branch 'importExport' into 'master'
* Fix bug #26849.

See merge request easycorp/zentaopms!5116
2022-08-25 05:29:20 +00:00
王怡栋 406238b299 Merge branch 'sprint231_zg_bugs' into 'master'
* Fix sprint231 bugs

See merge request easycorp/zentaopms!5114
2022-08-25 05:28:54 +00:00
王怡栋 dc62a0fce6 Merge branch 'sprint/231_tianshujie_bug' into 'master'
* Fix bug #26862.

See merge request easycorp/zentaopms!5115
2022-08-25 05:28:15 +00:00
caoyanyi 47e1ebccc6 * Adjust code. 2022-08-25 13:20:33 +08:00
caoyanyi ada9d98f76 * Adjust code. 2022-08-25 13:19:50 +08:00
caoyanyi 6969379db7 * Modify page style. 2022-08-25 13:18:39 +08:00
tanghucheng 4972db803a Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms into importExport 2022-08-25 13:15:03 +08:00
tanghucheng 5ddd08d2e4 * Fix bug #26849. 2022-08-25 13:14:14 +08:00
tianshujie 06ab4ea7a5 * Fix bug #26862. 2022-08-25 13:06:38 +08:00
zenggang 7f90361e59 * Fix sprint231 bugs 2022-08-25 03:30:54 +00:00
王怡栋 e16516ed44 Merge branch 'sprint/hufangzhou_html' into 'master'
* Calculate height in html format.

See merge request easycorp/zentaopms!5113
2022-08-25 03:21:06 +00:00
王怡栋 d6b0c3d876 Merge branch 'sprint/231_tianshujie_bug' into 'master'
Sprint/231 tianshujie bug

See merge request easycorp/zentaopms!5111
2022-08-25 03:20:50 +00:00
王怡栋 de8934a593 Merge branch 'sprint/master_lanzongjun_fixbug' into 'master'
* add import white list

See merge request easycorp/zentaopms!5109
2022-08-25 03:20:27 +00:00
王怡栋 dcb1795c2e Merge branch 'master_xieqiyu_fixBug' into 'master'
* Fix bug of my requirement.

See merge request easycorp/zentaopms!5108
2022-08-25 03:19:51 +00:00
lanzongjun d96cd37980 Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms into sprint/master_lanzongjun_fixbug 2022-08-25 11:19:08 +08:00
王怡栋 395cd0d0cd Merge branch 'importExport' into 'master'
* Fix bug for port.

See merge request easycorp/zentaopms!5112
2022-08-25 03:18:53 +00:00
hufangzhou fa9ea8cdca * Calculate height in html format. 2022-08-25 11:16:44 +08:00
tanghucheng 1808127ba7 * Fix bug for port. 2022-08-25 11:10:31 +08:00
lanzongjun 495a916a39 Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms into sprint/master_lanzongjun_fixbug 2022-08-25 10:56:20 +08:00
tianshujie cc3ebce871 * Fix bug #26862. 2022-08-25 10:42:34 +08:00
王怡栋 815308b0a1 Merge branch 'sprint/hufangzhou_add8.1' into 'master'
* Add php 8.1 for package.

See merge request easycorp/zentaopms!5110
2022-08-25 02:41:49 +00:00
tianshujie c6220519b1 * Modify the required fields on the page for creating a task are incorrect. 2022-08-25 10:40:26 +08:00
hufangzhou 90c9cdc9fa * Add php 8.1 for package. 2022-08-25 10:34:32 +08:00
lanzongjun b964b5e17a * add import white list 2022-08-25 10:20:05 +08:00
王怡栋 0d9c57b293 Merge branch 'sprint/231_dongli_64972' into 'master'
* Fix bug #26824.

See merge request easycorp/zentaopms!5099
2022-08-25 02:17:34 +00:00
xieqiyu e0826b5271 * Fix bug of my requirement. 2022-08-25 10:16:51 +08:00
caoyanyi d764b13971 * Modify api param and app error. 2022-08-25 10:08:36 +08:00
孙广明 5115d871b6 Merge branch 'sprint/231_liumengyi_26846' into 'master'
* Fix bug #26846.

See merge request easycorp/zentaopms!5106
2022-08-25 02:03:22 +00:00
liumengyi 723093c840 * Fix bug for task #65808. 2022-08-25 10:01:58 +08:00
孙广明 41e346a299 Merge branch 'sprint/231_tianshujie_bug' into 'master'
Sprint/231 tianshujie bug

See merge request easycorp/zentaopms!5104
2022-08-25 01:57:26 +00:00
liumengyi 9408410fee * Fix bug #26846. 2022-08-25 09:56:42 +08:00
tianshujie 5e06502b84 * Fix bug #26858. 2022-08-25 09:49:55 +08:00
王怡栋 a25bb863bb Merge branch 'sprint/231_hufangzhou_newVersion' into 'master'
* Add the new version.

See merge request easycorp/zentaopms!5103
2022-08-25 01:36:16 +00:00
王怡栋 e59dc5a47e Merge branch 'master_liuhong_66226' into 'master'
*Fix bug #66226.

See merge request easycorp/zentaopms!5094
2022-08-25 01:31:42 +00:00
hufangzhou e55c40278d * Add the new version. 2022-08-25 09:31:18 +08:00