Commit Graph
15922 Commits
Author SHA1 Message Date
wangyidong ca50ee698c * finish task #6168. 2019-07-29 14:36:00 +08:00
wangyidong d187bc8515 * remove debug code. 2019-07-29 09:09:22 +08:00
wangyidong e701f45620 * adjust for setControlFile. 2019-07-29 08:46:55 +08:00
liugang 9c81da7069 * Change width. 2019-07-26 19:04:38 +08:00
wangyidong 6c66211714 Merge branch 'master' of github.com:easysoft/zentaopms 2019-07-26 17:49:18 +08:00
wangyidong 5ace83db9a * adjust for sendmail. 2019-07-26 17:48:52 +08:00
chenfei 8e0f54cf6e * Finish task: https://backyard.cnezsoft.com/pms/task-view-8372.html 2019-07-26 16:04:09 +08:00
wangyidong e258415f5a Merge branch 'master' of github.com:easysoft/zentaopms 2019-07-26 15:49:20 +08:00
wangyidong 9b2174e001 * adjust for code style. 2019-07-26 15:48:56 +08:00
wangyidong 1b87f3c9c1 * fix bug for parse float consumed when finish. 2019-07-26 15:47:46 +08:00
chenfei 935fc96403 Merge branch 'master' of https://github.com/easysoft/zentaopms 2019-07-26 15:45:30 +08:00
Yagami 1928dc0e69 * Finish task #8350. 2019-07-26 15:19:48 +08:00
Yagami f333ad229a Merge branch 'master' of https://github.com/easysoft/zentaopms 2019-07-26 15:15:20 +08:00
Yagami 8555d3ac21 * Finish task #8349. 2019-07-26 15:15:07 +08:00
wangyidong 973809cd73 Merge branch 'master' of github.com:easysoft/zentaopms 2019-07-26 15:06:50 +08:00
Yagami 5deed47298 * Finish task #8343. 2019-07-26 15:02:05 +08:00
Yagami 815baa1cea Merge branch 'master' of https://github.com/easysoft/zentaopms 2019-07-26 15:01:11 +08:00
wangyidong 964ab3bf31 * finish task #8348. 2019-07-26 15:01:05 +08:00
Yagami aeda35218e * Finish task #8342. 2019-07-26 15:00:57 +08:00
wangyidong e2e4090293 Merge branch 'master' of github.com:easysoft/zentaopms 2019-07-26 14:57:17 +08:00
wangyidong ae56637431 * finish task #8346. 2019-07-26 14:56:12 +08:00
wangyidong 11404183bb * finish task #8344,8345. 2019-07-26 14:52:45 +08:00
chenfei 230c02ff1d * Finish task: https://backyard.cnezsoft.com/pms/task-view-8347.html 2019-07-26 14:41:29 +08:00
chenfei 3367f7718d * Finish task: https://backyard.cnezsoft.com/pms/task-view-8341.html 2019-07-26 14:36:26 +08:00
Yagami 5c1b1f4453 Merge branch 'master' of https://github.com/easysoft/zentaopms 2019-07-26 14:34:35 +08:00
Yagami e8d577ec68 * Finish task #8340. 2019-07-26 14:34:07 +08:00
liugang 1e73865303 * Change flowModel::printFields to control::printExtendFields. 2019-07-26 08:49:55 +08:00
jinianlan aac0ce2554 * fix Bug #2656,#2653 2019-07-25 17:57:15 +08:00
liugang 621f338faa * Optimize the function executeHooks. 2019-07-25 13:02:18 +08:00
jinianlan d5e9999636 Merge branch 'master' of github.com:easysoft/zentaopms 2019-07-24 20:05:55 +08:00
jinianlan b6b9901b82 * fix Bug #2653 2019-07-24 20:04:35 +08:00
chenfei 821095baf7 * Adjust execute hook for workflow. 2019-07-24 18:26:00 +08:00
chenfei 3d626b7026 * Fix bug of view a flow page by path_info. 2019-07-24 18:06:29 +08:00
liugang aecff99932 * Fix bug of view a flow page by path_info. 2019-07-24 17:49:40 +08:00
jinianlan 55c45acae5 * fix Bug #2660 2019-07-24 16:24:15 +08:00
wangyidong 409dd4680e Merge branch 'master' of github.com:easysoft/zentaopms 2019-07-24 13:44:40 +08:00
wangyidong ff55e2267f * add printExtendFields method. 2019-07-24 13:44:01 +08:00
liugang f70eef7789 * Optimize function executeHooks. 2019-07-24 10:49:41 +08:00
wangyidong f1b0faf11b * adjust sortable file. 2019-07-24 09:35:40 +08:00
wyd621 cdf0a7e6c5 Merge pull request #34 from easysoft/zentaopms_workflow
Zentaopms workflow
2019-07-24 09:33:33 +08:00
wyd621 f858660ceb Merge branch 'master' into zentaopms_workflow 2019-07-24 09:14:23 +08:00
jinianlan 65ca28c111 * fix task #2651,#2642 2019-07-23 16:03:21 +08:00
jinianlan 77d1853878 * fix task #2651,#2642 2019-07-23 16:00:11 +08:00
liugang 6ef88595e1 * Add codes of workflow. 2019-07-23 14:17:56 +08:00
jinianlan 0672bc7a0b * finish task #2656 2019-07-23 14:06:31 +08:00
jinianlan ed834881b8 Merge branch 'master' of github.com:easysoft/zentaopms 2019-07-23 14:05:49 +08:00
wangyidong a1bf91fb7b * cache file read image. 2019-07-23 13:45:54 +08:00
Yagami 7c989eaf12 * Code for task #8292. 2019-07-23 11:11:09 +08:00
jinianlan fbf7a7f073 * finish task #2651,#2642 2019-07-23 09:46:54 +08:00
Yagami 3ce866ab08 * Fix filter class. 2019-07-23 09:24:55 +08:00