wangyidong
|
4470b3db97
|
* fix bug for WooYun-2015-151486.
|
2015-11-04 11:24:09 +08:00 |
|
wangyidong
|
b65a72e141
|
* change code and add notice.
|
2015-11-03 16:05:40 +08:00 |
|
wangyidong
|
e0a24a8a09
|
Merge branch 'master' of github.com:easysoft/zentaopms
|
2015-11-03 08:26:24 +08:00 |
|
wangyidong
|
fa09186c68
|
* fix bug for WooYun-2015-137380.
|
2015-11-03 08:25:03 +08:00 |
|
chenfeiCF
|
e93cb9e75d
|
Merge branch 'master' of github.com:easysoft/zentaopms
Conflicts:
module/build/model.php
module/release/model.php
|
2015-11-02 16:02:29 +08:00 |
|
chenfeiCF
|
a6b66e916e
|
* adjust code for bug #757.
|
2015-11-02 15:50:47 +08:00 |
|
wangyidong
|
9bfcc069ab
|
Merge branch 'master' of github.com:easysoft/zentaopms
Conflicts:
module/release/model.php
|
2015-11-02 15:33:17 +08:00 |
|
wangyidong
|
5d7126f5ca
|
* finish task #2335.
|
2015-11-02 15:30:43 +08:00 |
|
chenfeiCF
|
f82bd56ce2
|
* fix bug #757.
|
2015-11-02 14:35:35 +08:00 |
|
wangyidong
|
1807788f9d
|
Merge branch 'master' of github.com:easysoft/zentaopms
|
2015-11-02 10:52:25 +08:00 |
|
wangyidong
|
eee2990ea7
|
* adjust lang for branch.
|
2015-11-02 10:52:04 +08:00 |
|
chenfeiCF
|
4b9459b3e3
|
Merge branch 'master' of github.com:easysoft/zentaopms
|
2015-11-02 10:48:39 +08:00 |
|
chenfeiCF
|
c8c87f6a3f
|
* fix bug #759.
|
2015-11-02 10:48:03 +08:00 |
|
wangyidong
|
3214cb08ce
|
* change for roadmap.
|
2015-11-02 09:47:37 +08:00 |
|
wangyidong
|
713b190e09
|
Merge branch 'master' of github.com:easysoft/zentaopms
|
2015-11-02 08:39:11 +08:00 |
|
wangyidong
|
1633dfb3aa
|
* adjust for productplan link story.
|
2015-11-02 08:38:17 +08:00 |
|
chenfeiCF
|
5b5f982fd6
|
* fix bug #760.
|
2015-11-02 08:04:17 +08:00 |
|
wangyidong
|
7c7117d233
|
* adjust productplan for branch.
|
2015-10-30 16:05:19 +08:00 |
|
chenfeiCF
|
785c21f04a
|
* fix bug #753 and adjust the code format.
|
2015-10-30 13:51: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
|
4823890b2d
|
* adjust for task #2359.
|
2015-10-29 21:53:59 +08:00 |
|
chenfeiCF
|
d135d85ba4
|
Merge branch 'master' of github.com:easysoft/zentaopms
|
2015-10-29 16:17:26 +08:00 |
|
chenfeiCF
|
de80cb0470
|
* fix bug #752.
|
2015-10-29 16:15:01 +08:00 |
|
wangyidong
|
8593f3ce07
|
* adjust code for branch.
|
2015-10-29 15:28:08 +08:00 |
|
chenfeiCF
|
8381753633
|
* fix bug #754.
|
2015-10-29 15:15:10 +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
|
1202c8db38
|
* finish for testtask branch.
|
2015-10-29 10:05:01 +08:00 |
|
wangyidong
|
d52bb5da5c
|
* finish task #2349.
|
2015-10-28 14:54:48 +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
|
3673201509
|
* adjust for task #2336.
|
2015-10-27 15:03:20 +08:00 |
|
wangyidong
|
71240b18a7
|
* finish task #2351.
|
2015-10-27 14:15:05 +08:00 |
|
wangyidong
|
b979a5da38
|
* finish task #2352.
|
2015-10-27 09:34: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
|
621684debf
|
Merge branch 'master' of github.com:easysoft/zentaopms
|
2015-10-26 09:35:58 +08:00 |
|
wangyidong
|
66af5e5183
|
* finish task #2344.
|
2015-10-26 09:35:22 +08:00 |
|
chenfeiCF
|
b8fd607508
|
Merge branch 'master' of github.com:easysoft/zentaopms
|
2015-10-23 14:01:46 +08:00 |
|
chenfeiCF
|
87686ad3f1
|
* finish task #2354.
|
2015-10-23 13:59:59 +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 |
|
wangyidong
|
578d47a409
|
* finish task #2342.
|
2015-10-22 17:18:34 +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 |
|
wangyidong
|
333b0be157
|
* finish task #2323,2340.
|
2015-10-22 09:03:37 +08:00 |
|
chenfeiCF
|
2026c89d90
|
* finish task #2357.
|
2015-10-22 08:28:54 +08:00 |
|