Commit Graph
85 Commits
Author SHA1 Message Date
wangyidong 7c7117d233 * adjust productplan for branch. 2015-10-30 16:05:19 +08:00
chenfeiCF 4b77b0faa0 Merge branch 'master' of github.com:easysoft/zentaopms 2015-10-30 10:59:09 +08:00
chenfeiCF 125f4244bd * adjust code for bug and build module. 2015-10-30 10:57:48 +08:00
wangyidong e58fe08c46 * adjust search config for branch. 2015-10-30 09:13:43 +08:00
chenfeiCF 9910e1bd1f Merge branch 'master' of github.com:easysoft/zentaopms 2015-10-29 12:21:51 +08:00
chenfeiCF 6a5f590ce9 * adjust for task #2357 2358 2015-10-29 12:18:53 +08:00
wangyidong e1d907628c * finish task #2346 2347 2348. 2015-10-28 14:33:06 +08:00
chenfeiCF 7960c73e1b Merge branch 'master' of github.com:easysoft/zentaopms
Conflicts:
	module/build/model.php
2015-10-27 20:21:01 +08:00
chenfeiCF 546e61c36a * finish task #2350. 2015-10-27 18:55:59 +08:00
wangyidong 71240b18a7 * finish task #2351. 2015-10-27 14:15:05 +08:00
wangyidong c4bd3be15d * code for task #2353. 2015-10-26 14:40:49 +08:00
wangyidong 9bd03f5976 * finish task #2353. 2015-10-26 14:15:25 +08:00
wangyidong 5029ba6b23 * finish task #2344. 2015-10-26 13:12:00 +08:00
wangyidong a1625710cb Merge branch 'master' of github.com:easysoft/zentaopms
*finish task #2342.

Conflicts:
	module/bug/control.php
2015-10-22 17:22:21 +08:00
chenfeiCF 7aebf9efbd * finish task #2358. 2015-10-22 17:12:56 +08:00
wangyidong df23f3b43e * finish task #2341. 2015-10-22 16:38:39 +08:00
chenfeiCF 2026c89d90 * finish task #2357. 2015-10-22 08:28:54 +08:00
wangyidong ae4cd7ef86 * fix for link bug. 2015-05-25 13:43:37 +08:00
wangyidong 927851d74f * adjust for link story and bug for release build and productplan. 2015-05-20 16:13:24 +08:00
wangyidong 6f3931a15b * finish task #2255. 2015-05-13 14:13:32 +08:00
wangyidong 2eb38cfeba * fix a bug for search bug in link bug. 2015-04-15 13:53:33 +08:00
xia0ta0 7f38bf0dfa - remove create and refresh link. 2015-01-29 13:00:27 +08:00
wangyidong 0dd2d53f40 * change for task #2190. 2015-01-28 15:14:02 +08:00
wangyidong a1a587a2af * adjust code. 2014-12-19 06:51:59 +00:00
wangyidong 9927d276dc * finish task #2151. 2014-12-09 02:55:16 +00:00
wangyidong ba385e1477 * finish task #2151. 2014-12-08 07:20:09 +00:00
wangyidong 3f09c6f10a * fix a bug. 2014-09-25 07:07:14 +00:00
chujilu e49f102189 * finish change TASK #2051 2014-08-21 10:44:56 +08:00
chujilu 0a4698989d * task 2051 2014-08-14 10:47:09 +08:00
Catouse c58fea7d7e * ajusted style.
* fixed 'setTemplate' method for kindeditor.
 * added some icons deifinitions.
 * ajusted style of tips after create project.
2014-04-15 10:56:16 +08:00
Catouse e94843f4e2 * changed css names to compatible with zui. 2014-03-26 11:01:19 +08:00
wyd621 d1e74b782b * finish task #1802. 2014-03-06 07:27:50 +00:00
xia0ta0 4dd82ea6a2 * add note of last build. 2013-11-14 11:12:59 +08:00
xia0ta0 2c15082d14 * resloved bugs first in build. 2013-08-09 09:54:19 +08:00
xia0ta0 44d3287bbf Merge branch 'master' of github.com:easysoft/zentaopms 2013-08-08 16:09:05 +08:00
xia0ta0 36bbaf711e * code for task#1678. 2013-08-08 16:08:15 +08:00
wyd621 43ca840982 * fix a bug for build link bug. 2013-08-08 15:43:32 +08:00
azhi 68682101b5 * finish task#1645. 2013-08-01 16:52:24 +08:00
azhi 4b09288597 Merge branch 'master' of git@github.com:easysoft/zentaopms 2013-08-01 13:32:17 +08:00
azhi 633d26dc8a * finish task#1068. 2013-08-01 13:31:51 +08:00
xia0ta0 a4964c6e01 * code for task#1657. 2013-08-01 11:12:02 +08:00
xia0ta0 32ee5bc346 * code for task#1657. 2013-07-30 16:34:41 +08:00
azhi 3e1a529e6d * code for task#1599. 2013-07-29 14:42:45 +08:00
wyd621 ec50ddf69d * commit for different. 2013-07-17 10:05:00 +08:00
chencongzhi520@gmail.com 1e9a8043de * code for task$1487. 2013-07-03 07:21:59 +00:00
wangchunsheng 36ba1f2a1d * adjust the titlte assign method. 2013-01-20 06:49:06 +00:00
wangchunsheng 8f0d651d9c * convert to unix format. 2013-01-18 01:58:14 +00:00
wangchunsheng 48d43cb5e1 * change copyright time. 2013-01-18 01:18:58 +00:00
wangchunsheng 80023501b1 * adjust title. 2012-09-02 07:31:12 +00:00
areyou123456 f232fbbde9 * finish the task #869 2012-08-16 07:31:48 +00:00