 wangyidong
|
951f843615
|
* change for en and zh-tw lang.
|
2015-11-06 15:35:18 +08:00 |
|
|
wangyidong
|
7065b7aa68
|
Merge branch 'master' of github.com:easysoft/zentaopms
|
2015-11-06 14:31:26 +08:00 |
|
|
wangyidong
|
e2c77e381c
|
* change for compute password strength.
|
2015-11-06 14:30:55 +08:00 |
|
|
chenfeiCF
|
64e490d650
|
* add notice when editing story, bug and case.
|
2015-11-06 10:38:01 +08:00 |
|
|
wangyidong
|
5f70edfbfd
|
* fix bug and adjust sso-bind page.
|
2015-11-06 09:26:00 +08:00 |
|
|
wangyidong
|
e003ed01f0
|
* finish task #2363,2364.
|
2015-11-05 17:27:59 +08:00 |
|
|
wangyidong
|
015401d1e0
|
* change zpl 1.1 to 1.2.
|
2015-11-05 14:09:52 +08:00 |
|
|
wangyidong
|
d521893d0a
|
* code for task #2333.
|
2015-11-05 11:36:40 +08:00 |
|
|
wangyidong
|
c5feed8a07
|
* add purifier lib and filter by purifier.
|
2015-11-05 11:32:51 +08:00 |
|
|
wangyidong
|
da84d5164c
|
* adjust code.
|
2015-11-05 11:32:04 +08:00 |
|
|
wangyidong
|
c945a0a8c3
|
* adjust for workload.
|
2015-11-05 10:24:19 +08:00 |
|
|
wangyidong
|
3e77dd3145
|
* code for safe in framework.
|
2015-11-05 09:51:42 +08:00 |
|
|
wangyidong
|
35c1801205
|
* add notice.
|
2015-11-04 14:17:58 +08:00 |
|
|
wangyidong
|
f4751b5fae
|
* fix bug for create task from story-view page.
|
2015-11-04 13:19:07 +08:00 |
|
|
wangyidong
|
b9ff9b465d
|
* fix bug #758.
|
2015-11-04 13:14:43 +08:00 |
|
|
wangyidong
|
2a39736fd7
|
* adjust code.
|
2015-11-04 12:16:40 +08:00 |
|
|
wangyidong
|
35771f7f36
|
Merge branch 'master' of github.com:easysoft/zentaopms
|
2015-11-04 11:26:32 +08:00 |
|
|
wangyidong
|
4470b3db97
|
* fix bug for WooYun-2015-151486.
|
2015-11-04 11:24:09 +08:00 |
|
|
chenfeiCF
|
85cbdbb6b7
|
* adjust the code.
|
2015-11-04 10:59:19 +08:00 |
|
|
chenfeiCF
|
09866e78b5
|
Merge branch 'master' of github.com:easysoft/zentaopms
|
2015-11-04 10:26:08 +08:00 |
|
|
chenfeiCF
|
a46563dade
|
* adjust the code for task #2357 2358.
|
2015-11-04 10:23:20 +08:00 |
|
|
chujilu
|
8b082953d0
|
* Fix bug of sso login 302 url.
|
2015-11-04 09:35:30 +08:00 |
|
|
chenfeiCF
|
834aee0f27
|
* adjust the code.
|
2015-11-03 16:58:32 +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 |
|