Commit Graph
13740 Commits
Author SHA1 Message Date
wangyidong d68a97ec12 * adjust for import case use csv. 2018-10-12 15:27:05 +08:00
wangyidong e179c99ebc * finish task #4969. 2018-10-12 14:23:57 +08:00
wangyidong dbca08eb69 Merge branch 'master' of github.com:easysoft/zentaopms 2018-10-12 14:16:17 +08:00
wangyidong 8f7c3f8c4e Merge branch 'master' of github.com:easysoft/zentaopms 2018-10-12 14:16:04 +08:00
yfl e3380f2fc8 Merge branch 'master' of https://github.com/easysoft/zentaopms 2018-10-12 14:11:57 +08:00
滔哥 af96722cc7 Merge branch 'master' of https://github.com/easysoft/zentaopms 2018-10-12 14:11:27 +08:00
滔哥 88ebfa6bc0 * Finished task#5009 2018-10-12 14:11:20 +08:00
yfl 17a82250d4 * Finish task #5003 2018-10-12 14:09:05 +08:00
Catouse 505cafc736 * change text align to left of dropdown menu in subNabvar. 2018-10-12 14:05:52 +08:00
wangyidong 0558da4e38 * finish task #4967. 2018-10-12 14:00:09 +08:00
Catouse 8ae969da56 * finish task #4959. 2018-10-12 13:58:53 +08:00
Catouse d76b38ea17 * finish task #4975. 2018-10-12 13:56:01 +08:00
Catouse 33a0cdf634 * finish task #4670. 2018-10-12 13:51:47 +08:00
Catouse 07405dd60a * finish task #4955. 2018-10-12 13:40:43 +08:00
Catouse f8aa405f15 * change assing button style. 2018-10-12 13:38:38 +08:00
Catouse 2c82053a03 Merge branch 'master' of https://github.com/easysoft/zentaopms 2018-10-12 13:34:52 +08:00
Catouse 4e0f092cb9 * change modal background. 2018-10-12 13:34:47 +08:00
Yagami 6e1262c050 Merge branch 'master' of https://github.com/easysoft/zentaopms 2018-10-12 13:16:36 +08:00
Yagami 65308fb508 * Finish task #5024. 2018-10-12 13:16:18 +08:00
滔哥 1fa4ce5460 * Finished task#5007 2018-10-12 12:37:24 +08:00
滔哥 c368bd0e7c * Finished task#4995. 2018-10-12 11:48:32 +08:00
滔哥 7ff955c0e1 * Finished task#4986. 2018-10-12 11:31:26 +08:00
滔哥 f002405662 Merge branch 'master' of https://github.com/easysoft/zentaopms 2018-10-12 11:18:17 +08:00
滔哥 bd5d253791 * Finished task#4970. 2018-10-12 11:18:08 +08:00
yfl a45e0ecd41 Merge branch 'master' of https://github.com/easysoft/zentaopms 2018-10-12 10:54:50 +08:00
yfl 2037cbd47a Finish task #5025 2018-10-12 10:52:09 +08:00
Yagami f7a59c0bfc * Finish task #5020.* Finish task #5020.* Finish task #5020.* Finish task #5020.* Finish task #5020.* Finish task #5020.* Finish task #5020.* Finish task #5020. 2018-10-12 09:58:27 +08:00
yfl d1cd60221b Remove test print 2018-10-12 09:49:55 +08:00
Yagami cf118ebee2 Merge branch 'master' of https://github.com/easysoft/zentaopms 2018-10-12 09:30:56 +08:00
Yagami a393d105d3 Merge branch 'master' of https://github.com/easysoft/zentaopms 2018-10-12 09:30:21 +08:00
Yagami 9e8ee6e8b8 * Fix doc lang file. 2018-10-12 09:30:00 +08:00
滔哥 d462fc3324 * Fix BUG#2215. 2018-10-12 09:26:45 +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