Commit Graph
1849 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
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
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
tianshujie98 a9dcdea00d * Finish task #7472. 2020-07-17 08:58:18 +08:00
chenfei dd3486e6d4 Merge branch 'master' of https://github.com/easysoft/zentaopms 2020-07-16 16:28:47 +08:00
chenfei 85ae968b10 * Finish task #7478. 2020-07-16 16:28:21 +08:00
sgm0422 5b6f1a03e9 * Finish task #7458. 2020-07-16 09:02:58 +08:00
holan20180123 ff7730f4bd * Finish task #7444,7441. 2020-07-14 09:43:36 +08:00
chenfei 2034b6ff8f * Fix bug #2988. 2020-07-08 14:40:24 +08:00
z 6a7945f959 Merge branch 'master' of github.com:easysoft/zentaopms 2020-07-06 14:30:04 +08:00
z 2801f04e4c * code for task #7305. 2020-07-06 14:29:44 +08:00
chenfei 642e1474f0 * Fix bug #3227. 2020-07-06 14:22:58 +08:00
z 9b80f4d9de * code for task #7302. 2020-07-06 09:08:09 +08:00
z 3aca3ee0cc * finish task #7301. 2020-07-03 13:07:49 +08:00
z 36dfb8eb36 * adjust code. 2020-07-01 17:47:54 +08:00
z 3a391ea836 * finish task #7277. 2020-06-22 14:30:52 +08:00
z ca2f701ddc * finish task #7275, 2020-06-19 17:33:51 +08:00
z 02caeb1437 * finish task #7256. 2020-06-18 14:48:00 +08:00
z 396381af1a * finish task #7255. 2020-06-17 15:47:47 +08:00
z cb8d7502b7 * finish task #7263. 2020-06-17 13:03:15 +08:00