Commit Graph

466 Commits

Author SHA1 Message Date
Catouse
0dafbb66dd Merge branch 'master' of https://github.com/easysoft/zentaopms
Conflicts:
	www/js/my.full.js
2016-03-04 12:20:20 +08:00
Catouse
2fc659447f * add white space to button and link in login form. 2016-03-04 12:17:23 +08:00
wangyidong
59c99c29f3 * adjust code for bug #792. 2016-03-04 11:36:21 +08:00
wangyidong
d9e1606b2e * fix bug #792. 2016-03-04 11:33:54 +08:00
chenfeiCF
7f66f2018e * finish task #2501. 2016-03-01 02:09:18 +08:00
chenfeiCF
0269715534 * adjust code for task #2015. 2016-02-23 21:03:20 +08:00
chenfeiCF
8499ea4819 * finish task #2015. 2016-02-23 20:56:35 +08:00
wangyidong
a24f6cbeba * finish task #2466. 2016-02-18 17:18:20 +08:00
wangyidong
50b3d69bc9 * finish task #2462. 2016-02-16 14:56:08 +08:00
wangyidong
888c89fbe5 * change for upgrade. 2015-12-24 09:59:08 +08:00
wangyidong
7007f4b888 * finish task #2425. 2015-12-22 13:27:26 +08:00
wangyidong
b3f919b697 * fix bug for update user. 2015-12-03 15:49:31 +08:00
wangyidong
5933daa169 * change js parents to closest. 2015-12-01 11:03:29 +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
715050df57 * adjust for user. 2015-11-24 11:25:10 +08:00
wangyidong
2d61ca8d34 * change zh-tw. 2015-11-13 10:55:50 +08:00
wangyidong
086848c53e * code task #2404. 2015-11-12 10:40:02 +08:00
wangyidong
45fb1f0c92 * finish task #2380,2389,2390. 2015-11-11 11:07:59 +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
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
2b09f778dd * finish task #2325. 2015-10-14 17:06:23 +08:00
wangyidong
a99d4b866f * finish task #2362. 2015-10-14 16:59:02 +08:00
wangyidong
e4c40098c2 * finish task #2367. 2015-10-14 16:06:30 +08:00
wangyidong
9ec0520b34 * finish task #2371. 2015-10-14 11:11:52 +08:00
wangyidong
2495cae340 * fix bugs #746,747. 2015-10-08 15:52:49 +08:00
wangyidong
abf8b97904 * change for zh-tw. 2015-09-18 09:59:43 +08:00
wangyidong
dcc9d80a70 * adjust for password safe. 2015-09-18 09:38:15 +08:00
wangyidong
8110f8fcb2 * Sync to sendcloud when create,edit and delete user. 2015-09-17 16:23:51 +08:00
wangyidong
06a577884d * adjust for task 2301. 2015-09-17 13:55:44 +08:00
wangyidong
da2fa149f6 * finish task #2324. 2015-09-16 08:39:56 +08:00
wangyidong
911cd1d50a * fix bug #720. 2015-09-11 14:53:14 +08:00
wangyidong
33fc3798a0 * finish task #2300. 2015-09-01 13:36:54 +08:00
wangyidong
dfdde5d748 * code for task #2301. 2015-09-01 10:52:23 +08:00
wangyidong
5d799fba83 * adjust code for group view. 2015-08-06 14:33:15 +08:00
wangyidong
e0a643cd0b * change projectcommon to projectCommon,productcommon to productCommon. 2015-07-30 15:35:55 +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
0345e1a380 * adjust for task #2266. 2015-05-21 13:36:25 +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
0ca09de3d7 * change for zh-tw lang. 2015-05-18 13:55:40 +08:00