Commit Graph

97 Commits

Author SHA1 Message Date
孙广明
b896377846 * Change zentao license. 2022-06-08 10:02:29 +08:00
孙广明
b528156589 * Change license. 2022-06-08 09:34:46 +08:00
zhouxudong
925aa3f8d8 * Finish task #54480. 2022-05-17 08:12:27 +00:00
zhouxudong
c097334f3b * Finish task #54480. 2022-05-17 07:58:26 +00:00
zhouxudong
cca3f56437 * Finish task #54480. 2022-05-17 07:38:22 +00:00
Wenrui LI
e920e855eb * add hidden vision input if vision is not shown. 2022-03-22 10:51:40 +08:00
Wenrui LI
450f2d7d89 * remove user vision field if there is no other vision available, task #51318, bug #20691. 2022-03-21 17:06:12 +08:00
孙广明
97859c945b Merge branch 'master' into 'sprint/master_tanghucheng_fixbug'
# Conflicts:
#   module/user/js/batchcreate.js
#   module/user/view/batchcreate.html.php
2022-03-10 08:07:31 +00:00
tanghucheng
31588aacc7 * Adjust for batchcreate user. 2022-03-10 15:23:40 +08:00
tanghucheng
76fd14c845 * Adjust for create user. 2022-03-10 12:09:33 +08:00
王怡栋
f5d4dfc9ad * code for task #49356. 2022-03-09 10:53:08 +08:00
王怡栋
98c6d7b2b1 * code for task #48840. 2022-02-15 09:42:47 +08:00
dingna
8fc5296ee3 * Fix bug #15161. 2021-09-14 16:05:32 +08:00
Hao Sun
09f4a426d4 * task #41783, #task 41765, improve UI for tutorial mode. 2021-08-26 10:05:35 +08:00
holan20180123
1e7beb09af * Finish task #36018. 2021-02-19 15:23:32 +08:00
wangyidong
e10897a838 * fix bug. 2020-12-01 09:03:32 +08:00
tianshujie98
66c636d771 * Fix bug #3464. 2020-09-10 15:59:00 +08:00
tianshujie98
d27efffa6d * Fix bug #3464. 2020-09-09 09:10:17 +08:00
jinianlan
c90aac3512 * finish task #6166,#6149,6139 2019-07-29 15:54:08 +08:00
wangyidong
2671f7a044 * finish task #6090. 2019-07-15 15:56:31 +08:00
chenfei
fe6d7b1f1e * Adjust code. 2019-03-25 11:18:54 +08:00
chenfei
b66c5ec7fa * Finish task #5330. 2019-03-19 17:23:35 +08:00
Yagami
6efbe82455 * Finish task #5309. 2019-02-20 15:53:47 +08:00
yfl
d72a662553 Finish task #5021,#5018,#5017,#5016,#5015,#5005,#5003,#4987,#4985,#4653 2018-10-12 09:25:39 +08:00
wangyidong
e0950c3e8b * finish task #4940. 2018-09-26 15:11:54 +08:00
滔哥
3cb02d06ce * Fix task#4845. 2018-09-20 07:55:40 +08:00
wangyidong
1148ff0f7c * finish task #4892. 2018-09-19 16:00:38 +08:00
daitingting
e851690722 * Adjust space between btn. 2018-05-25 10:59:29 +08:00
Catouse
e522af53b4 * remove btn-gray. 2018-05-15 15:33:33 +08:00
wangyidong
56489075b0 Merge branch 'zentaopms_9.8' 2018-05-07 16:48:59 +08:00
liugang
48d7755bbf * Refact browse page of dept. 2018-04-20 15:24:55 +08:00
liugang
fa16df8314 * Refact create page and edit page of group. 2018-04-19 16:46:06 +08:00
liugang
c82676dfb4 * Refact pages. 2018-04-18 14:43:38 +08:00
JackWuLieHao
960ec7c84c * Finish task #3797 2018-03-29 15:39:14 +08:00
JackWuLieHao
77ed3e4dec *Add the user add, edit, and view the details of the page without the
*date of hire display
2018-03-29 13:42:12 +08:00
dajiao007
87807110d5 modify tranlate and adjust column width 2018-01-11 16:46:08 +08:00
滔哥
dc8ee0995e * Fix bug. 2017-12-26 16:30:17 +08:00
滔哥
88bd2a9e91 * Task#3437 2017-12-07 16:37:45 +08:00
wangyidong
50460830e2 * adjust for limited user. 2017-09-26 11:08:11 +08:00
pengjiangxiu
41a2fc9a8f * Finish task #3210. 2017-09-19 13:56:39 +08:00
pengjiangxiu
a1570d6b75 * Finish task #3204. 2017-09-08 14:21:12 +08:00
chenfeiCF
61db347702 * finish task #2880. 2017-01-10 14:13:31 +08:00
wangyidong
256383e5e3 * finish task #2575. 2016-03-25 13:32:45 +08:00
wangyidong
7acbf8c7bd * disabled for ie8/9 placeholder. 2015-11-27 14:06:59 +08:00
wangyidong
015401d1e0 * change zpl 1.1 to 1.2. 2015-11-05 14:09:52 +08:00
wangyidong
dcc9d80a70 * adjust for password safe. 2015-09-18 09:38:15 +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
ff8ac1f30f * finish task #2246.
* code task #2252.
2015-05-12 11:14:46 +08:00