Commit Graph
16034 Commits
Author SHA1 Message Date
wangyidong 6586422f96 * finish task #8391. 2019-08-02 14:48:14 +08:00
wangyidong b71b877e2b Merge branch 'master' of github.com:easysoft/zentaopms 2019-08-02 13:40:47 +08:00
wangyidong 922800cb81 * change for task #8445. 2019-08-02 13:40:13 +08:00
liugang 50ff9f7dd6 * Add comment. 2019-08-01 17:42:33 +08:00
jinianlan fc2eda8fa6 * fix Bug 2671 2019-08-01 17:38:49 +08:00
reneeteng 7e0d1c74c9 Merge branch 'master' of https://github.com/easysoft/zentaopms 2019-08-01 17:23:48 +08:00
liugang 1ea682dd89 * Optimize codes to get options of the subStatus field in search form. 2019-08-01 16:55:47 +08:00
reneeteng 6e75c8d644 * Lang file update. 2019-08-01 16:30:10 +08:00
wangyidong d3a51bf7f4 * remove upper case letters for lang code. 2019-08-01 16:25:30 +08:00
wangyidong e778243587 * replace fsockopen for don't validate remote hosts. 2019-08-01 16:24:48 +08:00
reneeteng 94e363f9d2 Merge branch 'master' of https://github.com/easysoft/zentaopms 2019-08-01 15:40:54 +08:00
wangyidong 182e0f7158 * adjust for bug confirm style. 2019-08-01 14:09:07 +08:00
wangyidong 55143c8994 Merge branch 'master' of github.com:easysoft/zentaopms 2019-08-01 13:45:54 +08:00
wangyidong 14de95c847 * adjust for build lang file for translate. 2019-08-01 13:42:03 +08:00
jinianlan 1289533006 * fix Bug #2664 2019-08-01 09:07:46 +08:00
reneeteng 917dfe0696 Merge branch 'master' of https://github.com/easysoft/zentaopms 2019-07-31 17:25:52 +08:00
wangyidong b85198eef6 * finish task #8395. 2019-07-31 17:15:57 +08:00
wangyidong 1870ba51c0 * finish task #8388. 2019-07-31 16:14:33 +08:00
wangyidong bb2ca5d550 * finish task #8393. 2019-07-31 15:58:29 +08:00
wangyidong bc003897a4 Merge branch 'master' of github.com:easysoft/zentaopms 2019-07-31 15:55:53 +08:00
wangyidong 2430536531 * finish task #8397. 2019-07-31 15:55:27 +08:00
Yagami b3ea0b9834 * Add lang for workflow. 2019-07-31 14:17:54 +08:00
Yagami 3e8ea0bc98 Merge branch 'master' of https://github.com/easysoft/zentaopms 2019-07-31 14:13:50 +08:00
Yagami 693a0dfe3e * Add lang for workflow. 2019-07-31 14:13:32 +08:00
wangyidong 5eb2d402d0 Merge branch 'master' of github.com:easysoft/zentaopms 2019-07-31 14:03:24 +08:00
wangyidong de7d719459 * adjust for task #8280. 2019-07-31 14:03:00 +08:00
Yagami 48fb320604 * Add lang for workflow. 2019-07-31 14:02:02 +08:00
wangyidong a1c8888cf4 * code for task #8280. 2019-07-31 13:43:51 +08:00
Yagami b11645ec2c * Add lang for workflow. 2019-07-31 13:33:39 +08:00
Yagami 63f9916a85 * Add lang for workflow. 2019-07-31 13:24:18 +08:00
Yagami 10752dbefb * Add lang for workflow. 2019-07-31 13:17:51 +08:00
Yagami 26b203e20a * Add lang for workflow. 2019-07-31 09:28:00 +08:00
Yagami 73b82e2e00 Merge branch 'master' of https://github.com/easysoft/zentaopms 2019-07-31 09:11:34 +08:00
Yagami 17bc28a65a * Add lang for workflow. 2019-07-31 09:11:13 +08:00
wangyidong 59ea86853c Merge branch 'master' of github.com:easysoft/zentaopms 2019-07-31 09:10:24 +08:00
wangyidong f3a57d65d7 * finish task #8387. 2019-07-31 09:10:00 +08:00
Yagami 5165052731 Merge branch 'master' of https://github.com/easysoft/zentaopms 2019-07-31 08:58:03 +08:00
Yagami 6b10f0ca15 * Add lang for workflow. 2019-07-31 08:57:33 +08:00
jinianlan 15c6c30ee4 Merge branch 'master' of github.com:easysoft/zentaopms 2019-07-31 08:55:54 +08:00
jinianlan 7e26346313 * finish task #6155,#6151,#6147,#6144 2019-07-31 08:54:16 +08:00
Yagami 59251affd2 * Finish task #6152. 2019-07-31 08:23:13 +08:00
liugang 9c53dd8e6b * Use the function zget to get users. 2019-07-30 17:33:59 +08:00
wangyidong 2a011d5d42 * code for task #6145. 2019-07-30 17:06:43 +08:00
Catouse b3163a8d37 Merge branch 'master' of https://github.com/easysoft/zentaopms 2019-07-30 17:03:22 +08:00
Catouse 1b257668c4 * update zui. 2019-07-30 17:03:08 +08:00
wangyidong f4f3b64d17 * revert group task js. 2019-07-30 16:53:42 +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 53ffb2ab78 Merge branch 'master' of github.com:easysoft/zentaopms 2019-07-30 15:39:19 +08:00
wangyidong 17b53acaa9 * finish task #6161. 2019-07-30 15:38:49 +08:00