Commit Graph
6807 Commits
Author SHA1 Message Date
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
wangyidong 22dc72f739 * sort upload images. 2014-11-06 09:16:27 +00:00
wangyidong 2a47b1ba25 Merge branch 'master' of github.com:easysoft/zentaopms 2014-11-06 09:09:34 +00:00
wangyidong a8be1e9649 * fix bug and adjust code. 2014-11-06 09:06:34 +00:00
Catouse 6da1b6a4bb * updated zui css: fixed article style. 2014-11-06 15:30:35 +08:00
Catouse 705a387340 * fixed style of 'project/task'. 2014-11-06 15:23:08 +08:00
Catouse fbd944aefd * ajusted style off assign to menu with search input. 2014-11-06 15:21:08 +08:00
Catouse 4e4eb72ae6 * updated zui: added cards and sortable. 2014-11-06 15:16:53 +08:00
Catouse cea057d820 Merge branch 'master' of https://github.com/easysoft/zentaopms 2014-11-06 14:53:53 +08:00
Catouse 1b72bf4723 * ajusted ui of batch assign to dropmenu. 2014-11-06 14:53:01 +08:00
wangyidong d76b854042 * fix js error for ie. 2014-11-06 06:01:52 +00:00
wangyidong 6f51bc31f7 * change lang. 2014-11-06 05:59:47 +00:00
wangyidong 3fe9d38165 * fix client lang ie >= 10. 2014-11-06 05:59:12 +00:00
wangyidong 31e3daa4c8 * change lang. 2014-11-06 03:07:00 +00:00
wangyidong 9f39bc1e2e * adjust mail. 2014-11-06 03:03:14 +00:00
wangyidong 41452c9d45 Merge branch 'master' of github.com:easysoft/zentaopms 2014-11-06 01:03:42 +00:00
wangyidong 88ee97e72c * change for upgrade. 2014-11-06 01:03:23 +00:00
Catouse 5ed522a94d * ajusted status of objects. 2014-11-06 08:56:31 +08:00
ChuJilu f1f4e8a48d * fix a bug. 2014-11-05 18:32:28 +08:00
ChuJilu c1337e49da * finish task #2107. 2014-11-05 17:23:04 +08:00
wangyidong b4d97a5ea9 * adjust code for task #2090. 2014-11-05 09:16:31 +00:00
wangyidong 144b057d95 * adjust width for files-list. 2014-11-05 08:46:42 +00:00
wangyidong a796bfbf54 * fix a bug. 2014-11-05 08:37:47 +00:00
wangyidong 03e017b430 Merge branch 'master' of github.com:easysoft/zentaopms 2014-11-05 08:24:13 +00:00
wangyidong 42d3486642 * finish task #2118. 2014-11-05 08:23:20 +00:00
ChuJilu 81f0212df7 * finish task #2106. 2014-11-05 16:22:37 +08:00
wangyidong dc0945efd8 * finish task #2124. 2014-11-05 07:44:46 +00:00
wangyidong 0fcb3f7bbb Merge branch 'master' of github.com:easysoft/zentaopms 2014-11-05 07:10:41 +00:00
wangyidong b0d133aa03 * fix bug #649. 2014-11-05 06:58:57 +00:00
Catouse a184554259 * ajusted status color. 2014-11-05 14:38:22 +08:00
wangyidong c0e7f91638 * finish task #2142. 2014-11-05 05:46:58 +00:00
wangyidong 9c9b1d65cc * finish task #2143. 2014-11-05 05:23:53 +00:00