Commit Graph
13762 Commits
Author SHA1 Message Date
Yagami 101e035ad4 * Add sql. 2018-10-15 09:28:47 +08:00
Yagami 958e94dfa4 * Change file name length. 2018-10-15 09:27:59 +08:00
Catouse 025c6e344e * finish task #4994 and fix bug #2193. 2018-10-15 08:41:29 +08:00
Catouse ceece4b829 * update zui js and css files. 2018-10-15 08:28:52 +08:00
Catouse c69d4ff01b * add scrollbar-hover effection to dynamic block in project/product view. 2018-10-15 08:28:41 +08:00
Catouse aeb940041f * fix divider in main actions toolbar. 2018-10-12 17:22:07 +08:00
Catouse 51f918837f Merge branch 'master' of https://github.com/easysoft/zentaopms 2018-10-12 17:19:59 +08:00
Catouse 1a24e94fee * finish task #4991 and fix bug 2197. 2018-10-12 17:19:53 +08:00
滔哥 0b1751b3ee Merge branch 'master' of https://github.com/easysoft/zentaopms 2018-10-12 16:43:14 +08:00
滔哥 e2e7a0c694 * Fix bug. 2018-10-12 16:43:01 +08:00
Catouse 87de60cb68 * add hover effection to scrollbar in dynamic block. 2018-10-12 16:37:06 +08:00
Catouse 6a83bdc4be * finish task #4984 and fix bug #2212. 2018-10-12 16:26:26 +08:00
Catouse 2842816afb Merge branches 'master' and 'master' of https://github.com/easysoft/zentaopms 2018-10-12 16:10:55 +08:00
Catouse 1daf14c32f * finish task #4977 and fix bug #2223. 2018-10-12 16:10:41 +08:00
wangyidong 1a897653a8 Merge branch 'master' of github.com:easysoft/zentaopms 2018-10-12 16:10:17 +08:00
wangyidong addb812be3 * finish task #5002. 2018-10-12 16:09:53 +08:00
Catouse 8959c34335 Merge branch 'master' of https://github.com/easysoft/zentaopms 2018-10-12 15:35:38 +08:00
Catouse b4b4317d35 * finish task #4980 and fix bug #2218. 2018-10-12 15:35:23 +08:00
wangyidong 6cd7ec2b1b Merge branch 'master' of github.com:easysoft/zentaopms 2018-10-12 15:27:48 +08:00
wangyidong d68a97ec12 * adjust for import case use csv. 2018-10-12 15:27:05 +08:00
Catouse 8c232bd2c5 * finish task #4956. 2018-10-12 15:18:32 +08:00
Catouse f1317bd1d8 * finish task #4990 and fix bug #2199. 2018-10-12 15:16:26 +08:00
Catouse a2a70bb688 * fix bug #2179 and finish task #5001. 2018-10-12 15:11:47 +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