Commit Graph
1651 Commits
Author SHA1 Message Date
Yagami d206d13913 * Finish task #6316. 2019-09-02 10:49:43 +08:00
wangyidong 2a83351760 * add en and zh-tw lang. 2019-08-22 17:34:55 +08:00
wangyidong 162887854f * finish task #6233. 2019-08-22 11:14:56 +08:00
wangyidong 253e0ab3a8 * finish task #6231. 2019-08-21 15:32:29 +08:00
wangyidong 83525e6152 * finish task #6249. 2019-08-21 09:40:35 +08:00
wangyidong 153e8b272d * add new version and upgrade. 2019-08-19 11:34:29 +08:00
wangyidong 97fc947913 * computeWorkingHours has in updateParentStatus method. 2019-08-14 15:34:43 +08:00
liugang dc022ad849 * Optimize function to printExtendFields. 2019-08-13 14:58:15 +08:00
jinianlan 968390978c Merge branch 'master' of github.com:easysoft/zentaopms 2019-08-12 08:25:42 +08:00
jinianlan c6cba5483e * finish task #6173,#6174,#6175,#6183,#6186,#6187. 2019-08-12 08:23:00 +08:00
wangyidong 9d4b78a8f2 * finish task #6171. 2019-08-09 10:29:57 +08:00
wangyidong dec97060a6 * finish task #6205. 2019-08-08 16:29:51 +08:00
wangyidong 7964ce412f * finish task #6190. 2019-08-07 15:27:39 +08:00
liugang cd0e4ee3fe * Adjust lang files. 2019-08-06 14:35:43 +08:00
liugang ca3032e325 * Set hidden status in pages. 2019-08-05 17:25:30 +08:00
jinianlan fc2eda8fa6 * fix Bug 2671 2019-08-01 17:38:49 +08:00
wangyidong de7d719459 * adjust for task #8280. 2019-07-31 14:03:00 +08:00
wangyidong a1c8888cf4 * code for task #8280. 2019-07-31 13:43:51 +08:00
liugang 9c53dd8e6b * Use the function zget to get users. 2019-07-30 17:33:59 +08:00
wangyidong 3f4a0d8016 * fix for cron. 2019-07-30 16:34:39 +08:00
liugang 1cc1daa794 * Use the function processStatus to get status of a record. 2019-07-30 15:41:13 +08:00
wangyidong 17b53acaa9 * finish task #6161. 2019-07-30 15:38:49 +08:00
liugang 9df3aaf581 * Use function processStatus to get status of a task. 2019-07-30 13:08:17 +08:00
Yagami 0976a004a8 * Add lang file for workflow. 2019-07-30 11:10:14 +08:00
liugang 5e32ee1081 * Add subStatus in lang files.
* Change sub status when status is changed and sub status is not set, and record the changes.
2019-07-30 10:10:10 +08:00
jinianlan c90aac3512 * finish task #6166,#6149,6139 2019-07-29 15:54:08 +08:00
chenfei 8e0f54cf6e * Finish task: https://backyard.cnezsoft.com/pms/task-view-8372.html 2019-07-26 16:04:09 +08:00
wangyidong 1b87f3c9c1 * fix bug for parse float consumed when finish. 2019-07-26 15:47:46 +08:00
liugang 1e73865303 * Change flowModel::printFields to control::printExtendFields. 2019-07-26 08:49:55 +08:00
liugang 621f338faa * Optimize the function executeHooks. 2019-07-25 13:02:18 +08:00
chenfei 821095baf7 * Adjust execute hook for workflow. 2019-07-24 18:26:00 +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
wyd621 f858660ceb Merge branch 'master' into zentaopms_workflow 2019-07-24 09:14:23 +08:00
jinianlan 77d1853878 * fix task #2651,#2642 2019-07-23 16:00:11 +08:00
jinianlan fbf7a7f073 * finish task #2651,#2642 2019-07-23 09:46:54 +08:00
liugang 0d413b3f65 * Rename extension to hooks. 2019-07-22 17:07:51 +08:00
liugang c8958a5581 * Add function to execute extension. 2019-07-22 16:36:53 +08:00
jinianlan f26fb45064 Merge branch 'master' of github.com:easysoft/zentaopms 2019-07-16 08:51:59 +08:00
jinianlan c383da7a8c * finish task #6097,#6103,#6108,#6100 2019-07-15 17:07:26 +08:00
wangyidong 2671f7a044 * finish task #6090. 2019-07-15 15:56:31 +08:00
chenfei 707b8c7507 Merge branch 'zentaopms_workflow' of https://github.com/easysoft/zentaopms into zentaopms_workflow 2019-07-13 13:35:28 +08:00
chenfei 90014ee5cc * Code for task #8278 of inner backyard pms. 2019-07-13 13:31:44 +08:00
wangyidong a621ff9037 * add new version and upgrade. 2019-07-12 16:44:30 +08:00
wyd621 9143f4e38f Merge branch 'master' into 11.5 2019-07-12 15:55:04 +08:00
wangyidong 0722210180 * code for task #5997. 2019-07-12 14:49:19 +08:00
wangyidong c51eac4776 * finish task #5997. 2019-07-12 14:44:39 +08:00
Yagami 8a313c4ef4 * Fix param for printFields. 2019-07-12 11:19:23 +08:00
wangyidong 0bc93a387f * finish task #5929. 2019-07-12 11:15:23 +08:00