Commit Graph
6838 Commits
Author SHA1 Message Date
wangyidong dca4f88056 Merge branch 'master' of github.com:easysoft/zentaopms 2014-11-27 06:09:25 +00:00
wangyidong 4da87b6926 * fix a bug for #648. 2014-11-27 06:07:02 +00:00
Catouse e717233a92 * fixed bug #653. 2014-11-27 13:58:22 +08:00
wangyidong 35ca454942 Merge branch 'master' of github.com:easysoft/zentaopms 2014-11-27 01:03:42 +00:00
wangyidong 77cf7e8040 * fix a bug. 2014-11-27 01:02:42 +00:00
Catouse d330a140c1 * apply status colors. 2014-11-26 10:04:41 +08:00
Catouse 75468f85c6 * remove body padding of task/recordestimate. 2014-11-26 10:04:03 +08:00
Catouse a28f16a8b3 * change datetime picker position when there is no space to display on the bottom side. 2014-11-25 19:45:24 +08:00
Catouse 9fbc96859f * ajusted font size of chosen on feature bar. 2014-11-25 17:22:23 +08:00
Catouse 0560c17870 * ajusted style of chosen on feature bar. 2014-11-25 17:12:40 +08:00
Catouse da014675b9 * ajusted ui of bug assignto menu on table footer. 2014-11-25 17:00:41 +08:00
Catouse 7aa36752a0 * updated chosen. 2014-11-25 14:47:42 +08:00
wangyidong 057801ced7 Merge branch 'master' of github.com:easysoft/zentaopms 2014-11-25 05:47:49 +00:00
wangyidong c59e100611 * code for task #2939. 2014-11-25 05:46:57 +00:00
xia0ta0 f22b980c23 * add ignore for iconv. 2014-11-25 10:40:19 +08:00
wangyidong a8766c858f * fix a bug. 2014-11-24 08:51:39 +00:00
ChuJilu dea557a429 * finish pro task #2957. 2014-11-21 10:21:32 +08:00
wangyidong f5ed352738 * adjust code. 2014-11-21 00:43:12 +00:00
Catouse 452c4088b9 * fixed a js error in kindeditor.html.php. 2014-11-18 11:52:07 +08:00
Catouse dad815c40c * updated chosen.
* ajusted style of chosen contro on 'task/batchCreate'.
2014-11-18 11:51:46 +08:00
wangyidong f4232373a2 * fixed image size of progressbar. 2014-11-14 03:21:47 +00:00
Catouse 3c03ef8af0 * fixed image size of progressbar. 2014-11-14 10:38:08 +08:00
Catouse f25db15efd * fixed image path of progressbar. 2014-11-14 10:22:19 +08:00
Catouse bacdb3e061 Merge branch 'master' of https://github.com/easysoft/zentaopms 2014-11-14 10:07:58 +08:00
Catouse 56d235de45 * ajusted progressbar with image. 2014-11-14 10:07:46 +08:00
Catouse 6a5f8280e0 * ajusted ui of table view. 2014-11-14 10:07:07 +08:00
wangyidong 8aae94b51e * fix bugs for php notice. 2014-11-12 07:35:45 +00:00
wangyidong 9b62ce1a57 Merge branch 'master' of github.com:easysoft/zentaopms 2014-11-07 09:07:28 +00:00
wangyidong 99892c6036 * fix a bug. 2014-11-07 09:07:08 +00:00
wangyidong 894e932026 * fix a bug. 2014-11-07 06:47:56 +00:00
Catouse ab4b55773b * ajusted status color of product/browse. 2014-11-07 14:47:32 +08:00
Catouse 627874502b * ignore empty user. 2014-11-07 14:41:02 +08:00
wangyidong 4ab75aef72 Merge branch 'master' of github.com:easysoft/zentaopms zentaopms_6.3.stable_20141107 2014-11-07 04:26:00 +00:00
wangyidong 9650ba0d7d * fix bug for 649. 2014-11-07 04:24:18 +00:00
Catouse 5d9c0c8c3b * fixed error on submit form with placeholder value for IEs. 2014-11-07 11:51:06 +08:00
Catouse 8cacd2aeab * fixed input group style conflict of searchbox. 2014-11-07 11:28:17 +08:00
Catouse e44acb4f65 Merge branch 'master' of https://github.com/easysoft/zentaopms 2014-11-07 10:38:45 +08:00
Catouse 3911fb5bd7 * ajusted style of project menu. 2014-11-07 10:38:22 +08:00
wangyidong 268435ebe5 * adjust for lang. 2014-11-07 02:35:49 +00:00
wangyidong 81e5998f5f Merge branch 'master' of github.com:easysoft/zentaopms 2014-11-07 02:14:37 +00:00
wangyidong 92e7e933cc * adjust code. 2014-11-07 02:14:17 +00:00
wangyidong 6d5ab1e0e0 + add changelog. 2014-11-07 02:14:03 +00:00
Catouse 30183548b1 Merge branch 'master' of https://github.com/easysoft/zentaopms 2014-11-07 09:56:51 +08:00
Catouse c91b4dfd16 * removed debug code. 2014-11-07 09:56:43 +08:00
wangyidong 4496cf6df3 * fix a bug #651. 2014-11-07 00:55:59 +00:00
ChuJilu 5a36e6d25b * fix task #2102. 2014-11-06 18:09:27 +08:00
ChuJilu 460bc7864f * fix task #2109 2014-11-06 18:06:38 +08:00
wangyidong ec222e6477 Merge branch 'master' of github.com:easysoft/zentaopms 2014-11-06 09:36:22 +00:00
wangyidong 96341b35c3 * fix file size. 2014-11-06 09:36:04 +00:00
ChuJilu 8d6ed5676f * fix task #2106. 2014-11-06 17:23:13 +08:00