Commit Graph

526 Commits

Author SHA1 Message Date
tengfei
cc522b2a03 *Adjust user 2016-12-16 13:18:33 +08:00
tengfei
c7d4e506de *adjust gender 2016-12-13 10:54:32 +08:00
wangyidong
fbce8df948 * adjust page. 2016-12-08 13:27:37 +08:00
wangyidong
21e8457d5e * change for resource and en zh-tw lang. 2016-12-06 13:25:25 +08:00
chenfeiCF
20443bd8ec * adjust task #2701. 2016-12-01 11:31:04 +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
tengfei
b7c509aa09 * verification->acceptance 2016-11-30 09:22:47 +08:00
wangyidong
be0590ac6f Merge branch 'master' of github.com:easysoft/zentaopms 2016-11-23 14:38:21 +08:00
wangyidong
af68f3c193 * finish task #2738. 2016-11-23 14:36:41 +08:00
Catouse
2a3e326962 * fix task pri text with zero value. 2016-11-22 16:17:40 +08:00
wangyidong
e549d7f015 * finish task #2757. 2016-11-22 14:21:05 +08:00
chenfeiCF
08ce64e737 * finish task #2701. 2016-11-18 15:26:31 +08:00
wangyidong
5854894af3 * fix bug for 8.3. 2016-11-15 10:22:48 +08:00
wangyidong
d73ba00f0b * fix bug for en lang. 2016-11-11 13:07:45 +08:00
wangyidong
78db39b7dc * change for en lang. 2016-11-07 11:14:35 +08:00
wangyidong
a42672984d * fix error. 2016-10-31 11:09:39 +08:00
Catouse
8a604e4ebd * change getDataInJSON method. 2016-09-30 14:50:32 +08:00
wangyidong
8e30e63a1d * adjust for update user for usergroup. 2016-09-19 09:19:29 +08:00
chenfeiCF
6a3545ee95 * fix bug #903. 2016-09-12 14:28:27 +08:00
chenfeiCF
463605f225 * fix bug #906. 2016-09-12 09:40:27 +08:00
wangyidong
68e3e64a14 * change for new version and upgrade. 2016-08-05 10:55:55 +08:00
wangyidong
a2044a1f71 * change error word. 2016-07-06 17:32:09 +08:00
wangyidong
234a3466a2 * fix bug for WooYun-2016-218351. 2016-06-28 13:36:00 +08:00
wwccss
76b16db409 * fix the comment error. 2016-06-12 09:21:12 +08:00
wangyidong
c33166261d * fix bug 841. 2016-06-08 11:36:52 +08:00
wangyidong
52882750dc * fix and adjust code. 2016-06-03 16:43:42 +08:00
wangyidong
1a68eb4249 * fix bug for merge rights. 2016-06-01 16:12:07 +08:00
chenfeiCF
05b9b0b9b4 * update select chosen when batch creating users. 2016-05-27 09:38:45 +08:00
chenfeiCF
267e8f3105 * update select chosen for group when creating a user. 2016-05-26 15:21:39 +08:00
wangyidong
760743962d * revert for login. 2016-05-25 08:28:47 +08:00
daitingting
2a6ec86f01 * Check key when integrate with ranzhi. 2016-05-24 10:21:01 +08:00
wangyidong
0841c29336 * adjust for import task. 2016-05-13 16:16:01 +08:00
chenfeiCF
a193e356ee * fix bug: input account into mail box automatically when edit user. 2016-05-12 14:46:00 +08:00
chenfeiCF
2a86cdcf28 * fix bug: Can't save user groups if change user account when edit user. 2016-05-12 14:24:15 +08:00
wangyidong
5d70ec7e35 adjust code. 2016-05-04 14:59:39 +08:00
wangyidong
9dd48a815e * adjust code. 2016-05-03 10:10:51 +08:00
chenfeiCF
efd4c1c14c * adjust code for batch create and edit mothod. 2016-05-02 11:51:21 +08:00
chenfeiCF
f9386dbfde * change hasFields into visibleFields. 2016-04-29 16:08:33 +08:00
chenfeiCF
38dbf6e28a * change name and adjust code format for custom fields. 2016-04-29 15:23:15 +08:00
wangyidong
ef016ae98a * change for md5 password. 2016-04-27 16:55:33 +08:00
wangyidong
93001c037c * add zh-tw lang and check en lang. 2016-04-27 09:59:23 +08:00
wangyidong
b69889c388 * adjust for user-create by tutorial-wizard. 2016-04-26 15:52:08 +08:00
wangyidong
7128018714 * change for encrypt password. 2016-04-26 15:00:55 +08:00
chenfeiCF
796121e476 * Set default join date if join field is empty when batch create users. 2016-04-26 13:34:06 +08:00
chenfeiCF
d9f12f6562 fix bug: fill 'admin' in last input tags automatically when batch edit users. 2016-04-19 17:05:53 +08:00
chenfeiCF
3e7ff8731d * remove manageContacts and deleteContacts method of user module. 2016-04-18 15:12:37 +08:00
wangyidong
37a64ea759 * custom for user batchcreate. 2016-04-14 16:32:45 +08:00
chenfeiCF
2529a6ba5c * code for task #2536: Set custom for batch edit method of user module. 2016-04-14 13:58:44 +08:00
wangyidong
88843220e9 * change for md5 password when login. 2016-04-08 10:32:39 +08:00