Commit Graph

984 Commits

Author SHA1 Message Date
wangyidong
0571ffe6a3 * finish task #2276. 2015-09-07 16:56:44 +08:00
wangyidong
474e1fe5bd + finish task #2279. 2015-09-07 09:23:21 +08:00
wangyidong
79fea4c0b1 * code for task #2288. 2015-09-02 10:13:15 +08:00
Catouse
615fb2ff1f * finish task #2312. 2015-08-26 15:23:34 +08:00
wangyidong
d1d56b2a6a * change for zh-tw. 2015-08-06 10:46:30 +08:00
wangyidong
e0a643cd0b * change projectcommon to projectCommon,productcommon to productCommon. 2015-07-30 15:35:55 +08:00
wangyidong
a790ea2247 * finish task #3369. 2015-07-24 12:07:34 +08:00
wangyidong
9390e960ee * finish task #3344. 2015-07-17 13:24:48 +08:00
wangyidong
365b8b1e56 * fix bug #643. 2015-07-07 14:37:18 +08:00
wangyidong
ecf44af91d * fix bugs. 2015-07-01 10:29:06 +08:00
wangyidong
0345e1a380 * adjust for task #2266. 2015-05-21 13:36:25 +08:00
wangyidong
0cfdc19e15 * adjust for check password. 2015-05-20 13:13:42 +08:00
Catouse
a097785af8 * fix pie chart for ie8. 2015-05-19 17:23:07 +08:00
Catouse
191172df1e * fix bar spacing of bar chart. 2015-05-19 15:16:50 +08:00
Catouse
54c6e77913 * change table sortable UI. 2015-05-19 14:28:03 +08:00
wangyidong
0ca09de3d7 * change for zh-tw lang. 2015-05-18 13:55:40 +08:00
wangyidong
ed1d7ba4b6 * finish task #2266. 2015-05-15 13:26:15 +08:00
Catouse
ef6e9bd15a * display pie chart UI. 2015-05-13 16:55:58 +08:00
wangyidong
6f3931a15b * finish task #2255. 2015-05-13 14:13:32 +08:00
Catouse
95dddf0336 * change story report UI. 2015-05-12 15:22:35 +08:00
Catouse
43eaa05278 * chart support bar type. 2015-05-12 14:58:15 +08:00
wangyidong
d0ad83da1a Merge branch 'master' of github.com:easysoft/zentaopms 2015-05-12 11:15:57 +08:00
wangyidong
ff8ac1f30f * finish task #2246.
* code task #2252.
2015-05-12 11:14:46 +08:00
Catouse
4b4a8f8b1b * add jquery extension to create chart with data in table. 2015-05-11 17:36:35 +08:00
Catouse
bd44b3479c + add chart common code. 2015-05-11 17:03:29 +08:00
Catouse
c453cb940f * update zui.sortable.js. 2015-05-08 15:24:19 +08:00
Catouse
b095d6e8cf Merge branch 'master' of https://github.com/easysoft/zentaopms 2015-05-08 14:48:30 +08:00
wangyidong
76e8841a51 * finish task #2247. 2015-05-08 14:46:11 +08:00
Catouse
0ed8b0b52e * update zui.sortable.js. 2015-05-08 14:43:58 +08:00
Catouse
091ad90cd3 Revert " * update zui.sortable.js."
This reverts commit 875533c100.
2015-05-08 14:37:15 +08:00
Catouse
875533c100 * update zui.sortable.js. 2015-05-08 14:36:25 +08:00
wangyidong
cd1a74d560 Merge branch 'master' of github.com:easysoft/zentaopms 2015-05-08 09:50:06 +08:00
wangyidong
36a4c32720 * finish task #2241,2245. 2015-05-08 09:47:39 +08:00
Catouse
77f96464e5 * make product and project table sortable. 2015-05-07 18:19:00 +08:00
Catouse
369f875526 * rename window.browser to $.zui.browser. 2015-05-07 15:27:39 +08:00
Catouse
4f8eb1d30e * change product set icon. 2015-05-07 11:30:02 +08:00
wangyidong
c97f38b2a3 * fix a bug for js. 2015-05-04 16:38:22 +08:00
wangyidong
9f6fb46686 * fix a bug #640. 2015-04-13 16:08:31 +08:00
wangyidong
429b8f30a3 * fix bug for upgrade.php security code. 2015-03-30 16:31:12 +08:00
wangyidong
b80b3620ef * change for zh-tw. 2015-03-09 12:02:54 +08:00
wangyidong
c4a72a6b75 Merge branch 'master' of github.com:easysoft/zentaopms
Conflicts:
	module/common/lang/en.php
	module/common/lang/menuOrder.php
	module/common/lang/zh-cn.php
2015-02-28 17:29:16 +08:00
wangyidong
e3276297c5 * finish task #2208. 2015-02-28 17:26:27 +08:00
wangyidong
c56d8e69c6 * finish task #2206, 2207. 2015-02-28 14:56:35 +08:00
xia0ta0
5b7075f444 * adjust menuOrder of admin. 2015-02-27 08:38:28 +08:00
xia0ta0
fc495455bf * adjust submenu of admin. 2015-02-26 16:11:35 +08:00
wangyidong
30c1ab399a * adjust for paste image. 2015-02-04 17:35:09 +08:00
wangyidong
6d9aa57ec7 Merge branch 'master' of github.com:easysoft/zentaopms 2015-02-04 15:43:45 +08:00
wangyidong
c9f0b9f861 * change for zh-tw. 2015-02-04 15:43:19 +08:00
wangyidong
c3e0d714f0 * adjust code. 2015-02-04 10:14:53 +08:00
Catouse
cf330a9264 * chosen suppot change dropmenu direction. 2015-02-02 16:04:33 +08:00