Commit Graph

591 Commits

Author SHA1 Message Date
滔哥
b4517c9945 * Fix bug 2017-12-14 11:17:15 +08:00
滔哥
4efc830f31 * Change tips. 2017-12-14 10:34:28 +08:00
滔哥
a259a31891 * Add tips for create user. 2017-12-14 10:32:29 +08:00
滔哥
2f966a1d9d * Task #3465 2017-12-13 21:29:58 +08:00
滔哥
f34e4c7ee3 * Task #3465 2017-12-13 19:30:29 +08:00
滔哥
7449b93402 * Task #3465 2017-12-13 19:17:29 +08:00
tengfei
b8f5165d57 report translation change 2017-12-12 14:42:36 +08:00
滔哥
f48be85a23 * Task #3459 2017-12-11 17:16:42 +08:00
滔哥
88bd2a9e91 * Task#3437 2017-12-07 16:37:45 +08:00
wangyidong
daf9075508 Merge branch 'master' of github.com:easysoft/zentaopms 2017-12-07 14:20:08 +08:00
wangyidong
fb48b45f0a * fix bug and code for batch edit user. 2017-12-07 14:19:35 +08:00
tengfei
522f28dd39 Merge branch 'master' of https://github.com/easysoft/zentaopms 2017-12-06 17:47:50 +08:00
tengfei
8314d813cb 12/6 trans error done 2017-12-06 17:47:31 +08:00
滔哥
6652b9221c * Task #3462 2017-12-05 23:23:10 +08:00
tengfei
5c8b72ddf0 translation error 12/5 2017-12-05 17:34:48 +08:00
tengfei
ee44254608 Merge branch 'master' of https://github.com/easysoft/zentaopms 2017-12-05 11:26:51 +08:00
tengfei
232d00dbcd translation minor error 2017-12-05 11:24:06 +08:00
wangyidong
91cc9135f1 * fix bug #1262. 2017-12-04 14:21:12 +08:00
tengfei
5a4f5057d6 “minor change 2017-11-27 17:08:29 +08:00
tengfei
d0cb562048 ok.txt->file 2017-11-20 19:08:56 +08:00
滔哥
e627415f6c * Fix bug 2017-11-09 13:39:41 +08:00
Xiying Guan
f1ba417162 * Format codes. 2017-11-08 13:28:26 +08:00
滔哥
7aa86734db * fix score module 2017-11-01 19:31:59 +08:00
滔哥
e3ea70b43a * change score module 2017-10-31 11:13:09 +08:00
滔哥
d9290cbf9b * + score in all model 2017-10-27 11:15:28 +08:00
滔哥
001057edb0 * + my score log 2017-10-26 17:26:09 +08:00
滔哥
984f3940c9 change .gitignore 2017-10-20 14:31:55 +08:00
wangyidong
06752d4cb3 * add new version and upgrade. 2017-09-26 13:45:32 +08:00
wangyidong
50460830e2 * adjust for limited user. 2017-09-26 11:08:11 +08:00
pengjiangxiu
a0779473fc * Finish task #3220. 2017-09-21 09:10:22 +08:00
pengjiangxiu
41a2fc9a8f * Finish task #3210. 2017-09-19 13:56:39 +08:00
wangyidong
b3369097a9 * fix for zentaobiz. 2017-09-11 10:06:41 +08:00
pengjiangxiu
5a138ea592 * Finish task #3206. 2017-09-08 15:44:44 +08:00
pengjiangxiu
a1570d6b75 * Finish task #3204. 2017-09-08 14:21:12 +08:00
wangyidong
de855054fc * login with json. 2017-09-07 16:59:25 +08:00
wangyidong
fa1c8e9d0e * fix bug. 2017-09-07 16:28:09 +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
a96bb17752 * * Adjust for bug batch activate. 2017-08-24 09:40:53 +08:00
wangyidong
094c960bf4 * finish task #3088. 2017-08-23 14:55:49 +08:00
pengjiangxiu
7f6274c07d * Finish task #1201. 2017-08-18 15:10:07 +08:00
wangyidong
b91e47c2e7 * finish task #3117. 2017-08-14 10:05:30 +08:00
pengjiangxiu
2d17fc78ec * Finish task #3169. 2017-08-11 14:36:47 +08:00
wangyidong
9b863fe982 * fix bugs. 2017-07-17 16:49:59 +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
Catouse
ee2370eb56 * prevent login page show in a iframe modal. 2017-05-19 16:27:20 +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