Commit Graph
63 Commits
Author SHA1 Message Date
滔哥 1eaaf24db6 * Change for Xuanxuan entry sso. 2018-07-23 13:30:15 +08:00
wangyidong c3c9305775 * finish task #4556. 2018-07-05 14:58:46 +08:00
wangyidong 539c1986f9 * adjust for other module page. 2018-05-03 09:53:30 +08:00
wangyidong f60a4c664b * custom show deleted user. 2017-09-04 14:46:17 +08:00
pengjiangxiu ea306d3f3b * change lang file. 2017-08-24 14:03:58 +08:00
pengjiangxiu 202d76db45 * Adjust code. 2017-08-23 13:08:06 +08:00
wangyidong b91e47c2e7 * finish task #3117. 2017-08-14 10:05:30 +08:00
pengjiangxiu c555c79de7 * Adjust code. 2017-07-24 14:05:18 +08:00
pengjiangxiu 1b5465b57b * Finish task #3078. 2017-07-17 10:54:17 +08:00
wangyidong d18cc65d90 * merge new framework. 2017-06-16 16:52:45 +08:00
wangyidong de5c536659 * adjust for framework. 2017-06-14 15:23:38 +08:00
wangyidong c27f1f7d34 * merge zentaophp to zentao. 2017-06-09 17:05:37 +08:00
wangyidong 6879900055 * fix bug for changeWeak. 2017-05-11 14:48:13 +08:00
wangyidong 8c75db7463 * change for modify weak password. 2017-05-11 13:17:57 +08:00
wangyidong 7992e7b389 * fix for add admin item for user by sso login. 2017-03-24 14:11:24 +08:00
wangyidong 0416eed289 * set admin in login. 2017-03-15 16:43:58 +08:00
chenfeiCF 61db347702 * finish task #2880. 2017-01-10 14:13:31 +08:00
tengfei ae1b3f9080 * Delete useless files. 2016-11-30 10:35:14 +08:00
tengfei 6b8f460ede * bak. 2016-11-30 10:28:54 +08:00
wangyidong e549d7f015 * finish task #2757. 2016-11-22 14:21:05 +08:00
wangyidong 78db39b7dc * change for en lang. 2016-11-07 11:14:35 +08:00
wangyidong e08432aaf2 * fix bugs. 2016-09-08 17:30:38 +08:00
daitingting 2a6ec86f01 * Check key when integrate with ranzhi. 2016-05-24 10:21:01 +08:00
daitingting 90239c681e * Get tasks and bugs together. 2016-05-23 09:58:36 +08:00
daitingting 30f9e11692 * Get todo list for ranzhi. 2016-05-18 14:35:11 +08:00
daitingting 7c5358ed0d Merge branch 'master' of https://github.com/easysoft/zentaopms 2015-11-13 15:17:23 +08:00
daitingting 7184cb3a90 * Adjust codes. 2015-11-13 15:14:42 +08:00
wangyidong 086848c53e * code task #2404. 2015-11-12 10:40:02 +08:00
daitingting 89c17e26e9 * Add bindUser and createUser function for ranzhi. 2015-11-11 10:41:08 +08:00
daitingting 225270d39b * Check privilage. 2015-11-09 16:02:07 +08:00
wangyidong 951f843615 * change for en and zh-tw lang. 2015-11-06 15:35:18 +08:00
wangyidong e2c77e381c * change for compute password strength. 2015-11-06 14:30:55 +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 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
chujilu 8b082953d0 * Fix bug of sso login 302 url. 2015-11-04 09:35:30 +08:00
wangyidong abf8b97904 * change for zh-tw. 2015-09-18 09:59:43 +08:00
wangyidong a6d77d7389 * adjust for sso. 2015-09-11 14:14:18 +08:00
chujilu 7fdc8e13e4 * Fix a bug. 2015-09-11 13:25:48 +08:00
wangyidong 0bf04601f0 * adjust lang for sso and mail. 2015-09-09 10:03:23 +08:00
wangyidong 474e1fe5bd + finish task #2279. 2015-09-07 09:23:21 +08:00
wangyidong f92104dd17 * finish task #1975. 2014-07-25 09:05:47 +00:00
Catouse 6193014130 * change 'featurebar' to 'titlebar' and ajust style. 2014-04-23 17:56:18 +08:00
Catouse 955e6183ee * ajusted views. 2014-04-11 09:44:44 +08:00
Catouse 9d350c1b51 * ajusted views of module 'sso'. 2014-04-04 14:01:21 +08:00
Catouse ad3a1c29b8 * ajusted views.
* changed css names.
2014-03-27 14:40:55 +08:00
Catouse e94843f4e2 * changed css names to compatible with zui. 2014-03-26 11:01:19 +08:00
Catouse c1fd283142 * changed css names. 2014-03-25 11:25:30 +08:00