Commit Graph
12236 Commits
Author SHA1 Message Date
wangyidong c9ff66d9f7 Merge branch 'master' of github.com:easysoft/zentaopms 2018-05-24 11:03:43 +08:00
wangyidong dbd536dba5 * finish task #4197. 2018-05-24 11:03:08 +08:00
chenfeiCF b885520b46 * Finish task #4312, #4308. 2018-05-24 10:48:14 +08:00
滔哥 930d8b6c8b Merge branch 'master' of https://github.com/easysoft/zentaopms 2018-05-24 10:18:06 +08:00
滔哥 32e89f4eea * Finish task#4242 2018-05-24 10:18:02 +08:00
chenfeiCF 1c89503442 * Finish task #4313. 2018-05-24 09:56:44 +08:00
wangyidong bb083468ae Merge branch 'master' of github.com:easysoft/zentaopms 2018-05-24 09:35:01 +08:00
wangyidong 6290a8bd5b * finish task #4207. 2018-05-24 09:34:33 +08:00
滔哥 d5c6aa1831 Merge branch 'master' of https://github.com/easysoft/zentaopms 2018-05-24 09:21:37 +08:00
滔哥 c2c60714df * Finish task#4245 2018-05-24 09:21:29 +08:00
chenfeiCF 6aab932c26 * Finish task #4314, #4315, #4316. 2018-05-24 09:19:48 +08:00
滔哥 9a6abfb9c8 * Finish task#4259 2018-05-24 09:14:20 +08:00
Catouse 5bf8aa791e Merge branch 'master' of https://github.com/easysoft/zentaopms 2018-05-23 18:21:28 +08:00
Catouse 059b28ef26 * refactor dashboard blocks UI. 2018-05-23 18:21:04 +08:00
滔哥 d311af3c76 Merge branch 'master' of https://github.com/easysoft/zentaopms 2018-05-23 17:30:58 +08:00
滔哥 ca13dc8c93 * Fix bug. 2018-05-23 17:30:52 +08:00
wangyidong ef4f1e99e6 * finish task #4209. 2018-05-23 17:08:54 +08:00
Catouse e67173bced * change style of todo block. 2018-05-23 16:50:38 +08:00
wangyidong 2b0742f2d7 * finish task #4211. 2018-05-23 16:49:27 +08:00
wangyidong f360738910 Merge branch 'master' of github.com:easysoft/zentaopms 2018-05-23 16:46:23 +08:00
wangyidong 311e4dda78 * finish task #4213. 2018-05-23 16:46:02 +08:00
Catouse 3b6d54fced Merge branch 'master' of https://github.com/easysoft/zentaopms 2018-05-23 16:45:32 +08:00
wangyidong ae4c8f518b * finish task #4215. 2018-05-23 16:40:00 +08:00
wangyidong 5a903de6fd * finish task #4216. 2018-05-23 16:36:11 +08:00
Catouse 8ec5037fa8 Merge branch 'master' of https://github.com/easysoft/zentaopms 2018-05-23 16:26:23 +08:00
Catouse 69c91ce6a4 * change page side gap size to 20. 2018-05-23 16:26:15 +08:00
wangyidong 244a261be4 * finish task #4217. 2018-05-23 16:25:50 +08:00
daitingting 09aa64dceb Merge branch 'master' of https://github.com/easysoft/zentaopms 2018-05-23 16:22:55 +08:00
wangyidong 057f94defa * finish task #4219. 2018-05-23 16:20:46 +08:00
wangyidong 3eb7f3107c Merge branch 'master' of github.com:easysoft/zentaopms 2018-05-23 16:19:41 +08:00
wangyidong ee0ac234b2 * finish task #4220. 2018-05-23 16:19:11 +08:00
daitingting 05cd17ed09 Merge branch 'master' of https://github.com/easysoft/zentaopms 2018-05-23 16:14:08 +08:00
daitingting b7de0d5e8f * Adjust width for actions. 2018-05-23 16:13:49 +08:00
Catouse ccc102717f Merge branch 'master' of https://github.com/easysoft/zentaopms 2018-05-23 16:13:41 +08:00
Catouse 02ec99fee6 * adjust style of report views. 2018-05-23 16:13:15 +08:00
滔哥 0cd84a4639 Merge branch 'master' of https://github.com/easysoft/zentaopms 2018-05-23 16:09:36 +08:00
滔哥 f1532b204d * Fix bug. 2018-05-23 16:09:30 +08:00
Catouse 4f7052c4fc * adjust style of report/bugcreate view. 2018-05-23 16:03:52 +08:00
Catouse c746cc2d6b Merge branch 'master' of https://github.com/easysoft/zentaopms 2018-05-23 15:58:07 +08:00
Catouse 628179d1ba * improve UI of bug views. 2018-05-23 15:57:57 +08:00
chenfeiCF 59229caa10 Merge branch 'master' of github.com:easysoft/zentaopms 2018-05-23 15:49:25 +08:00
chenfeiCF ad8b144d5c * Finish task #4309, #4310. 2018-05-23 15:47:53 +08:00
daitingting f5b1e98a39 Merge branch 'master' of https://github.com/easysoft/zentaopms 2018-05-23 15:43:08 +08:00
daitingting a516365977 * Adjust language. 2018-05-23 15:42:53 +08:00
wangyidong 6827a6b0e8 Merge branch 'master' of github.com:easysoft/zentaopms 2018-05-23 15:35:12 +08:00
wangyidong e54b7946fc * finish task #4222. 2018-05-23 15:34:46 +08:00
Catouse d4ae0184ed Merge branch 'master' of https://github.com/easysoft/zentaopms 2018-05-23 15:33:19 +08:00
Catouse 34891f0049 * adjust style of copy project modal in project/create view. 2018-05-23 15:33:10 +08:00
chenfeiCF 483df2da30 * Finish task #4307. 2018-05-23 15:21:52 +08:00
chenfeiCF 4ef0cd6432 Merge branch 'master' of github.com:easysoft/zentaopms 2018-05-23 15:14:40 +08:00