Design/EasySoft-ZenTaoPMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 30 Wiki Activity
44,786 Commits 2 Branches 292 Tags
e07d28fd82ee4672dde3a45bfd32d89c2fc2b5e8
Commit Graph
914 Commits
Author SHA1 Message Date
tanghucheng 4f7582d37d Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms into importExport 2022-09-05 13:17:29 +08:00
wangyidong e7d65e1dce Merge branch 'sprint/zentaopms230' 2022-09-01 13:28:26 +08:00
tanghucheng f82ca09e99 * Compatible workflow fields for import|export. 2022-08-31 11:15:59 +08:00
liumengyi 9b0f6544df * Fix bug #23957, #26846. 2022-08-29 15:11:21 +08:00
tianshujie 1e59fbd311 * Fix bug #26882. 2022-08-25 16:48:00 +08:00
tanghucheng 68f35f5262 * Fix bug #26520,26520. 2022-08-16 13:58:19 +08:00
wangyidong 95ef309921 * code for task #65279. 2022-08-16 13:39:25 +08:00
tanghucheng 824b9219d9 * Code for gantt. 2022-08-10 13:34:57 +08:00
lanzongjun fa254f518e resolve conflict 2022-08-05 08:49:49 +08:00
lanzongjun 5f5d893546 add plugins 2022-08-02 08:33:50 +08:00
lanzongjun f866342fd2 * upgrade 2022-07-28 13:26:09 +08:00
tianshujie e0537276bd * Delete useless code. 2022-07-21 09:30:35 +08:00
wangyidong 2cf2c96ebd Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms 2022-07-20 17:25:00 +08:00
wangyidong ab6ee566e7 * code for task #61191. 2022-07-20 16:14:55 +08:00
hufangzhou fab8fedf10 * Adjust the judgment condition to a configuration item. 2022-07-20 14:15:43 +08:00
hufangzhou 1dcf2dcb2c * Code for task #59750. 2022-07-20 10:13:21 +08:00
Wenrui LI bcaaf11dfc * fix double header covering main in zentaoclient. 2022-07-15 08:52:25 +08:00
hufangzhou 8c62376d05 * Fix bug #25281. 2022-07-14 15:49:55 +08:00
tianshujie 5ccd62ea84 * Merge insensitive refresh custom forms into one method. 2022-07-07 10:44:29 +08:00
tianshujie cdaf164f0a * Fix bug #24752,24747. 2022-07-06 08:26:27 +08:00
tianshujie 87160bf3a5 * Fix bug #24718. 2022-07-05 09:53:43 +08:00
tianshujie 63834e128c * Fix bug #24718. 2022-07-05 09:52:13 +08:00
tianshujie de4ae73289 * Fix bug #24718. 2022-07-05 08:46:11 +08:00
tianshujie 3028701a06 * Finish task #59472. 2022-07-04 17:18:20 +08:00
王怡栋 04b2a5994f Merge branch 'sprint/208_tianshujie_58554' into 'master' 
Sprint/208 tianshujie 58554

See merge request easycorp/zentaopms!4317
 2022-07-04 06:59:21 +00:00
tianshujie 14037d612b * Finish task #58554. 2022-07-04 14:58:56 +08:00
tianshujie 49ecf0795c * Finish task #58554. 2022-07-04 14:57:07 +08:00
tianshujie 6fc6d25a48 * Finish task #58554. 2022-07-04 14:48:24 +08:00
tianshujie fedefaf02b * Finish task #58554. 2022-07-04 13:20:33 +08:00
liumengyi 61a1405ff2 * Fix bug #23914, #23999. 2022-06-30 14:03:24 +08:00
liumengyi 076a744a0a * Fix bug #23914, #23999. 2022-06-30 13:58:18 +08:00
王怡栋 8ad9dea460 Merge branch 'sprint/xuan_106' into 'master' 
Sprint/xuan 106

See merge request easycorp/zentaopms!4126
 2022-06-24 01:35:58 +00:00
dingyongliang 7963845b6b * mv style to x.style.css. 2022-06-24 01:32:03 +00:00
宋辰轩 9460102a29 * Format. 2022-06-20 15:11:29 +08:00
宋辰轩 0b83f28fe9 * CommonLang. 2022-06-20 15:09:59 +08:00
dingyongliang 0774bce6ef * electron/zentao: merge navigation bar and control bar. 2022-06-17 09:18:07 +00:00
leiyong ae55e2c31e * Fix bug#23841. 2022-06-17 01:30:09 +00:00
tianshujie 604996bcae * Changing variable names. 2022-06-16 11:38:32 +08:00
王怡栋 504319fcef Merge branch 'leiyong_fix_bug_23735' into 'master' 
* Fix bug#23793.

See merge request easycorp/zentaopms!3953
 2022-06-16 01:03:22 +00:00
leiyong 32642d45ae * Fix bug#23793. 2022-06-15 10:00:58 +00:00
孙广明 1f13b14799 Merge branch 'master' into 'sprint/204_tianshujie_57095' 
# Conflicts:
#   module/execution/css/all.css
 2022-06-15 09:03:47 +00:00
tianshujie 2c176439d3 * Finish task #57095. 2022-06-15 15:09:34 +08:00
leiyong b79aab5d93 * Adjust style. 2022-06-14 10:25:10 +00:00
leiyong 8054e4f631 * Finish task#56925. 2022-06-14 08:55:28 +00:00
xieqiyu c03d486fab * Finish task#56919. 2022-06-14 15:55:48 +08:00
孙广明 b896377846 * Change zentao license. 2022-06-08 10:02:29 +08:00
孙广明 b528156589 * Change license. 2022-06-08 09:34:46 +08:00
宋辰轩 328aea3be5 * Modify supportLang to defaultLang. 2022-06-07 10:56:42 +08:00
宋辰轩 d50f757397 * SupportLang. 2022-06-07 09:52:57 +08:00
孙华伟 34b536605a Update action.html.php 2022-05-30 01:14:45 +00:00