Commit Graph
12015 Commits
Author SHA1 Message Date
wangyidong 378f5d4001 Merge branch 'master' of github.com:easysoft/zentaopms 2018-05-23 14:21:04 +08:00
滔哥 e2a77d6b3b Merge branch 'master' of https://github.com/easysoft/zentaopms 2018-05-23 14:20:51 +08:00
wangyidong 2c57a1cbe7 * finish task #4228. 2018-05-23 14:20:44 +08:00
滔哥 f4d2556759 * Finish task#4235 2018-05-23 14:20:43 +08:00
滔哥 e1edf82e53 * Finish task#4232 2018-05-23 14:17:10 +08:00
wangyidong 004d879698 * finish task #4229. 2018-05-23 14:13:40 +08:00
wangyidong dbabcd9c92 * finish task #4230. 2018-05-23 14:05:56 +08:00
wangyidong 2751dfc81f Merge branch 'master' of github.com:easysoft/zentaopms 2018-05-23 13:59:57 +08:00
wangyidong b6a703667d * finish task #4231. 2018-05-23 13:59:31 +08:00
滔哥 f04993b2c9 Merge branch 'master' of https://github.com/easysoft/zentaopms 2018-05-23 13:45:32 +08:00
滔哥 34fa242fc1 * Finish task#4261 2018-05-23 13:45:26 +08:00
daitingting 527e7c9529 Merge branch 'master' of https://github.com/easysoft/zentaopms 2018-05-23 13:05:13 +08:00
daitingting 03d5875a19 * Adjust space between btn. 2018-05-23 13:04:56 +08:00
滔哥 91d242b1c3 * Finish task#4263 2018-05-23 11:52:46 +08:00
Catouse e0eced2983 Merge branch 'master' of https://github.com/easysoft/zentaopms 2018-05-23 11:43:20 +08:00
Catouse 4188bcabf5 * improve UI of projet/tree view. 2018-05-23 11:43:13 +08:00
滔哥 75b73f9a0f Merge branch 'master' of https://github.com/easysoft/zentaopms 2018-05-23 11:24:48 +08:00
滔哥 e677941b5f * Finish task#4264 2018-05-23 11:24:36 +08:00
Catouse 9058191fcc Merge branch 'master' of https://github.com/easysoft/zentaopms 2018-05-23 11:09:29 +08:00
Catouse 9017f1df06 * refactor kindeditor usage. 2018-05-23 11:08:56 +08:00
Catouse 26d116631b * update zui files. 2018-05-23 11:08:42 +08:00
chenfeiCF 91278a361f * Finish task #4301. 2018-05-23 10:52:35 +08:00
滔哥 080fafdcdd Merge branch 'master' of https://github.com/easysoft/zentaopms 2018-05-23 10:46:06 +08:00
滔哥 111d0998da * Finish task#4270. 2018-05-23 10:45:58 +08:00
daitingting f918a52876 Merge branch 'master' of https://github.com/easysoft/zentaopms 2018-05-23 10:43:23 +08:00
daitingting 42589ff9a7 * Adjust language. 2018-05-23 10:43:06 +08:00
wangyidong 68e3f766e7 Merge branch 'master' of github.com:easysoft/zentaopms 2018-05-23 10:36:15 +08:00
wangyidong 1035026243 * fix bug for high light and make int package. 2018-05-23 10:35:30 +08:00
daitingting e40d43c01c * Adjust format for build id. 2018-05-23 10:35:07 +08:00
Catouse de490110fc Merge branch 'master' of https://github.com/easysoft/zentaopms 2018-05-23 10:27:52 +08:00
Catouse 92bafeedcd * fix icon class name. 2018-05-23 10:27:45 +08:00
滔哥 950315d46e * Finish task#4275 2018-05-23 10:22:53 +08:00
Catouse f6b02b7071 * fix style of assignto button in main table. 2018-05-23 10:15:45 +08:00
滔哥 3d686f09d1 Merge branch 'master' of https://github.com/easysoft/zentaopms 2018-05-23 10:14:32 +08:00
滔哥 4f35262fae * Format code. 2018-05-23 10:14:26 +08:00
Catouse ac539b735d * fix sidebar toggle position in dom. 2018-05-23 10:03:08 +08:00
Catouse 5d2fd7cb8d Merge branch 'master' of https://github.com/easysoft/zentaopms 2018-05-23 10:02:54 +08:00
Catouse 04ef838897 * refactor export modal trigger. 2018-05-23 10:02:42 +08:00
chenfeiCF c7f590821b * Finish task #4296. 2018-05-23 09:47:40 +08:00
daitingting f613687227 * Todo name is required. 2018-05-23 09:34:48 +08:00
滔哥 3af004c58b Task #4284 2018-05-23 08:59:56 +08:00
Catouse ee6c619cf7 Merge branch 'master' of https://github.com/easysoft/zentaopms 2018-05-22 18:19:20 +08:00
Catouse 938ed08b73 * improve UI of file/export view. 2018-05-22 18:19:12 +08:00
daitingting b352241f2f * Adjust style for batchedit page of todo. 2018-05-22 17:33:56 +08:00
daitingting e1ea7eb4b3 Merge branch 'master' of https://github.com/easysoft/zentaopms 2018-05-22 17:29:19 +08:00
daitingting 47add48bc5 * Adjust batchedit page for todo. 2018-05-22 17:28:54 +08:00
chenfeiCF e78e406a22 * Finish task #4293, #4303, #4311. 2018-05-22 16:16:48 +08:00
Catouse c48b79965a * change style of project/team view. 2018-05-22 16:14:40 +08:00
Catouse f3f5105ef9 Merge branch 'master' of https://github.com/easysoft/zentaopms 2018-05-22 16:05:41 +08:00
Catouse 19f77b435f * change UI of sidebar. 2018-05-22 16:05:33 +08:00