Commit Graph
6755 Commits
Author SHA1 Message Date
wangyidong 25ada3e7e3 Merge branch 'master' of github.com:easysoft/zentaopms 2016-04-19 11:13:49 +08:00
wangyidong a20f6c9ce0 * fix bug and adjust code for get story version when batch create case. 2016-04-19 11:12:56 +08:00
Catouse 3322a58d91 Merge branch 'master' of https://github.com/easysoft/zentaopms 2016-04-19 10:48:12 +08:00
Catouse 95c09a8425 * improve project tree UI. 2016-04-19 10:48:05 +08:00
chenfeiCF 0d832ade74 * fix error for featurebar of bug module browse menu. 2016-04-19 09:41:26 +08:00
Catouse 0f986db031 Merge branch 'master' of https://github.com/easysoft/zentaopms 2016-04-18 18:46:23 +08:00
Catouse b356e65732 * finish task #2552. 2016-04-18 18:45:58 +08:00
chenfeiCF f75c032c4d * add lang item for setPublic. 2016-04-18 16:47:27 +08:00
Catouse 62f35f1a18 Merge branch 'master' of https://github.com/easysoft/zentaopms
Conflicts:
	module/project/view/taskheader.html.php
2016-04-18 16:38:37 +08:00
Catouse ba2eff3f57 * code for task #2552. 2016-04-18 16:35:50 +08:00
wangyidong 8ea70725cd Merge branch 'master' of github.com:easysoft/zentaopms 2016-04-18 16:29:49 +08:00
wangyidong d22230a546 * change for custom menu. 2016-04-18 16:27:15 +08:00
chenfeiCF 5762df7678 * fix button style for bug method of my module. 2016-04-18 16:26:25 +08:00
chenfeiCF 8345963cb4 * fix error if bugs do not belong to same product when batch edit bugs. 2016-04-18 16:11:02 +08:00
chenfeiCF 3e7ff8731d * remove manageContacts and deleteContacts method of user module. 2016-04-18 15:12:37 +08:00
Catouse 88fe7ee93f * ajust code. 2016-04-18 13:41:25 +08:00
Catouse 35c45afc19 * task modules tree support product. 2016-04-18 13:08:20 +08:00
chenfeiCF 9c3e35e4b1 * add change log for 8.1.3 version of new privilege. 2016-04-18 11:24:00 +08:00
wangyidong dc33dbb5d6 Merge branch 'master' of github.com:easysoft/zentaopms 2016-04-18 10:07:25 +08:00
Catouse eb14a93895 * remove console.log. 2016-04-18 09:59:20 +08:00
Catouse 69766cca3a Merge branch 'master' of https://github.com/easysoft/zentaopms 2016-04-18 09:57:25 +08:00
Catouse a42a26761f * fix UI for dashboard views. 2016-04-18 09:57:17 +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