Commit Graph

210 Commits

Author SHA1 Message Date
z
b42d47e257 Merge branch '12.x' 2020-11-23 20:42:59 +08:00
z
3e902392ac * search with account. 2020-11-20 13:09:02 +08:00
qiyu-xie
3d85fc9346 * Finish task#8423. 2020-11-17 16:58:46 +08:00
guanxiying
7f1029c349 * Add usermodel::login function 2020-11-02 16:31:10 +08:00
Yagami
2fe5ec9993 * Program/project edit page change acl. 2020-10-19 13:56:46 +08:00
holan20180123
1aca528db1 * Finish task #7917. 2020-09-17 16:20:04 +08:00
holan20180123
0a438c628d * Finish task #7917. 2020-09-17 16:16:25 +08:00
holan20180123
e590c140b3 * Finish task #7917. 2020-09-17 15:58:09 +08:00
holan20180123
1062033526 * Finish Task #7711. 2020-08-27 13:42:16 +08:00
Yagami
b72a7dee43 Merge branch 'master' into 20.x 2020-08-26 16:10:36 +08:00
z
4acf8e3990 * finish task #7603,7603. 2020-08-07 15:14:20 +08:00
tianshujie98
a99aab00ea *Finish task #7587. 2020-08-05 17:04:47 +08:00
z
a748df7c3c * code for task #7600. 2020-08-04 14:05:41 +08:00
z
d8ce393afa * finish task #7264. 2020-06-17 10:48:37 +08:00
z
5eca2a6ca7 * adjust for change locate page when login. 2020-06-16 10:45:19 +08:00
sgm0422
5c5ef4eb0c * Fix acl and rights. 2020-06-12 16:41:40 +08:00
wangyidong
2a0b9d3f43 * finish task #7066. 2020-05-09 08:23:34 +08:00
leiyong
c551170d6b * finish task#7112,#7113,#7111. 2020-04-29 02:02:51 -07:00
guanxiying
bad6bbd39c * Add httpOnly param when setcooki. 2019-11-21 14:20:11 +08:00
Yagami
24ca9fbc01 * Finish task #6542. 2019-11-20 10:00:56 +08:00
Yagami
1038f2a069 * Fix delete template bug. 2019-10-14 09:04:52 +08:00
wangyidong
da2a9751dc * finish task #6447. 2019-10-12 10:28:02 +08:00
wangyidong
7bdb12995a * finish task #6185. 2019-08-07 14:15:13 +08:00
wangyidong
1fbf720cae * adjust for task #5783 2019-06-05 16:16:21 +08:00
wangyidong
539f5077eb * finish task #5611. 2019-05-28 13:41:20 +08:00
wangyidong
75ebcb18dc * code for task #5387. 2019-04-25 09:10:42 +08:00
wangyidong
3e7caa0da1 * finish task #5271. 2019-02-25 08:43:53 +08:00
wangyidong
235b242290 * finish task #5203. 2019-01-22 14:29:05 +08:00
chenfeiCF
cae5cb78c5 * Finish task #5118, #5122, #5125. 2018-11-13 17:23:51 +08:00
wangyidong
6c64a21900 * adjust code. 2018-09-26 10:45:35 +08:00
wangyidong
a4e7756fd5 * finish task #4851. 2018-09-20 17:34:53 +08:00
wangyidong
1148ff0f7c * finish task #4892. 2018-09-19 16:00:38 +08:00
wangyidong
bd7e6c0d0f * finish task #4705. 2018-09-12 16:01:05 +08:00
wangyidong
800a77fff6 * finish task #4764. 2018-09-10 15:23:59 +08:00
wangyidong
e69e353e99 * finish task #4823. 2018-09-04 16:00:04 +08:00
wangyidong
a5c4e0cb5f * fix bug for login and edit. 2018-08-23 16:17:12 +08:00
wangyidong
02a5b86697 * adjust for ux. 2018-06-22 16:20:37 +08:00
滔哥
2d1a67516c * Finish task#4356. 2018-06-01 14:41:00 +08:00
chenfeiCF
decff416f9 * Adjust some view file of user module. 2018-05-07 19:06:52 +08:00
liugang
b0472a7bad * Refact browse page of company. 2018-04-19 14:24:56 +08:00
wangyidong
51ce938acc * adjust code and fix bug. 2018-02-08 08:25:02 +08:00
wangyidong
b387a55a3d * finish task #3572. 2018-01-15 09:38:46 +08:00
wangyidong
60ebe9fa2e * fix for upgrade. 2017-12-22 09:05:34 +08:00
wangyidong
a42b0008c9 * adjust for demo. 2017-12-20 16:46:42 +08:00
滔哥
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
滔哥
6652b9221c * Task #3462 2017-12-05 23:23:10 +08:00
Xiying Guan
f1ba417162 * Format codes. 2017-11-08 13:28:26 +08:00
滔哥
e3ea70b43a * change score module 2017-10-31 11:13:09 +08:00