Commit Graph
7990 Commits
Author SHA1 Message Date
wangyidong 7a40bbeaec Merge branch 'master' of github.com:easysoft/zentaopms 2016-04-12 11:23:49 +08:00
wangyidong cb5d368c48 * finish task #2524. 2016-04-12 11:23:05 +08:00
chenfeiCF 52370d1855 * fix bug #817. 2016-04-12 09:44:02 +08:00
chenfeiCF b1e147fec3 * code for task #2528. 2016-04-12 08:28:42 +08:00
Catouse 12925bc1cd * change UI of department manage view. 2016-04-11 19:22:51 +08:00
Catouse e6712a3a4b * update zui and fix tree style. 2016-04-11 19:22:25 +08:00
Catouse 4b08db0b40 * fix error in modal trigger extension. 2016-04-11 19:22:03 +08:00
Catouse 21da156bd1 * change front helpers. 2016-04-11 19:21:45 +08:00
chenfeiCF 64f837231a Merge branch 'master' of github.com:easysoft/zentaopms 2016-04-11 17:38:23 +08:00
chenfeiCF ca4710fa99 * fix bug #820. 2016-04-11 17:36:30 +08:00
wangyidong ac2bfc94dd * adjust for integrate ranzhi. 2016-04-11 17:30:27 +08:00
wangyidong 7fea820831 * code for fix error and adjust default block. 2016-04-11 17:05:05 +08:00
chenfeiCF 25648f4067 * fix bug 822. 2016-04-11 16:58:37 +08:00
wangyidong 322b895c96 Merge branch 'master' of github.com:easysoft/zentaopms 2016-04-11 16:57:51 +08:00
wangyidong 3630f79874 * change for check priv. 2016-04-11 16:57:26 +08:00
chenfeiCF ddbf65ab50 * fix bug #823. 2016-04-11 16:54:15 +08:00
wangyidong 37bc93aa53 Merge branch 'master' of github.com:easysoft/zentaopms 2016-04-11 15:49:34 +08:00
wangyidong 13f1fd6bf7 * change for print blok. 2016-04-11 15:48:58 +08:00
Catouse 3cda13683f * update zui. 2016-04-11 15:10:14 +08:00
wangyidong 13f7011a05 * add color field for task/story/bug/case. 2016-04-11 10:58:08 +08:00
wangyidong bfeaca5fa3 * change for browse in mobile. 2016-04-11 10:14:46 +08:00
wangyidong 6006efd721 * code for task #2529. 2016-04-11 09:29:33 +08:00
chenfeiCF b6ef7dd961 * adjust for task #2531:Process the post data in model when value is 'ditto'. 2016-04-09 13:37:25 +08:00
Catouse 2cb3981b38 * update zui. 2016-04-08 17:53:18 +08:00
Catouse 1aec16628e * code for task #2576. 2016-04-08 17:53:10 +08:00
Catouse 18363ef7d4 Merge branch 'master' of https://github.com/easysoft/zentaopms 2016-04-08 16:12:17 +08:00
Catouse ce53e54709 * update zui: add color picker module. 2016-04-08 16:11:31 +08:00
wangyidong ceb50edff9 * code for task #2527. 2016-04-08 13:28:33 +08:00
wangyidong 4d38fbdad1 * add index page. 2016-04-08 11:40:37 +08:00
wangyidong ea7aabdd3e * add function sort and delete block. 2016-04-08 11:01:24 +08:00
wangyidong c50c181700 * code for task #2529. 2016-04-08 10:41:20 +08:00
wangyidong 1c851a0f59 * adjust style for file export.html.php. 2016-04-08 10:40:36 +08:00
wangyidong f3b933a3d4 Merge branch 'master' of github.com:easysoft/zentaopms 2016-04-08 10:39:15 +08:00
wangyidong 85d5058ff3 * code for block. 2016-04-08 10:38:15 +08:00
wangyidong 36999dc907 * fix for removeDuplicate when batchCreate. 2016-04-08 10:34:17 +08:00
wangyidong 72dff1e177 * fix for ignore 360 browser. 2016-04-08 10:33:18 +08:00
wangyidong 88843220e9 * change for md5 password when login. 2016-04-08 10:32:39 +08:00
wangyidong 968627b5f3 * fix bug for no function imagecreatefromjpeg. 2016-04-08 10:31:25 +08:00
wangyidong 98747e9d3c * fix bug for bug-batchCreate. 2016-04-08 10:29:03 +08:00
chenfeiCF 4ae9e43e41 * finish task #2531. 2016-04-08 00:00:24 +08:00
Catouse 10d9fe4982 * add dashboard example and update zui. 2016-04-07 18:18:17 +08:00
Catouse 9b6328ec35 -delete zui.sortable.js: the code is already include in zui. 2016-04-07 15:40:02 +08:00
Catouse 974ebd225b * add dashboard resouce by update zui. 2016-04-07 15:39:21 +08:00
Catouse b441b18b57 * code for task #2564. 2016-04-07 15:21:41 +08:00
wangyidong 149e058816 Merge branch 'master' of github.com:easysoft/zentaopms 2016-04-07 09:45:13 +08:00
wangyidong 221d3264b1 * fix bug #821. 2016-04-07 09:44:06 +08:00
chenfeiCF 2a881fbe12 * code for task #2531: add ditto option for task batch edit. 2016-04-06 21:29:42 +08:00
chenfeiCF 5bea716cb7 * fix end date format when creating product plan. 2016-04-06 15:55:14 +08:00
chenfeiCF 494ca5ac9d * finish task #2546. 2016-04-05 22:30:46 +08:00
wangyidong ee0ace3c75 * finish task #2559. 2016-04-05 14:29:21 +08:00