Design/EasySoft-ZenTaoPMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 30 Wiki Activity
7,489 Commits 2 Branches 292 Tags
4cf14c3e438d75467add8ad7a47d8a0804450db2
Commit Graph
7489 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
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 7464680eae * upgrade license. 2015-11-10 10:50:32 +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 5d0adaee3d Merge branch 'master' of github.com:easysoft/zentaopms 2015-11-05 11:33:31 +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
wwccss 0bdb398791 * Remove duplicate title. 2015-11-05 11:16:04 +08:00
wangyidong 388df75ec1 * change license. 2015-11-05 11:10:53 +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 513c49f855 * change for filter super vars. 2015-11-04 14:17:20 +08:00
wangyidong 394a407ec0 * fix a bug for sendcloud. 2015-11-04 13:33: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