Commit Graph
14004 Commits
Author SHA1 Message Date
wangyidong d24304332f * add new version and upgrade. 2020-02-12 09:48:05 +08:00
wangyidong c13b25c318 * adjust repo create and edit page. 2020-02-12 09:00:25 +08:00
wangyidong 3a3dfd146f * change for xuanxuan. 2020-02-12 08:56:15 +08:00
leiyong fb15a7a9d1 Merge branch 'zentaopms_12.0.1' of github.com:easysoft/zentaopms into zentaopms_12.0.1 2020-02-11 18:06:15 +08:00
leiyong 2b89c9f5f6 complete task #6886,#6884,#6882,#6880. 2020-02-11 17:58:46 +08:00
wangyidong 62cb503271 * finish task #6885. 2020-02-11 17:19:08 +08:00
wangyidong f1c5df1fdf * finish task #6879. 2020-02-11 16:16:20 +08:00
wangyidong d433403d31 * finish task #6878. 2020-02-11 16:14:11 +08:00
wangyidong e993b98b6f * finish task #6881. 2020-02-11 15:44:07 +08:00
wangyidong 8bb1c86464 * finish task #6883. 2020-02-11 15:41:59 +08:00
wangyidong 12875d8774 * finish task #6887. 2020-02-11 15:36:44 +08:00
leiyong ab65bcd24f Merge branch 'master' of github.com:easysoft/zentaopms 2020-02-06 14:12:54 +08:00
leiyong 03e06b6e7d Fix bug #2941,#2937. 2020-02-06 14:12:23 +08:00
wangyidong 6560eff7d2 * finish task #9790 for zentaobiz. 2020-02-06 10:59:04 +08:00
wangyidong 92f366b767 * code for task #6849. 2020-02-06 09:01:41 +08:00
wangyidong 12277bda9c Merge branch 'master' of github.com:easysoft/zentaopms 2020-02-05 17:33:58 +08:00
wangyidong 616d01b015 * fix bug. 2020-02-05 17:30:21 +08:00
wangyidong 58f5936bae * finish task #6820. 2020-02-05 17:29:21 +08:00
leiyong 87df6db7ac Merge branch 'master' of github.com:easysoft/zentaopms 2020-02-05 15:55:21 +08:00
leiyong 7a56b4506d Fix bug #2929,#2932,#2943 2020-02-05 15:54:29 +08:00
wangyidong ef1f4483d2 Merge branch 'master' of github.com:easysoft/zentaopms 2020-02-05 15:23:12 +08:00
leiyong 21b04fff1c Merge branch 'master' of github.com:easysoft/zentaopms 2020-02-05 14:23:21 +08:00
leiyong c61f161423 fix bug #2918 and #2922 2020-02-05 14:22:35 +08:00
wangyidong 58685284b8 * finish task #6850. 2020-02-05 13:44:58 +08:00
wangyidong e88f364a0a * finish task #6824. 2020-02-05 11:03:46 +08:00
wangyidong 96adea19b9 * finish task #6837. 2020-02-05 10:57:50 +08:00
wangyidong 4db7034029 * finish task #6849. 2020-02-05 10:06:14 +08:00
wangyidong 4d464543b3 Merge branch 'master' of github.com:easysoft/zentaopms 2020-02-04 17:36:32 +08:00
wangyidong 6fc074f237 * code for task #9812. 2020-02-04 17:34:13 +08:00
leiyong 2ed202d5a4 fix bug #2926 2020-02-04 17:33:26 +08:00
leiyong 90ec6f30df 1.fix bug #2931
2.fix bug #2924
3.fix bug #2919
4.fix bug #2917
5.fix bug #2914
6.fix bug #2913
7.fix bug #2910
8.fix bug #2904
9.fix bug #2897
10.fix bug #2896
11.fix bug #2894
2020-02-04 15:40:31 +08:00
wangyidong 1c7790f003 * fix bug #2193 for backyard. 2020-01-31 08:54:53 +08:00
wangyidong 532b73008a * adjust for project burn. 2020-01-31 08:47:45 +08:00
wangyidong fcc21286d3 * adjust for doc file size. 2020-01-31 08:45:20 +08:00
wangyidong 5436139ed6 * adjust caselib for workflow and fix bug. 2020-01-16 15:59:53 +08:00
wangyidong c907c58583 * fix bug #2194. 2020-01-16 15:56:36 +08:00
wangyidong b0e0b7f9fa * adjust for zentaobiz. 2020-01-14 16:33:03 +08:00
wangyidong 3409e84d87 * fix bug #2182. 2020-01-13 16:52:17 +08:00
wangyidong 3de40ee5b2 * finish task #2201. 2020-01-13 14:56:23 +08:00
wangyidong bdbbebc795 Merge branch 'master' of github.com:easysoft/zentaopms 2020-01-13 14:31:33 +08:00
wangyidong 0222add8d5 * fix bug for less than php5.6 for search. 2020-01-13 14:22:53 +08:00
reneeteng d761095adc * Update company info on install to EasyCorp. 2020-01-09 10:35:00 +08:00
Catouse 13aa690b33 * fix form setting in todo/batchcreate view not work. 2020-01-09 09:52:17 +08:00
wangyidong e2efd30948 * fix bug for show annual data. 2020-01-07 08:49:09 +08:00
wangyidong 89329621d3 * adjust for annual data. 2020-01-06 16:50:15 +08:00
wangyidong b9fda95ee7 * adjust for show modal. 2020-01-03 17:29:45 +08:00
wangyidong 2669b7ecbc * adjust for misc lang. 2020-01-03 14:21:59 +08:00
wangyidong 0350bba919 * fix bug. 2020-01-03 11:21:04 +08:00
wangyidong 3b46b72191 * remove annualData priv. 2020-01-03 11:00:22 +08:00
wangyidong 5088fcc659 * add new version and upgrade. 2020-01-02 16:53:24 +08:00