Commit Graph
13709 Commits
Author SHA1 Message Date
yfl d1cd60221b Remove test print 2018-10-12 09:49:55 +08:00
yfl d72a662553 Finish task #5021,#5018,#5017,#5016,#5015,#5005,#5003,#4987,#4985,#4653 2018-10-12 09:25:39 +08:00
滔哥 fbe9d854e5 Merge branch 'master' of https://github.com/easysoft/zentaopms 2018-10-12 09:15:31 +08:00
滔哥 bbfdb5a32e * Change file name. 2018-10-12 09:15:18 +08:00
wangyidong a32b331e12 Merge branch 'master' of github.com:easysoft/zentaopms 2018-10-12 09:08:51 +08:00
wangyidong d98adeccba * finish task #4976. 2018-10-12 09:08:12 +08:00
滔哥 9f115f2a8e * Finished task#4968. 2018-10-11 21:33:57 +08:00
滔哥 1b93b8a28a * Finished task#4971. 2018-10-11 21:02:39 +08:00
Yagami 8754aa0dc1 * Adjust doc orderby. 2018-10-11 17:02:51 +08:00
wangyidong 34e019677f Merge branch 'master' of github.com:easysoft/zentaopms 2018-10-11 15:44:22 +08:00
wangyidong 75e0e6555b * finish task #4976. 2018-10-11 15:38:26 +08:00
yfl 2dfb4aeeda * Finish task #4978,#4979,#4985,#4992,#4998,#5003,#5004,#5005,#5006, 2018-10-11 10:48:18 +08:00
yfl 9263cafb61 Merge branch 'master' of https://github.com/easysoft/zentaopms 2018-10-11 10:47:09 +08:00
Yagami 98b8f1097f Merge branch 'master' of https://github.com/easysoft/zentaopms 2018-10-11 09:40:31 +08:00
Yagami 5375f74140 * Finish task #4953. 2018-10-11 09:40:15 +08:00
wangyidong 148f54ce2e * change for bind ranzhi and fix error. 2018-10-11 08:57:50 +08:00
wangyidong 254b69382c * finish task #4989. 2018-10-10 16:50:58 +08:00
wangyidong a66d70cb55 Merge branch 'master' of github.com:easysoft/zentaopms 2018-10-10 16:11:48 +08:00
wangyidong 070bfe25a0 * finish task #4988. 2018-10-10 16:11:25 +08:00
Yagami c5f73613da Merge branch 'master' of https://github.com/easysoft/zentaopms 2018-10-10 15:18:02 +08:00
Yagami f50be29252 * remove doc change. 2018-10-10 15:17:47 +08:00
wangyidong d4f0c7c72e * finish task #4981. 2018-10-10 15:14:56 +08:00
wangyidong 105487e3e8 Merge branch 'master' of github.com:easysoft/zentaopms 2018-10-10 15:02:54 +08:00
wangyidong c69784a466 * change for zentaopm. 2018-10-10 15:01:13 +08:00
wangyidong 7db8e54bcf * fix bug #2224. 2018-10-10 15:00:23 +08:00
wangyidong 40efdc4d17 * finish task #4983. 2018-10-10 14:59:47 +08:00
yfl 763bb3601d Merge branch 'master' of https://github.com/easysoft/zentaopms 2018-10-10 13:26:12 +08:00
Yagami 12f52a42a1 * Finish task #4953. 2018-10-10 10:57:11 +08:00
yfl 55d78e4f8e welcome block count data 2018-10-10 10:56:19 +08:00
Yagami d53cf25a2d * Finish task #4961. 2018-10-10 10:01:04 +08:00
yfl 2e367fa89a Merge branch 'master' of https://github.com/easysoft/zentaopms 2018-10-10 09:41:53 +08:00
yfl 5ec4610e30 modify time format 2018-10-10 09:40:52 +08:00
Yagami 18dbdd7f36 * Finish task #4963. 2018-10-10 09:35:12 +08:00
Yagami d2095fa961 * Fix icon. 2018-10-09 16:52:08 +08:00
Yagami 5c24ece14a * Fix pri width. 2018-10-09 16:28:33 +08:00
Yagami 0430526093 * Finish task #4954. 2018-10-09 15:10:00 +08:00
Yagami f401d41aee * Finish task #4954. 2018-10-09 15:04:31 +08:00
Yagami 980af6044d * Finish task #4957. 2018-10-09 14:23:11 +08:00
Catouse f8dc98b196 * change theme names. 2018-10-09 14:16:31 +08:00
Catouse ba473b7ef6 * update classic themes. 2018-10-09 14:11:53 +08:00
Catouse c1a63defe4 Merge branch 'master' of https://github.com/easysoft/zentaopms 2018-10-09 14:07:09 +08:00
Catouse 8f5b47ab85 * fix font-size of assignto button. 2018-10-09 14:07:04 +08:00
wangyidong 24c7b0a2dd * fix bug #2224. 2018-10-09 13:13:50 +08:00
wangyidong 4e7ae0f8ac Merge branch 'master' of github.com:easysoft/zentaopms 2018-10-09 11:27:44 +08:00
wangyidong 92f1947583 * finish task #4962. 2018-10-09 11:26:53 +08:00
Yagami 903c46d821 * Finish task #4965. 2018-10-09 11:13:27 +08:00
Yagami 3657f64d05 * Finish task #4966. 2018-10-09 11:04:57 +08:00
Yagami fe8154ed3c Merge branch 'master' of https://github.com/easysoft/zentaopms 2018-10-09 10:55:19 +08:00
wangyidong c96b787060 Merge branch 'master' of github.com:easysoft/zentaopms 2018-10-09 10:53:27 +08:00
Yagami 7cc5d54833 * Finish task #4974. 2018-10-09 10:53:19 +08:00