Commit Graph
460 Commits
Author SHA1 Message Date
Catouse 4b76d36e9e * finish task #2469. 2016-02-22 10:29:28 +08:00
wangyidong e8bb9aa1ee * finish task #1295. 2016-02-15 17:29:23 +08:00
wangyidong 2d61ca8d34 * change zh-tw. 2015-11-13 10:55:50 +08:00
wangyidong 4cf14c3e43 Merge branch 'master' of github.com:easysoft/zentaopms 2015-11-10 10:56:35 +08:00
wangyidong a0c97d7e01 * adjust for branch name by product name. 2015-11-10 10:55:34 +08:00
chenfeiCF fe99321c45 * finish task #2396. 2015-11-10 10:43:23 +08:00
wangyidong 951f843615 * change for en and zh-tw lang. 2015-11-06 15:35:18 +08:00
wangyidong 015401d1e0 * change zpl 1.1 to 1.2. 2015-11-05 14:09:52 +08:00
wangyidong e58fe08c46 * adjust search config for branch. 2015-10-30 09:13:43 +08:00
wangyidong 3673201509 * adjust for task #2336. 2015-10-27 15:03:20 +08:00
wangyidong 9ad38472fc * finish task #2336,2337,2338,2339. 2015-10-20 10:11:46 +08:00
wangyidong abf8b97904 * change for zh-tw. 2015-09-18 09:59:43 +08:00
wangyidong b54316ef32 * adjust for import. 2015-09-17 13:30:14 +08:00
wangyidong 474e1fe5bd + finish task #2279. 2015-09-07 09:23:21 +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 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
wangyidong 0ca09de3d7 * change for zh-tw lang. 2015-05-18 13:55:40 +08:00
wangyidong 6f3931a15b * finish task #2255. 2015-05-13 14:13:32 +08:00
wangyidong ff8ac1f30f * finish task #2246.
* code task #2252.
2015-05-12 11:14:46 +08:00
Catouse 4f8eb1d30e * change product set icon. 2015-05-07 11:30:02 +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 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
wangyidong fb4eed1c39 * finish task #2190. 2015-01-28 16:31:03 +08:00
wangyidong 0dd2d53f40 * change for task #2190. 2015-01-28 15:14:02 +08:00
wangyidong 6b092dbde9 * add file header in backup file. 2013-12-22 07:51:50 +00:00
wangyidong 0c0f8d85a9 * adjust code. 2014-12-19 01:05:41 +00:00
Catouse bbaf9039d0 * enhance ui of story search modal with chosen. 2014-12-17 18:10:13 +08:00
wangyidong d75f50e691 * change for zh-tw lang. 2014-12-16 09:03:36 +00:00
wangyidong 8ce86eddbe * finish task #660. 2014-12-16 01:18:39 +00:00
wangyidong 88a59254a0 * finish task #2157. 2014-12-12 09:31:23 +00:00
wangyidong 0c687fcc6d Merge branch 'master' of github.com:easysoft/zentaopms 2014-12-11 02:46:00 +00:00
wangyidong 33cb9fb781 * finish task #2039,2040. 2014-12-11 01:45:10 +00:00
Catouse 85ba11c7ea * finish task #1959, #1958. 2014-12-10 09:50:56 +08:00
wangyidong 268435ebe5 * adjust for lang. 2014-11-07 02:35:49 +00:00
wangyidong a8be1e9649 * fix bug and adjust code. 2014-11-06 09:06:34 +00:00
wangyidong 303dbe844d * finish task #2141. 2014-11-03 06:12:00 +00:00
wangyidong 7c96bd88ee * finish task #2878. 2014-11-03 05:51:43 +00:00
wangyidong d89b6daa5a * finish task #2043,2094,2098. 2014-10-27 02:56:11 +00:00
wangyidong 02d5200f98 * change for zh-tw. 2014-08-26 00:48:31 +00:00