Commit Graph
6334 Commits
Author SHA1 Message Date
wangyidong dc33dbb5d6 Merge branch 'master' of github.com:easysoft/zentaopms 2016-04-18 10:07:25 +08:00
chenfeiCF 6f8224ba0c * add priv for manageContacts, deleteContacts and batchChangeModule method. 2016-04-18 09:27:06 +08:00
Catouse dd3b566769 Merge branch 'master' of https://github.com/easysoft/zentaopms 2016-04-15 19:51:51 +08:00
Catouse 80650fb91c * table in block support to fix header. 2016-04-15 19:51:35 +08:00
Catouse 8c013e9c26 * fix button style in datatable. 2016-04-15 16:43:27 +08:00
chenfeiCF 974d615787 * fix error for SQL when printing build block. 2016-04-15 16:26:25 +08:00
chenfeiCF 9a636b34c4 * fix bug #825. 2016-04-15 16:23:58 +08:00
Catouse 7ce39f0658 * dashboard file include common sparkline file. 2016-04-15 15:45:16 +08:00
Catouse 2c8ee20283 Merge branch 'master' of https://github.com/easysoft/zentaopms 2016-04-15 15:37:14 +08:00
chenfeiCF 7163898369 * finish task #2577. 2016-04-15 15:31:25 +08:00
wangyidong 619e9220ca * adjust and fix block. 2016-04-15 15:03:35 +08:00
Catouse 250caa590b * remove border radius of cards in about page. 2016-04-15 14:40:44 +08:00
Catouse bb35bbd4a9 * finish task #2517. 2016-04-15 14:19:49 +08:00
Catouse 54a3ededff Merge branch 'master' of https://github.com/easysoft/zentaopms 2016-04-15 11:43:26 +08:00
Catouse 687b30412d - delete datatable resource files: datatable is include in zui. 2016-04-15 11:43:16 +08:00
wangyidong 8fd1ffd129 * change for english. 2016-04-15 11:37:08 +08:00
wangyidong c5dcca79bf * set homepage for product/project/qa. 2016-04-15 11:32:46 +08:00
Catouse 7e7e14b9db Merge branch 'master' of https://github.com/easysoft/zentaopms 2016-04-15 10:18:12 +08:00
chenfeiCF b3df46f4e5 * fix error for task #2535: Set the second param correct for judgeSuhosinSetting function. 2016-04-14 16:51:24 +08:00
chenfeiCF d45ecec122 * code for task #2536: Set custom for batch edit product. 2016-04-14 16:38:30 +08:00
wangyidong f116895750 Merge branch 'master' of github.com:easysoft/zentaopms 2016-04-14 16:33:20 +08:00
wangyidong 37a64ea759 * custom for user batchcreate. 2016-04-14 16:32:45 +08:00
chenfeiCF ceee26974e * code for task #2536: Set custom for batch edit project. 2016-04-14 15:42:28 +08:00
Catouse b5fc78970d Merge branch 'master' of https://github.com/easysoft/zentaopms 2016-04-14 15:31:54 +08:00
Catouse f7926fd3a4 * dashboard support resize by drag edge. 2016-04-14 15:31:42 +08:00
wangyidong 281d075cbf * custom for todo batchcreate. 2016-04-14 14:48:03 +08:00
chenfeiCF 6c7549b472 * adjust custom fields for batch create and edit method of testcase module. 2016-04-14 14:13:45 +08:00
chenfeiCF 56fac4501d * revert ditto function in batchedit.js of bug module. 2016-04-14 14:02:35 +08:00
chenfeiCF 2529a6ba5c * code for task #2536: Set custom for batch edit method of user module. 2016-04-14 13:58:44 +08:00
Catouse 23e76dfc28 * main menu support sort by drag and drop. 2016-04-14 13:37:19 +08:00
Catouse c81ef5564d * change blocks UI. 2016-04-14 11:50:13 +08:00
wangyidong da4289df7b Merge branch 'master' of github.com:easysoft/zentaopms 2016-04-14 10:43:18 +08:00
wangyidong a536675548 * finish task #2534. 2016-04-14 10:42:57 +08:00
chenfeiCF 1d42f477f8 * finish task #2535. 2016-04-14 10:21:27 +08:00
chenfeiCF ea4c94bcc2 Merge branch 'master' of github.com:easysoft/zentaopms 2016-04-14 09:15:27 +08:00
chenfeiCF d80aa64136 * finish task #2539. 2016-04-14 09:14:31 +08:00
Catouse 847c24f571 Merge branch 'master' of https://github.com/easysoft/zentaopms 2016-04-14 09:08:47 +08:00
Catouse 3edba12cc7 * improve dashboard UI. 2016-04-14 09:08:32 +08:00
chenfeiCF 650ec21b00 * code fot task #2540: add pri to custom field. 2016-04-14 08:41:08 +08:00
Catouse 27ed67331e * improve dashboard UI. 2016-04-13 17:42:21 +08:00
chenfeiCF 5a837ca15c * code for task #2548: add pri to custom field list. 2016-04-13 17:31:54 +08:00
chenfeiCF 0daddb0d6e * code for task #2540: adjust the position of the custom button. 2016-04-13 17:03:09 +08:00
chenfeiCF 6ccfbaebef * code for task #2546. 2016-04-13 16:54:51 +08:00
wangyidong 143c0255be * fix bug for import csv. 2016-04-13 16:15:17 +08:00
wangyidong 27d611a2c4 Merge branch 'master' of github.com:easysoft/zentaopms 2016-04-13 13:52:29 +08:00
wangyidong 75fead9168 * change for task #2533. 2016-04-13 13:51:42 +08:00
chenfeiCF 3fec649bf1 * finish task #2540. 2016-04-13 11:35:04 +08:00
wangyidong f8ff737086 * finish task #2532. 2016-04-13 10:42:19 +08:00
wangyidong ceeeb89435 Merge branch 'master' of github.com:easysoft/zentaopms 2016-04-12 17:35:08 +08:00
wangyidong 23ee51e7ea * finsh task #2538. 2016-04-12 17:34:23 +08:00