Commit Graph

7856 Commits

Author SHA1 Message Date
wangyidong
9b339ac01f * fix bug get args for batchCheckIF. 2016-03-15 10:39:16 +08:00
wangyidong
0b3ef6fba1 Merge branch 'master' of github.com:easysoft/zentaopms 2016-03-15 09:57:51 +08:00
wangyidong
0e7c551027 * fix zget function and fix error. 2016-03-15 09:57:03 +08:00
wangyidong
7f2c61c891 * change for browse notice. 2016-03-15 09:56:33 +08:00
wangyidong
7a0c793270 * adjust framework and check mobile. 2016-03-15 09:53:16 +08:00
chenfeiCF
c6d21eec38 * add confirmBug action icon for zentao mobile web. 2016-03-15 09:51:05 +08:00
wangyidong
8c32fc916a Merge branch 'master' of github.com:easysoft/zentaopms 2016-03-14 16:00:26 +08:00
Catouse
e549511cbb Merge branch 'master' of https://github.com/easysoft/zentaopms 2016-03-14 15:59:13 +08:00
wangyidong
b5a42dedda * fix beginIF for dao.class.php and saveQueryCondition for doc. 2016-03-14 15:59:12 +08:00
Catouse
c374a6e482 * fix table border in iframe modal in firefox. 2016-03-14 15:58:59 +08:00
wangyidong
e843e0004d * adjust code for ajaxGetSonModules. 2016-03-14 14:56:20 +08:00
wangyidong
d0a31b775e * change testcase getByAssigento => getByAssignedTo, getByOpened => getByOpenedBy. 2016-03-14 14:51:11 +08:00
wangyidong
fa11f088a6 * change getWillClose to get2BeClosed and adjust width for create story. 2016-03-14 14:44:28 +08:00
wangyidong
0bd5173f01 Merge branch 'master' of github.com:easysoft/zentaopms 2016-03-14 14:40:26 +08:00
wangyidong
14f376e399 Merge branch 'master' of github.com:easysoft/zentaopms 2016-03-14 14:39:35 +08:00
wangyidong
01fec363c4 * remove a css style. 2016-03-14 14:38:15 +08:00
wangyidong
9cfcab7dff Merge branch 'master' of github.com:easysoft/zentaopms 2016-03-14 14:29:49 +08:00
wangyidong
96a8ff86f7 * adjust for check session. 2016-03-14 14:29:27 +08:00
wangyidong
82a46bd196 * fix bug for check icovn or mb_convert_encoding and check Directory separator. 2016-03-14 14:17:41 +08:00
wangyidong
ff43f65926 * adjust var name and adjust compressImage function. 2016-03-14 14:03:27 +08:00
wangyidong
5dfd9e57e9 * adjust var name and add notes for custom. 2016-03-14 13:25:45 +08:00
wangyidong
b5059fa0a5 * adjust code for var name. 2016-03-14 12:59:42 +08:00
wangyidong
81c7452008 Merge branch 'master' of github.com:easysoft/zentaopms 2016-03-14 12:55:31 +08:00
wangyidong
f3bb4d7e3e * fix for parseJSON. 2016-03-14 12:55:04 +08:00
chenfeiCF
b9b6821d36 Merge branch 'master' of github.com:easysoft/zentaopms 2016-03-14 12:00:32 +08:00
Catouse
d9ea62d417 Merge branch 'master' of https://github.com/easysoft/zentaopms 2016-03-14 17:15:50 +08:00
Catouse
d0030e82d3 * fix table border in firefox. 2016-03-14 17:15:42 +08:00
chenfeiCF
8bbad78ec1 * 1.added story verify in task view.
* 2.put story spec, verify and file together.
2016-03-14 11:59:34 +08:00
chenfeiCF
b2d49204b8 * move checkIP method to common model from user model. 2016-03-14 11:31:02 +08:00
wangyidong
0f6e89bd70 - rm treeview.html.php. 2016-03-14 11:28:01 +08:00
wangyidong
516b1f0034 * change hasEdited to editedByOther in common lang. 2016-03-14 10:48:42 +08:00
wangyidong
ae46e92be5 * change selectAll to selectButton in list. 2016-03-14 10:43:04 +08:00
wangyidong
3d349b45d8 * remove unset lastEditedDate. 2016-03-14 09:32:30 +08:00
chenfeiCF
cc24cd982c Merge branch 'master' of github.com:easysoft/zentaopms 2016-03-14 09:11:15 +08:00
wangyidong
9b050fea16 * change mailtitle to mailTitle. 2016-03-14 09:08:06 +08:00
wangyidong
800a0efd9e * check unique add branch condition when create build and release. 2016-03-14 09:05:58 +08:00
chenfeiCF
70776effd6 * 1.change ajaxUnlink method to unlink in order to adding privilege.
* 2.add method lang item for managePriv in group module.
2016-03-14 09:00:57 +08:00
chenfeiCF
0d7558d206 Merge branch 'master' of github.com:easysoft/zentaopms 2016-03-14 09:00:12 +08:00
chenfeiCF
6c26ebb27f * add method privilege for link or unlink story, bug, case. 2016-03-14 08:55:38 +08:00
wangyidong
c604bf2ba2 * adjust for control send fail. 2016-03-14 08:39:16 +08:00
wangyidong
5188f6aa0b Merge branch 'master' of github.com:easysoft/zentaopms 2016-03-14 08:10:15 +08:00
chenfeiCF
4f4ddb3e5f * if task is from bug, setImgSize for bug steps. 2016-03-14 06:09:14 +08:00
chenfeiCF
0bebfe176a * delete lang items which have not been used. 2016-03-14 02:44:40 +08:00
chenfeiCF
eb20cc4741 * fix the bug: not load search model when calling setSearchParams method. 2016-03-13 11:54:47 +08:00
chenfeiCF
0190934f07 * add empty mode for getPairs method of project model. 2016-03-13 10:56:16 +08:00
chenfeiCF
6b055c87fe * put getDeptUserPairs method from group model to dept model. 2016-03-13 08:02:35 +08:00
chenfeiCF
bf33b5f108 * adjust code for getUsers method of company module. 2016-03-13 07:49:46 +08:00
chenfeiCF
ab8f86396f * adjust buildSearchForm method: put setSearchParams method in model. 2016-03-13 07:43:03 +08:00
chenfeiCF
931a13641b * 1.added action labels for link or unlink action.
* 2.added desc of actions for link or unlink related case.
2016-03-13 05:19:13 +08:00
chenfeiCF
80a3959415 * 1.change deleteLinkedCase method name to unlinkCase.
* 2.adjust style for linkCases.html.php and delete lang item for link and unlink action.
2016-03-13 05:11:59 +08:00