Commit Graph
1792 Commits
Author SHA1 Message Date
z 40dbb5b53a * code for task #12372. 2020-09-03 16:32:39 +08:00
z a9df6f3b9c * merge after 12.4.1 changes. 2020-08-31 15:31:55 +08:00
z ba32604be6 * fix for flow. 2020-08-31 15:17:40 +08:00
holan20180123 7edd4ee1d7 Merge branch 'master' of https://github.com/easysoft/zentaopms 2020-08-10 17:34:06 +08:00
holan20180123 afdf88d276 * Fix bug #3340. 2020-08-10 17:33:42 +08:00
z 23fac7fee6 Merge branch 'master' of github.com:easysoft/zentaopms 2020-08-10 13:42:06 +08:00
tianshujie98 6489d03921 * Fix bug #3293. 2020-08-10 13:40:47 +08:00
z f25c68666d Merge branch 'master' of github.com:easysoft/zentaopms 2020-08-10 13:38:06 +08:00
tianshujie98 29bc6f6df5 * Fix Bug #3293. 2020-08-10 13:30:43 +08:00
holan20180123 5e9d47b062 * Finish task #7613. 2020-08-10 11:31:50 +08:00
z cc5679a475 * revert code for create task. 2020-08-10 11:11:37 +08:00
tianshujie98 b38e6d0cf6 Merge branch 'master' of github.com:easysoft/zentaopms 2020-08-07 17:33:29 +08:00
holan20180123 3eb3fcce02 Merge branch 'master' of https://github.com/easysoft/zentaopms 2020-08-07 17:31:57 +08:00
holan20180123 28af4d63da * Finish task #7613. 2020-08-07 17:29:16 +08:00
tianshujie98 fdf70435de Merge branch 'master' of github.com:easysoft/zentaopms 2020-08-07 17:02:37 +08:00
tianshujie98 c411761142 * Finish task #7617,7615. 2020-08-07 16:59:44 +08:00
z 4acf8e3990 * finish task #7603,7603. 2020-08-07 15:14:20 +08:00
z f3a5fc4ef9 Merge branch 'master' of github.com:easysoft/zentaopms 2020-08-06 17:22:21 +08:00
z d1d918334a * fix bug #3337. 2020-08-06 17:21:19 +08:00
tianshujie98 da4222a8f4 * Fix bug #2564. 2020-08-06 15:56:25 +08:00
tianshujie98 2134ee1b8f * Fix bug #2499. 2020-08-06 15:49:29 +08:00
tianshujie98 bb3658ecf8 * Fix bug #2504. 2020-08-05 17:58:17 +08:00
tianshujie98 548b5655b0 Merge branch 'master' of github.com:easysoft/zentaopms 2020-08-05 17:22:22 +08:00
tianshujie98 ae1a3396ba Merge branch 'master' of github.com:easysoft/zentaopms 2020-08-05 09:41:47 +08:00
tianshujie98 7dc09c5374 * Finish task #7584. 2020-08-05 09:29:53 +08:00
z bb3ad790d0 Merge branch 'master' of github.com:easysoft/zentaopms 2020-08-04 14:02:28 +08:00
z 9a17e562d8 * merge fr lang. 2020-08-03 10:14:25 +08:00
holan20180123 c351b21b76 * Finish task #7571. 2020-07-31 15:53:40 +08:00
z 277ed6ca46 * fix dev-api and change zh-tw lang. 2020-07-28 08:42:29 +08:00
z 1e932f160c * add new version and upgrade. 2020-07-27 14:14:19 +08:00
z e9cfd48d18 * adjust for refreshPage and set closed for member. 2020-07-27 13:28:33 +08:00
Yagami 049d27f689 * Fix task assignedTo when closed. 2020-07-27 09:42:56 +08:00
sgm0422 deb448d2bb * Finish task #7551. 2020-07-25 18:49:20 +08:00
chenfei 893a672c5a * Finish task #7473. 2020-07-22 16:28:09 +08:00
tianshujie98 eeea421cf9 * Finish task #7487,7488. 2020-07-20 13:13:41 +08:00
tianshujie98 a1db9d97bf Merge branch 'master' of github.com:easysoft/zentaopms 2020-07-17 09:00:05 +08:00
tianshujie98 a9dcdea00d * Finish task #7472. 2020-07-17 08:58:18 +08:00
sgm0422 c2f3115c4e Merge branch 'master' of https://github.com/easysoft/zentaopms 2020-07-16 14:12:46 +08:00
sgm0422 c4356f0eaa * Finish task #7466. 2020-07-16 14:11:22 +08:00
holan20180123 fff031bfbb Merge branch 'master' of https://github.com/easysoft/zentaopms 2020-07-16 13:07:58 +08:00
holan20180123 d0a458160f * Finish #7471. 2020-07-16 13:07:23 +08:00
sgm0422 725a550aff * Finish task #7428. 2020-07-15 15:06:22 +08:00
chenfei 41e862d5cb * Finish task #5104. 2020-07-14 16:16:47 +08:00
sgm0422 2e454b1415 * Finish task #7429. 2020-07-14 11:21:12 +08:00
sgm0422 6e151fa735 * Finish task #7421. 2020-07-13 16:51:53 +08:00
sgm0422 f88acd63b8 * Finish task #7415. 2020-07-13 16:11:26 +08:00
tianshujie98 a4b52c7e87 Finish task #7413,7394,7391,7384,7381. 2020-07-13 14:21:29 +08:00
z 6bb5cf37ce * fix bug for batch edit task. 2020-07-09 15:25:03 +08:00
z ac3e27aa04 * revert for recordZero. 2020-07-06 17:11:53 +08:00
z 9b80f4d9de * code for task #7302. 2020-07-06 09:08:09 +08:00