Commit Graph

112 Commits

Author SHA1 Message Date
wangyidong
f35ef39f89 * finish task #3449. 2017-12-15 10:09:42 +08:00
wangyidong
a8fb159310 * fix error. 2017-11-29 14:47:40 +08:00
wangyidong
f60a4c664b * custom show deleted user. 2017-09-04 14:46:17 +08:00
wangyidong
8ea15d424f * finish task #3198. 2017-08-22 10:20:24 +08:00
wangyidong
b91e47c2e7 * finish task #3117. 2017-08-14 10:05:30 +08:00
pengjiangxiu
361521adee * Adjust code. 2017-07-25 13:35:16 +08:00
daitingting
8624ceb224 * Adjust codes for test working. 2017-05-08 15:08:42 +08:00
daitingting
ce174f973c * Set as working as only test. 2017-05-05 12:09:19 +08:00
wangyidong
33f8c7dbd1 * finish task #2887. 2017-02-09 10:11:01 +08:00
chenfeiCF
2d60b14e21 * finish task #2877. 2017-01-13 13:22:28 +08:00
wangyidong
f00a45e9dd * finish task #2846. 2017-01-09 10:21:57 +08:00
Catouse
24651e05ed * ajax* methods support json view type. 2016-07-19 08:54:58 +08:00
wangyidong
401e2c0ac1 * fix bug #789. 2016-03-04 13:50:01 +08:00
wangyidong
fb2357ef32 * fix bug for create bug in branch. 2015-12-23 17:23:30 +08:00
wangyidong
48ada5974b * finish task #2416. 2015-11-26 13:11:01 +08:00
wangyidong
a01925a0f2 * finish task #2419. 2015-11-24 10:18:48 +08:00
wangyidong
e703770075 * fix error and adjust build code. 2015-11-13 11:12:41 +08:00
wangyidong
d12d84f950 Merge branch 'master' of github.com:easysoft/zentaopms 2015-11-13 10:56:47 +08:00
wangyidong
2d61ca8d34 * change zh-tw. 2015-11-13 10:55:50 +08:00
chenfeiCF
2f28d73c47 * finish task #2400. 2015-11-13 10:54:14 +08:00
chenfeiCF
00f23416df * adjust code for build and release module. 2015-11-11 20:04:29 +08:00
wangyidong
a0c97d7e01 * adjust for branch name by product name. 2015-11-10 10:55:34 +08:00
wangyidong
015401d1e0 * change zpl 1.1 to 1.2. 2015-11-05 14:09:52 +08:00
wangyidong
2a39736fd7 * adjust code. 2015-11-04 12:16:40 +08:00
chenfeiCF
a46563dade * adjust the code for task #2357 2358. 2015-11-04 10:23:20 +08:00
wangyidong
b65a72e141 * change code and add notice. 2015-11-03 16:05:40 +08:00
wangyidong
3214cb08ce * change for roadmap. 2015-11-02 09:47:37 +08:00
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