Commit Graph

46 Commits

Author SHA1 Message Date
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
wyd621
3caa3e985a * add new version. 2013-08-09 10:08:02 +08:00
wyd621
69106a374d * change for new version. 2013-08-05 10:22:07 +08:00
xia0ta0
5be7ec6214 * code for task#1581. 2013-08-05 09:23:15 +08:00
xia0ta0
44b2bf5171 * code for task#1581. 2013-08-02 17:20:19 +08:00
wyd621
01dd3ac526 * fix bug for waring. 2013-08-02 10:36:34 +08:00
azhi
68682101b5 * finish task#1645. 2013-08-01 16:52:24 +08:00
xia0ta0
78b1ffdfa0 * code for task#1580. 2013-07-21 21:00:06 +08:00
xia0ta0
cbe4afe436 * code for task#1552. 2013-07-19 16:35:05 +08:00
xia0ta0
1067e55ad3 Merge branch 'master' of https://github.com/easysoft/zentaopms 2013-07-19 14:42:25 +08:00
xia0ta0
6954ee9d89 * code for task#1580. 2013-07-19 14:40:51 +08:00
xia0ta0
36a90cd70d * code for task#1580. 2013-07-19 14:38:26 +08:00
wwccss
c20261cb20 * init ext directory again. 2013-07-18 09:17:31 +08:00
xia0ta0
4b2adf55d8 + add sso module. 2013-07-17 13:54:21 +08:00