Commit Graph
1151 Commits
Author SHA1 Message Date
liugang 1c13a31e99 * Rename $lang->colon to $lang->hyphen. 2024-04-28 14:35:26 +08:00
caoyanyi 8e17266f28 * Update commit link info. 2023-12-06 13:42:44 +08:00
caoyanyi a33ad4ad71 * Update copyright year. 2023-12-05 13:32:52 +08:00
tanghucheng 3d94eac50a Merge branch 'Merge184' into c07e4a71eb 2023-11-30 21:21:55 -05:00
chaideqing 62a6da42db * Add uploadDocs of module doc. 2023-11-30 15:19:28 +00:00
chaideqing db383de60c * Merge module-doc 18.8-18.x to Merge184. 2023-11-30 17:15:28 +08:00
chaideqing 48fda5052f * Merge module-doc to Merge184. 2023-11-15 14:37:43 +08:00
tanghucheng c5622ac450 * Merge #c4c20cae54,Change judgment condition. 2023-11-09 00:14:42 -05:00
chaideqing c992fb4680 * Merge commit:1caeb75ad0, fix bug #34519. 2023-11-03 05:32:05 +00:00
wangyuting 35900ec18e * Fix return error. 2023-06-13 09:08:24 +08:00
wangyidong e88e2d78ed * fix bug #34575. 2023-04-25 12:13:43 +08:00
tianshujie 0ac0f009ec * Fix bug #34642. 2023-04-24 19:44:41 +08:00
wangyidong dd0a0009ae Merge branch '18.4' of https://git.zcorp.cc/easycorp/zentaopms into 18.4 2023-04-24 19:23:58 +08:00
wangyidong 6a77ce5c6d * fix bug #34713. 2023-04-24 19:23:26 +08:00
tianshujie ec88bdf34a * Error modifying jump link. 2023-04-24 19:19:17 +08:00
tianshujie bf7cdc1ee1 * Fix bug #34725. 2023-04-24 18:37:32 +08:00
wangyidong 901fc68f3c * adjust for change bizVersion to edition. 2023-04-24 17:00:52 +08:00
guofeilong dc050c72d9 * Code for bug #34524. 2023-04-21 15:34:36 +08:00
guofeilong e3245bf03c * Code for adjust title width js . 2023-04-21 14:38:47 +08:00
guofeilong 8dd356b7e1 * Code for delete emtpy lines . 2023-04-21 14:38:28 +08:00
guofeilong 4ed0820f74 * Code for delete leftLine before leftTree . 2023-04-21 10:16:36 +08:00
guofeilong 74d165887e * Code for bug #34521 . 2023-04-21 09:49:14 +08:00
guofeilong 7a89f0b6d3 * Adjust code for bug icon-diamond in btn-group . 2023-04-21 09:28:35 +08:00
tianshujie d27d489adc * Fix the style problem of creating the document library. 2023-04-21 09:05:50 +08:00
tianshujie 8f15eb15e6 * Fixed the interface details page skip problem. 2023-04-21 08:55:51 +08:00
刘刚 1d45e86bda Merge branch 'tsj_fixbug' into 'master'
Tsj fixbug

See merge request easycorp/zentaopms!7503
2023-04-20 07:17:03 +00:00
caoyanyi e289047035 * Adjust the order in which document library fields are created. 2023-04-20 14:32:11 +08:00
guofeilong 5ecfcd3772 * Code for task #91380 . 2023-04-20 13:24:26 +08:00
tianshujie cf7cf423a3 * Limit header length. 2023-04-20 13:19:54 +08:00
caoyanyi 17d96b9e54 * Modify locate. 2023-04-20 09:43:30 +08:00
caoyanyi ffac4c9567 Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms into cyy_fixbug 2023-04-20 09:12:48 +08:00
caoyanyi 3f64a5d2dd * Modify api view page icon. 2023-04-20 09:11:24 +08:00
tianshujie 0f2a2b7bc3 * Fixed the interface details style problem. 2023-04-19 17:14:32 +08:00
caoyanyi ae153705d2 * Modify view style. 2023-04-19 16:57:07 +08:00
tianshujie 44794fcd43 * Change button color. 2023-04-19 16:49:29 +08:00
guofeilong 418a6a5ff9 * Code for task #91379 . 2023-04-19 16:29:06 +08:00
caoyanyi 7d0207ac87 Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms into cyy_fixbug 2023-04-19 16:21:15 +08:00
caoyanyi 658b918897 * Modify api view page style. 2023-04-19 16:16:30 +08:00
王怡栋 01c8d5d893 Merge branch 'tsj_fixbug' into 'master'
Tsj fixbug

See merge request easycorp/zentaopms!7474
2023-04-19 07:49:35 +00:00
tianshujie 18cba3006d * Modified create Project library page style. 2023-04-19 15:34:59 +08:00
guofeilong 4bd8a0b917 * Code for adjust style in drop. 2023-04-19 15:27:30 +08:00
guofeilong 70fd734b93 * Adjust code for add active to dropdown . 2023-04-19 15:27:07 +08:00
tianshujie 07ed9034a8 * Fixed a problem with the left module tree style. 2023-04-19 14:18:08 +08:00
caoyanyi 3f70026174 * Modify api view style. 2023-04-19 13:51:58 +08:00
tianshujie da8f3ade7f * Fix bug #34350. 2023-04-19 10:39:19 +08:00
tianshujie c17bf269f6 * Fix bug #34338. 2023-04-19 10:31:22 +08:00
tianshujie 32cf3c4d20 * Fix bug #34337. 2023-04-19 10:19:42 +08:00
tianshujie dd8fa67a12 * Fix bug #34359. 2023-04-19 09:10:42 +08:00
tianshujie c2d8da46ee Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms into tsj_fixbug 2023-04-19 09:07:21 +08:00
王怡栋 e3b14714fb Merge branch 'cyy_fixbug' into 'master'
* Modify catalog sort.

See merge request easycorp/zentaopms!7463
2023-04-19 00:58:43 +00:00