Commit Graph
1868 Commits
Author SHA1 Message Date
leiyong 77d8f2255f * Finish task#7736. 2020-08-31 16:52:09 +08:00
holan20180123 521cea2844 Merge branch 'master' of https://github.com/easysoft/zentaopms 2020-08-31 15:04:28 +08:00
holan20180123 7a661001da * Finish task #7758. 2020-08-31 14:57:44 +08:00
Yagami ad750e1f94 * Finish task #7722. 2020-08-31 14:12:20 +08:00
Yagami 1f2f21e44b * Adjust code style. 2020-08-29 13:20:50 +08:00
z 505ed7c1bf Merge branch 'master' of github.com:easysoft/zentaopms 2020-08-27 13:54:46 +08:00
z 4f47220347 * finish task #7698. 2020-08-27 13:54:23 +08:00
holan20180123 1062033526 * Finish Task #7711. 2020-08-27 13:42:16 +08:00
Yagami b72a7dee43 Merge branch 'master' into 20.x 2020-08-26 16:10:36 +08:00
chenfeiCF 586f34b10f * Add toTask field to datatable. 2020-08-21 07:18:54 +00:00
z 6cdef8d7d3 Merge branch 'master' of github.com:easysoft/zentaopms 2020-08-18 14:11:53 +08:00
z be28a89aea * fix bug for flow. 2020-08-18 14:09:30 +08:00
holan20180123 0a32bb464f * Fix bug #3276. 2020-08-17 09:46:45 +08:00
holan20180123 89a4481f0b * Fix bug #3276. 2020-08-17 09:45:55 +08:00
holan20180123 a25560c573 * Fix bug #3276. 2020-08-17 09:22:58 +08:00
holan20180123 fb15224b42 Merge branch 'master' of https://github.com/easysoft/zentaopms 2020-08-13 13:53:57 +08:00
holan20180123 b4512fd660 * Fix bug #3276. 2020-08-13 13:47:23 +08:00
tianshujie98 595e3e35c4 * Fix bug #2573. 2020-08-13 09:38:57 +08:00
qiyu-xie 3af0fb48dc Fix bug #2543 2020-08-11 14:38:07 +08:00
tianshujie98 fdf70435de Merge branch 'master' of github.com:easysoft/zentaopms 2020-08-07 17:02:37 +08:00
z 4acf8e3990 * finish task #7603,7603. 2020-08-07 15:14:20 +08:00
qiyu-xie 217b456bf9 Merge branch 'master' of https://github.com/easysoft/zentaopms 2020-08-06 16:29:16 +08:00
qiyu-xie 904543b48f * Fix bug #3324. 2020-08-06 16:28:08 +08:00
tianshujie98 ac56db1998 Merge branch 'master' of github.com:easysoft/zentaopms 2020-08-06 15:51:15 +08:00
tianshujie98 2134ee1b8f * Fix bug #2499. 2020-08-06 15:49:29 +08:00
holan20180123 794534a0a1 Merge branch 'master' of https://github.com/easysoft/zentaopms 2020-08-06 14:10:22 +08:00
holan20180123 6f0fe410ad * Finish task #7596. 2020-08-06 14:08:32 +08:00
z 952c013eca * fix for getModuleOwner. 2020-08-06 10:51:43 +08:00
tianshujie98 548b5655b0 Merge branch 'master' of github.com:easysoft/zentaopms 2020-08-05 17:22:22 +08:00
z ae84a5dc24 * code for task #7600. 2020-08-05 16:33:57 +08:00
leiyong fb752e34c8 * Finish task#1198. 2020-08-04 23:19:36 -07:00
qiyu-xie 76381c1fd2 * Merge. 2020-08-05 11:16:37 +08:00
z a748df7c3c * code for task #7600. 2020-08-04 14:05:41 +08:00
z bb3ad790d0 Merge branch 'master' of github.com:easysoft/zentaopms 2020-08-04 14:02:28 +08:00
holan20180123 c92cc316d0 * Finish task #7568. 2020-08-03 15:48:52 +08:00
z 9a17e562d8 * merge fr lang. 2020-08-03 10:14:25 +08:00
z 728e27af23 Merge branch 'master' of github.com:easysoft/zentaopms 2020-07-28 08:43:34 +08:00
leiyong 26b1a0fe92 * Fix bug,task#7549. 2020-07-27 06:43:54 -07:00
leiyong edf7d6448b * Fix bug,task#7549. 2020-07-27 03:29:59 -07:00
leiyong e639fd4379 * Finish task#7481. 2020-07-27 02:29:36 -07:00
z 1cc523fd01 * adjust code. 2020-07-27 16:44:23 +08:00
holan20180123 db4a3db53d * Finish task #7520; 2020-07-27 14:17:27 +08:00
chenfei ba57175628 * Finish task #7523. 2020-07-27 08:07:21 +08:00
holan20180123 cb7ea554a4 * Finish task #7520. 2020-07-26 23:43:58 +08:00
holan20180123 d4d49466b4 * Finish task #7521. 2020-07-26 21:16:48 +08:00
z 821739f624 * finish task #7553. 2020-07-24 20:30:17 +08:00
holan20180123 78e714df92 * Finish task #7361. 2020-07-23 15:49:13 +08:00
reneeteng 6e08756f0b * Minor change in lang files. 2020-07-21 14:25:47 +08:00
leiyong 2dbbe8ab36 * Finish task#7481. 2020-07-19 18:14:00 -07:00
tianshujie98 a1db9d97bf Merge branch 'master' of github.com:easysoft/zentaopms 2020-07-17 09:00:05 +08:00