wangyidong
|
68f9066039
|
Merge branch 'master' of github.com:easysoft/zentaopms
|
2015-11-11 13:30:37 +08:00 |
|
wangyidong
|
a9d90a73c9
|
* finish task #2386,2402.
|
2015-11-11 13:29:55 +08:00 |
|
chenfeiCF
|
a178e19241
|
* finish task #2406.
|
2015-11-11 13:26:23 +08:00 |
|
chenfeiCF
|
9c7cff9c16
|
* finish task #2383.
|
2015-11-11 13:10:07 +08:00 |
|
wangyidong
|
fcadcec130
|
Merge branch 'master' of github.com:easysoft/zentaopms
|
2015-11-11 11:08:38 +08:00 |
|
wangyidong
|
45fb1f0c92
|
* finish task #2380,2389,2390.
|
2015-11-11 11:07:59 +08:00 |
|
daitingting
|
89c17e26e9
|
* Add bindUser and createUser function for ranzhi.
|
2015-11-11 10:41:08 +08:00 |
|
chenfeiCF
|
84af2e4700
|
Merge branch 'master' of github.com:easysoft/zentaopms
|
2015-11-10 17:30:37 +08:00 |
|
chenfeiCF
|
d1129ebf9f
|
* finish task #2382.
|
2015-11-10 17:29:21 +08:00 |
|
wangyidong
|
8746d7bc64
|
Merge branch 'master' of github.com:easysoft/zentaopms
|
2015-11-10 17:14:05 +08:00 |
|
wangyidong
|
273bf0a237
|
* finish task #2378,2379,2381.
|
2015-11-10 17:12:33 +08:00 |
|
chenfeiCF
|
160eb29d76
|
* finish task #2397.
|
2015-11-10 16:45:39 +08:00 |
|
chenfeiCF
|
86b96a9640
|
* finish task #2388.
|
2015-11-10 15:29:41 +08:00 |
|
chenfeiCF
|
1f72c22642
|
* finish task #2387.
|
2015-11-10 13:34:06 +08:00 |
|
chenfeiCF
|
74d50c2bcd
|
* finish task #2384.
|
2015-11-10 11:21:54 +08:00 |
|
wangyidong
|
ff210f304d
|
* finish task #2377.
|
2015-11-10 11:11:48 +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 |
|
wangyidong
|
1df211fdaa
|
* adjust for parseImage.
|
2015-11-10 10:55:14 +08:00 |
|
wangyidong
|
61eb0a6fc3
|
* change for upgrade.
|
2015-11-10 10:50:01 +08:00 |
|
chenfeiCF
|
fe99321c45
|
* finish task #2396.
|
2015-11-10 10:43:23 +08:00 |
|
wangyidong
|
b82964c389
|
* finish task #2376.
|
2015-11-10 10:37:43 +08:00 |
|
daitingting
|
99eb66aaf0
|
Merge branch 'master' of https://github.com/easysoft/zentaopms
|
2015-11-09 16:02:40 +08:00 |
|
daitingting
|
225270d39b
|
* Check privilage.
|
2015-11-09 16:02:07 +08:00 |
|
chenfeiCF
|
6b92b40e4c
|
* remove back button for manage method of branch.
|
2015-11-09 15:10:48 +08:00 |
|
wangyidong
|
e98ceb95c7
|
* finish task #2333.
|
2015-11-09 13:14:12 +08:00 |
|
wangyidong
|
3478a9010f
|
* adjust for story export.
|
2015-11-09 10:19:50 +08:00 |
|
wangyidong
|
c3f3cfbed4
|
Merge branch 'master' of github.com:easysoft/zentaopms
|
2015-11-09 09:49:41 +08:00 |
|
wangyidong
|
653b1c3cd1
|
* fix bug #749.
|
2015-11-09 09:32:15 +08:00 |
|
chenfeiCF
|
23430345e9
|
* adjust the code for common.js of bug module.
|
2015-11-09 09:24:32 +08:00 |
|
wangyidong
|
fd44c39d50
|
* fix bug #748.
|
2015-11-09 09:15:08 +08:00 |
|
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 |
|