Commit Graph
939 Commits
Author SHA1 Message Date
tianshujie aec7381fcf * Code for task #90782. 2023-04-12 16:46:53 +08:00
tianshujie 5444be8677 * Code for task #90782. 2023-04-12 15:08:32 +08:00
tianshujie 2a71bcf16b * Code for task #90782. 2023-04-12 14:43:47 +08:00
tianshujie c7c7e55d0c Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms into tsj_task 2023-04-12 14:32:47 +08:00
caoyanyi 875aee00b1 * Modify doc priv style. 2023-04-12 14:31:37 +08:00
tianshujie 9a4c5d2ac8 * Code for task #90782. 2023-04-12 13:15:55 +08:00
caoyanyi 493e4a8589 * Modify no data tips. 2023-04-12 11:10:01 +08:00
caoyanyi 26b79296d4 * Code for bug #34013, task #90781. 2023-04-12 10:38:22 +08:00
caoyanyi 021dbcc7eb Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms into cyy_90779 2023-04-12 10:10:59 +08:00
caoyanyi c6cf7c6f35 * Code for task #90781. 2023-04-12 10:10:29 +08:00
王怡栋 78a9facdb3 Merge branch 'tsj_task' into 'master'
* Code f or dynamic

See merge request easycorp/zentaopms!7374
2023-04-12 01:55:43 +00:00
tianshujie 324dfe4650 * Code for task #90780. 2023-04-12 09:08:51 +08:00
caoyanyi 4e888b8f3d Merge branch 'tsj_task' of https://gitlab.zcorp.cc/easycorp/zentaopms into cyy_90779 2023-04-12 09:00:04 +08:00
tianshujie 1d2a069f12 * Rename block. 2023-04-12 08:44:40 +08:00
caoyanyi f194177369 Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms into cyy_90779 2023-04-11 17:13:05 +08:00
caoyanyi 675f25a191 * Modify style for right block. 2023-04-11 16:47:45 +08:00
tianshujie 81e7153c8e * Code for task #90780. 2023-04-11 16:34:29 +08:00
caoyanyi 185550fcf4 * Code for task #90779. 2023-04-11 16:11:55 +08:00
tianshujie 1f026f246a * Code for task #90780. 2023-04-11 15:38:44 +08:00
tianshujie 66d0694599 * Code for task #90778. 2023-04-10 17:15:26 +08:00
caoyanyi 8e3935c8d7 * Modify font color. 2023-03-16 14:11:11 +08:00
caoyanyi 61b782d0d3 * Adjust code. 2023-03-13 15:27:14 +08:00
guofeilong 7375d26d90 * Code for bug #32714 . 2023-03-13 14:18:55 +08:00
caoyanyi 7d40afc496 * Fix bug 29433. 2023-03-10 10:16:07 +08:00
王怡栋 3438722a8c Merge branch 'master' into 'zentaopms_289'
# Conflicts:
#   db/update18.2.sql
2023-03-06 03:26:34 +00:00
Yagami f95691948a Merge branch 'zentaopms_294' 2023-03-06 08:37:11 +08:00
tianshujie 3886a5f25b Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms into zentaopms_289 2023-03-02 08:27:28 +08:00
guofeilong 4ad274cf1b * Code for bug #32448. 2023-03-01 17:12:53 +08:00
tianshujie 872137cea6 Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms into zentaopms_289 2023-03-01 08:35:21 +08:00
caoyanyi 569efba6e0 * Optimize page style for guide block. 2023-02-28 16:14:58 +08:00
liumengyi 2c557b7900 * Finish task #85651. 2023-02-27 08:51:12 +00:00
tianshujie cf4c9931e2 * Code for finish task #84527. 2023-02-27 15:29:02 +08:00
caoyanyi 2f3aae9281 Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms into zentaopms_289 2023-02-23 16:05:42 +08:00
Yagami 290487a68a * Fix bug #32263. 2023-02-23 10:19:19 +08:00
caoyanyi 10da3ef802 * Modify language defined. 2023-02-23 09:32:56 +08:00
tianshujie 5b2cafa380 Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms into zentaopms_289 2023-02-21 14:13:51 +08:00
Lufei 63a8a97c59 * Compatible PHP5.3. 2023-02-21 09:15:53 +08:00
guofeilong 684fa3557c * Code refactors in preference.html.php . 2023-02-20 11:16:41 +08:00
guofeilong 6da9c01104 * Code for add js to module/langItem . 2023-02-20 10:00:43 +08:00
tianshujie d9322e91e2 * Code for finish task#84576. 2023-02-17 09:33:34 +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
tianshujie 4f65445e8e * Code for finish task #84576. 2023-02-15 16:31:18 +08:00
guofeilong bc88bfece2 * code for delete / after background-image: url 2023-02-14 09:56:33 +08:00
guofeilong 89be39c7e3 * Code for class refactors in flowChart 2023-02-13 09:43:04 +08:00
guofeilong 08b3159b3d * Code for fix style problem in flowChart. 2023-02-10 11:24:53 +08:00
daitingting e155d462a7 * Fix bug #24499. 2023-02-09 06:10:28 +00:00
guofeilong df8608ddc9 * Code for style problem in flowchart 2023-02-03 14:23:22 +08:00
caoyanyi 32174bfc47 * Modify block style. 2023-01-13 10:55:23 +08:00
caoyanyi 0eea47c282 * Modify help block style. 2023-01-13 10:53:26 +08:00