Commit Graph
918 Commits
Author SHA1 Message Date
hufangzhou f9f5c459e9 * Rename the privilege of custom-limitTaskDate. 2023-04-19 09:18:07 +08:00
liumengyi 825600f1fe - Delete the privilege of custom-index. 2023-04-13 16:01:32 +08:00
朱金勇 8050bee793 * Fix data type of dmdb. 2023-04-12 01:49:08 +00:00
tianshujie 3abf7ef71d * Fix bug #33307. 2023-03-23 17:23:59 +08:00
tianshujie 53666d1580 * Add the concept of default requirements. 2023-03-16 16:16:00 +08:00
tianshujie e68579843f * Fix bug 32965. 2023-03-15 15:55:49 +08:00
王怡栋 f526a16291 Merge branch 'master' into 'tsj_fixbug'
# Conflicts:
#   module/custom/lang/zh-cn.php
2023-03-15 06:19:32 +00:00
tianshujie 445323e278 * Modify product line language. 2023-03-15 11:00:45 +08:00
hufangzhou 125a4384af * Add the new version. 2023-03-15 02:53:46 +00:00
liumengyi 9728298427 * Fix bug of task #87014. 2023-03-13 07:37:04 +00:00
liumengyi 637b0912a7 * Finish task #87013. 2023-03-13 07:07:13 +00:00
caoyanyi 6e7c9e25e8 * Update project common lang. 2023-03-08 09:36:56 +08:00
tianshujie 1d6825f5b6 * Modify language items for project,product common. 2023-03-07 17:03:52 +08:00
王怡栋 3438722a8c Merge branch 'master' into 'zentaopms_289'
# Conflicts:
#   db/update18.2.sql
2023-03-06 03:26:34 +00:00
tianshujie 462e737432 * Fixed the issue of initializing more drop-down language items. 2023-03-06 10:45:12 +08:00
Yagami f95691948a Merge branch 'zentaopms_294' 2023-03-06 08:37:11 +08:00
tianshujie 4d400723ce * Modify more select display method. 2023-03-03 15:54:33 +08:00
tianshujie 3387bf56e3 * Code for finish task 84527. 2023-03-03 13:03:53 +08:00
caoyanyi bec24aafa9 Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms into zentaopms_289 2023-03-01 11:52:44 +08:00
liumengyi a1c9148a6b * Finish task #85640. 2023-03-01 02:03:03 +00:00
liumengyi 76be77868c * Fix bug #32520. 2023-03-01 01:34:14 +00:00
caoyanyi ac2891ac41 Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms into zentaopms_289 2023-02-28 13:53:09 +08:00
hufangzhou d1f2700812 * Finish task #85629. 2023-02-28 05:16:43 +00:00
tianshujie c82f1a02a7 Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms into tsj_ui 2023-02-28 13:13:13 +08:00
tianshujie cd595dc605 * Code for fix bug #32461. 2023-02-28 11:03:02 +08:00
tianshujie f6a573a51f * Code for fix bug #32458. 2023-02-28 10:32:13 +08:00
tianshujie 5fe4075ef1 Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms into zentaopms_289 2023-02-28 08:26:03 +08:00
wangyidong 11507ffff2 * fix bug #32277. 2023-02-27 16:16:04 +08:00
tianshujie fc99d01af9 * Fixed Save labels clearing other labels. 2023-02-27 16:09:06 +08:00
liumengyi 4912b2004e * Finish task #85630. 2023-02-27 06:54:39 +00:00
王怡栋 b547e0006c Merge branch 'sprint/tsj_nav' into 'zentaopms_289'
Sprint/tsj nav

See merge request easycorp/zentaopms!7074
2023-02-27 06:28:53 +00:00
wangyidong 1e9fc76676 * add unit test for dev. 2023-02-27 14:26:18 +08:00
tianshujie aaac6a6d0e * The tag output problem was rectified. 2023-02-27 13:42:15 +08:00
wangyidong 84efbac63f * code for custom menu lang. 2023-02-25 12:10:08 +08:00
caoyanyi 6caaf4c316 Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms into zentaopms_289 2023-02-23 08:32:25 +08:00
tianshujie d753f6ebb6 * Resolve issue #761. 2023-02-22 15:31:45 +08:00
tianshujie af76befb02 * Resolve issue #756. 2023-02-22 15:15:34 +08:00
zhujinyong e9ef9029b6 * Code for task #84594. 2023-02-22 11:39:36 +08:00
caoyanyi e9b4bb067e Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms into zentaopms_289 2023-02-22 11:17:41 +08:00
tianshujie 650e440acc * Code for finish task #85046. 2023-02-22 11:11:14 +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
tianshujie 517fb3c796 * Code for finish task #85046. 2023-02-21 13:13:13 +08:00
caoyanyi b0aef0569a Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms into zentaopms_289 2023-02-20 08:13:40 +08:00
tianshujie cb3a0faa9c * Added mandatory execution items config. 2023-02-17 14:02:01 +08:00
guofeilong ffd36c4499 * Code for custom-set css refactors. 2023-02-17 10:23:45 +08:00
caoyanyi c8374b1e14 Merge branch 'master' into zentaopms_289 2023-02-17 10:11:16 +08:00
guofeilong 6943902abc * Code for style in hours.html. 2023-02-17 09:16:10 +08:00
guofeilong 553f1157ac * Code for css in hours. 2023-02-17 09:07:22 +08:00
tianshujie e652d0075c * Code for fix bug #32189. 2023-02-16 15:15:36 +08:00
wangyidong 1b70d6e8a4 * code for task #84532. 2023-02-16 13:55:23 +08:00