Commit Graph

244 Commits

Author SHA1 Message Date
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
chenfeiCF
08ce64e737 * finish task #2701. 2016-11-18 15:26:31 +08:00
chenfeiCF
a193e356ee * fix bug: input account into mail box automatically when edit user. 2016-05-12 14:46:00 +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
7128018714 * change for encrypt password. 2016-04-26 15:00:55 +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
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
chenfeiCF
8cd6978375 * finish task #2567. 2016-03-29 10:34:34 +08:00
wangyidong
256383e5e3 * finish task #2575. 2016-03-25 13:32:45 +08:00
wangyidong
7f2c61c891 * change for browse notice. 2016-03-15 09:56:33 +08:00
Catouse
2fc659447f * add white space to button and link in login form. 2016-03-04 12:17:23 +08:00
wangyidong
a24f6cbeba * finish task #2466. 2016-02-18 17:18:20 +08:00
wangyidong
7007f4b888 * finish task #2425. 2015-12-22 13:27:26 +08:00
wangyidong
7acbf8c7bd * disabled for ie8/9 placeholder. 2015-11-27 14:06:59 +08:00
Catouse
119f3bfb20 * fix placeholder for ie. 2015-11-27 13:30:02 +08:00
wangyidong
13c881ccda * fix bug #770. 2015-11-26 16:17:42 +08:00
wangyidong
6670b94caf * adjust for user getById. 2015-11-26 09:20:53 +08:00
wangyidong
086848c53e * code task #2404. 2015-11-12 10:40:02 +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
3e77dd3145 * code for safe in framework. 2015-11-05 09:51:42 +08:00
wangyidong
2a39736fd7 * adjust code. 2015-11-04 12:16:40 +08:00
wangyidong
dcc9d80a70 * adjust for password safe. 2015-09-18 09:38:15 +08:00
wangyidong
06a577884d * adjust for task 2301. 2015-09-17 13:55:44 +08:00
wangyidong
e6c4f6a953 * fix bug #719. 2015-07-29 13:55:23 +08:00
wangyidong
fc67542419 * fix a bug #712. 2015-07-03 11:39:11 +08:00
wangyidong
d27612e031 * change for verify password. 2015-05-20 14:30:41 +08:00
wangyidong
061815355a * adjust for check password. 2015-05-20 13:45:54 +08:00
wangyidong
0cfdc19e15 * adjust for check password. 2015-05-20 13:13:42 +08:00
wangyidong
cd5c9ed06e * change group priv and fix bug. 2015-05-18 15:13:09 +08:00
wangyidong
d00f899b21 * finish task #2252. 2015-05-12 11:15:33 +08:00
wangyidong
ff8ac1f30f * finish task #2246.
* code task #2252.
2015-05-12 11:14:46 +08:00
wangyidong
0dd2d53f40 * change for task #2190. 2015-01-28 15:14:02 +08:00
Catouse
c58c386c59 * fix duplicate references of chosen. 2014-12-09 17:12:30 +08:00
Catouse
d330a140c1 * apply status colors. 2014-11-26 10:04:41 +08:00
ChuJilu
dea557a429 * finish pro task #2957. 2014-11-21 10:21:32 +08:00
Catouse
d5f73e47cc - removed unused javascript plugs: alert, autocomplete, colorbox, colorize, dropmenu, jquerytools, bgiframe, incsearch, sorttable, sparkline. 2014-08-19 15:47:18 +08:00
Catouse
360fb70575 * ajusted style of some alerts. 2014-08-19 14:29:17 +08:00
Catouse
d658a6fa23 * ajusted views. 2014-08-19 10:48:50 +08:00
wangyidong
95d547bce1 * finish task #1956. 2014-07-28 07:14:24 +00:00
wangyidong
e1d1c354fb * finish task #1971,1961. 2014-07-23 09:36:03 +00:00
wangyidong
c79840dfa9 * code task #1971,1961. 2014-07-23 01:55:32 +00:00