Commit Graph
12802 Commits
Author SHA1 Message Date
wangyidong 48688a7be8 * adjust for sql error. 2018-07-05 15:44:45 +08:00
wangyidong bac2527f2a Merge branch 'master' of github.com:easysoft/zentaopms 2018-07-05 15:03:18 +08:00
wangyidong c3c9305775 * finish task #4556. 2018-07-05 14:58:46 +08:00
liugang 167c2f196e Merge branch 'master' of https://github.com/easysoft/zentaopms 2018-07-05 14:26:35 +08:00
liugang fed443460d * Finish task #4628. 2018-07-05 14:26:18 +08:00
Catouse 29de85a69a Merge branch 'master' of https://github.com/easysoft/zentaopms 2018-07-05 14:20:07 +08:00
Catouse 7565708ccd * adjust style of block views. 2018-07-05 14:19:56 +08:00
Catouse a373f375c8 * apply zui scrollbar style. 2018-07-05 14:19:41 +08:00
Catouse 226c1f1a3a * add fade effection to dashboard element. 2018-07-05 14:12:28 +08:00
Catouse 47085c06eb * fix style and .panel-move-handler element not remove when refresh it. 2018-07-05 14:11:51 +08:00
liugang 7c710b4424 Merge branch 'master' of https://github.com/easysoft/zentaopms 2018-07-05 13:56:54 +08:00
liugang 330d108f57 * Finish task #4637. 2018-07-05 13:56:37 +08:00
Catouse c22a2127d7 * change line-height of .article-content. 2018-07-05 13:49:50 +08:00
Catouse 1927697271 Merge branch 'master' of https://github.com/easysoft/zentaopms 2018-07-05 13:39:40 +08:00
Catouse fb093f7f95 * fix modal header style and add title attribute. 2018-07-05 13:39:33 +08:00
Yagami 634ab84121 Merge branch 'master' of https://github.com/easysoft/zentaopms 2018-07-05 13:38:24 +08:00
Yagami 3768276196 * Finish task #4557、#4521、#4531. 2018-07-05 13:35:08 +08:00
chenfeiCF a07cd2c312 * Finish task #4540. 2018-07-05 13:34:19 +08:00
wangyidong 712d9c87d2 Merge branch 'master' of github.com:easysoft/zentaopms 2018-07-05 13:31:23 +08:00
daitingting 812c4e98fb Merge branch 'master' of https://github.com/easysoft/zentaopms 2018-07-05 13:36:23 +08:00
daitingting 6e71477c5c * Unset todos those finished by me. 2018-07-05 13:35:09 +08:00
chenfeiCF 4f0d8e7409 * Finish task #4508. 2018-07-05 13:20:14 +08:00
wangyidong 5194dbe0c4 Merge branch 'master' of github.com:easysoft/zentaopms 2018-07-05 13:19:36 +08:00
wangyidong a7fd56792b * finish task #4633. 2018-07-05 13:19:01 +08:00
liugang 6f4cb41c38 * Finish task #4629 2018-07-05 11:01:42 +08:00
liugang 31dc5d608f Merge branch 'master' of https://github.com/easysoft/zentaopms 2018-07-05 10:59:40 +08:00
liugang 83c91c5a69 * Finish task #4626 2018-07-05 10:59:29 +08:00
Catouse 45b8b2c60a Merge branch 'master' of https://github.com/easysoft/zentaopms 2018-07-05 10:47:37 +08:00
Catouse 8742825b1c * update zui and themes. 2018-07-05 10:47:31 +08:00
Catouse 8cdb6a8845 * change link color in bug edit form. 2018-07-05 10:47:18 +08:00
chenfeiCF f46e7b7be5 * Finish task #4513. 2018-07-05 10:45:41 +08:00
chenfeiCF 7167e00b83 * Finish task #4499. 2018-07-05 10:43:21 +08:00
Catouse b611543c82 * adjust style of bug/linkbugs view. 2018-07-05 10:38:38 +08:00
Catouse f8ffb39570 * move default style to zui. 2018-07-05 10:37:25 +08:00
Catouse c6fbc1fe21 * adjust style of bug/linkbugs view. 2018-07-05 10:36:43 +08:00
liugang e340357faa Merge branch 'master' of https://github.com/easysoft/zentaopms 2018-07-05 10:26:48 +08:00
liugang 9b846f5eae * Finish task #4622,4625 2018-07-05 10:25:45 +08:00
Catouse 2e213c6eb5 * add commas. 2018-07-05 10:25:32 +08:00
Catouse 7f28cc1697 Merge branch 'master' of https://github.com/easysoft/zentaopms 2018-07-05 10:24:44 +08:00
Catouse f1018cde93 * improve UI of dashboard. 2018-07-05 10:24:38 +08:00
Catouse 5baae8f3ff * refactor code. 2018-07-05 10:24:09 +08:00
wangyidong 6c377aa988 Merge branch 'master' of github.com:easysoft/zentaopms 2018-07-05 10:18:06 +08:00
wangyidong 95149dcda1 * delete useless table. 2018-07-05 10:17:24 +08:00
liugang 1c5844728e Merge branch 'master' of https://github.com/easysoft/zentaopms 2018-07-05 10:09:01 +08:00
liugang 946185667f * Finish task #4620 2018-07-05 10:08:47 +08:00
wangyidong 646d9d60ec * finish task #4636. 2018-07-05 10:02:47 +08:00
liugang a1607501bc Merge branch 'master' of https://github.com/easysoft/zentaopms 2018-07-05 09:33:41 +08:00
liugang d0cb047b58 * Finish task #4617 2018-07-05 09:20:34 +08:00
Yagami 698e51134b * finish task #4631. 2018-07-05 08:54:35 +08:00
Catouse fff69a3471 Merge branch 'master' of https://github.com/easysoft/zentaopms 2018-07-04 20:33:21 +08:00