Commit Graph
284 Commits
Author SHA1 Message Date
wangyidong 8fd1ffd129 * change for english. 2016-04-15 11:37:08 +08:00
wangyidong cb5d368c48 * finish task #2524. 2016-04-12 11:23:05 +08:00
chenfeiCF b1e147fec3 * code for task #2528. 2016-04-12 08:28:42 +08:00
Catouse b441b18b57 * code for task #2564. 2016-04-07 15:21:41 +08:00
wangyidong 511978cd0c * adjust for task #2545,2547. 2016-03-31 11:28:36 +08:00
wangyidong dff1bfb1ae * finish task #2542. 2016-03-31 10:06:54 +08:00
wangyidong b053ec972f * finish task #2545. 2016-03-30 10:55:00 +08:00
chenfeiCF a0d62eea86 * finish task #2557. 2016-03-28 13:51:43 +08:00
wangyidong f3e552f275 * fix sprintf with %branch%. 2016-03-23 13:45:08 +08:00
wangyidong 0b3ef6fba1 Merge branch 'master' of github.com:easysoft/zentaopms 2016-03-15 09:57:51 +08:00
wangyidong 7f2c61c891 * change for browse notice. 2016-03-15 09:56:33 +08:00
chenfeiCF c6d21eec38 * add confirmBug action icon for zentao mobile web. 2016-03-15 09:51:05 +08:00
chenfeiCF b2d49204b8 * move checkIP method to common model from user model. 2016-03-14 11:31:02 +08:00
wangyidong 516b1f0034 * change hasEdited to editedByOther in common lang. 2016-03-14 10:48:42 +08:00
chenfeiCF 0bebfe176a * delete lang items which have not been used. 2016-03-14 02:44:40 +08:00
Catouse 18f97e6478 * change UI of buttons in table footer. 2016-03-07 13:35:13 +08:00
chenfeiCF 98e7f59798 * finish task #2482. 2016-02-23 13:41:52 +08:00
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 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 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 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 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 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 c56d8e69c6 * finish task #2206, 2207. 2015-02-28 14:56:35 +08:00
xia0ta0 fc495455bf * adjust submenu of admin. 2015-02-26 16:11:35 +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 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 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 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