Commit Graph
919 Commits
Author SHA1 Message Date
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
王怡栋 de8493412a Merge branch 'cyy_bug' into 'master'
* Modify job edit error tip.

See merge request easycorp/zentaopms!6689
2023-01-05 02:55:34 +00:00
田淑杰 5ecaa57043 * Fix bug #31470. 2023-01-05 10:13:34 +08:00
caoyanyi 459f1ae27d * Fix bug #31469. 2023-01-05 09:58:49 +08:00
caoyanyi b758139f9b * Modify vision switch. 2023-01-04 15:27:10 +08:00
caoyanyi 8ac4dc8fd4 Merge branch 'master' into cyy_bug 2023-01-04 09:34:04 +08:00
caoyanyi c853331163 * Modify admin user check. 2023-01-04 09:33:08 +08:00
caoyanyi c3f8d4873f * Fix bug #31397. 2023-01-03 17:09:58 +08:00
孙广明 c29776bbfe Merge branch 'sprint/tsj_fixbug' into 'master'
Sprint/tsj fixbug

See merge request easycorp/zentaopms!6667
2023-01-03 05:54:09 +00:00
王怡栋 aef16e3c83 Merge branch 'sprint/gfl_task_40825' into 'master'
* code for task #40827

See merge request easycorp/zentaopms!6659
2023-01-03 01:54:28 +00:00
tianshujie a2f27fe5d5 * Fix bug #30557. 2023-01-03 08:43:08 +08:00
wangyidong ccec9bcc16 Merge branch 'zentaopms279' 2023-01-03 08:39:33 +08:00
tianshujie e11298c33b * code for task #40827 2022-12-30 17:32:05 +08:00
tianshujie 41dd1a0280 * code for task #40827 2022-12-30 16:47:15 +08:00
caoyanyi 597b11524f * Modify text style. 2022-12-30 15:09:44 +08:00
wangyidong 7c3958183f * code for task #81412,81413. 2022-12-29 15:33:40 +08:00
tianshujie a1fe18b99d * code for bug #81093 2022-12-29 15:17:18 +08:00
tianshujie 2ed3974bc6 * code for bug #81093 2022-12-29 15:14:34 +08:00
caoyanyi 15ea4e0e22 * Optimize page style. 2022-12-22 16:24:43 +08:00
wangzemei f2cb91a66b * fix css 2022-12-22 15:15:36 +08:00
wangzemei 4af98c110d * fix bug 2022-12-22 14:37:21 +08:00