Commit Graph
1217 Commits
Author SHA1 Message Date
dingguodong 2c0f0414ac + Add function getUserDetailsForAPI to user module. 2021-08-19 09:47:01 +08:00
reneeteng 8dc96ee49b Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms 2021-08-18 15:42:22 +08:00
reneeteng e8b3aee5d8 * Optimize translation. 2021-08-17 10:36:55 +08:00
reneeteng 354b119a2c Merge branch 'master' of https://github.com/easysoft/zentaopms 2021-08-17 10:03:12 +08:00
holan20180123 836a0bacd6 * Finish task #41437. 2021-08-16 10:30:10 +08:00
hufangzhou 9281d2342c * Fix bug #14254. 2021-08-13 08:28:00 +08:00
王怡栋 9e7e2d83b4 * reset session for user avatar. 2021-08-12 10:45:23 +08:00
holan20180123 c373fb2ade * Fix load avatar error. 2021-08-11 16:59:59 +08:00
reneeteng e47b403c7b Merge branch 'master' of https://github.com/easysoft/zentaopms 2021-08-11 14:38:08 +08:00
王怡栋 746cb1f8c2 Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms 2021-08-10 14:06:49 +08:00
王怡栋 d0632b8ff3 * adjust show action. 2021-08-10 14:06:35 +08:00
hufangzhou 96dc983fb6 * Finish task #41232. 2021-08-10 13:34:28 +08:00
hufangzhou 752d33949a * Fix an error. 2021-08-04 08:11:46 +08:00
wangyidong d6e08c274e * adjust priv. 2021-08-03 15:33:32 +08:00
wangyidong bbe793a8aa Merge branch '15.2' 2021-08-02 16:31:42 +08:00
wangyidong 8d37af5669 * code for task #40451. 2021-07-28 17:49:03 +08:00
Yagami 683792d62f * Fix priv bug. 2021-07-28 16:24:41 +08:00
Yagami 04b4c24534 * Fix priv bug. 2021-07-28 15:58:46 +08:00
reneeteng 495caf1c77 Merge branch 'master' of https://github.com/easysoft/zentaopms 2021-07-23 13:57:53 +08:00
qiyu-xie 599e51660b * Finish task#40489. 2021-07-22 13:39:59 +08:00
reneeteng d47b6a087a Merge branch 'master' of https://github.com/easysoft/zentaopms 2021-07-20 10:31:51 +08:00
wangyidong 54ff43eb6f * add changelog and zh-tw lang. 2021-07-20 09:58:58 +08:00
zhujinyong 37f44fbbca + Add user and bug api. 2021-07-19 11:58:25 +08:00
zhujinyong 1677574443 * return before $this->send. 2021-07-16 09:40:41 +08:00
Yagami f401a0ac06 * Code for task #40118. 2021-07-14 15:55:03 +08:00
reneeteng 0833fd6497 * Update user lang file. 2021-07-14 13:48:32 +08:00
zenggang 86a0e7d8bf finish task #40123 2021-07-14 09:32:48 +08:00
Yagami 9d2a4f70d9 * Finish task #40129. 2021-07-13 16:04:28 +08:00
Yagami 58b3372e4d * Fix user-deny lang. 2021-07-13 13:05:08 +08:00
wangyidong fa4fa5941e Merge branch '15.0' 2021-07-06 19:28:30 +08:00
wangyidong 3f0aeaf173 * finish task #39793. 2021-07-06 13:34:44 +08:00
wangyidong 5016d4751d * finish task #39796. 2021-07-02 11:26:13 +08:00
wangyidong c287a0cb49 * adjust code. 2021-07-01 16:56:59 +08:00
holan20180123 84b1280ab0 * Adjust save user acl. 2021-06-29 16:05:16 +08:00
wangyidong cefd614900 * fix bug and adjust for createLink params. 2021-06-29 14:31:58 +08:00
wangyidong 1af22a4ae1 * finish task #38717. 2021-06-21 16:09:21 +08:00
hufangzhou 23206c4ea8 * Finish task #39453. 2021-06-17 17:43:56 +08:00
hufangzhou e4023e6b99 * Adjust the code. 2021-06-09 11:47:22 +08:00
wangyidong 387b09e25c Merge branch '15.0.beta3' 2021-06-06 09:27:45 +08:00
wangyidong 769e6b433b * merge from 15.0.beta3. 2021-06-05 13:01:53 +08:00
holan20180123 f36338d4e0 * Fix error. 2021-05-13 14:30:10 +08:00
holan20180123 51af4491d9 * Return id when create object by API. 2021-05-12 17:33:59 +08:00
wangyidong 5f8cecdfa9 * fix bug. 2021-04-30 16:01:28 +08:00
wangyidong 3785a39325 * adjust for zh-tw lang. 2021-04-30 14:14:43 +08:00
Guanxiying 962685950e * Add field param to comments of getById function. 2021-04-28 11:41:02 +08:00
Guanxiying 3264f6146f * Fix comments of getById function. 2021-04-27 19:17:15 +08:00
holan20180123 dc659c6c16 * Fix bug #12194. 2021-04-26 13:03:27 +08:00
holan20180123 9d5d20170f * Fix menu error. 2021-04-25 09:27:21 +08:00
qiyu-xie 1495580ca8 * Fix bug. 2021-04-19 14:20:19 +08:00
qiyu-xie 762b1c2e69 * Fix bug. 2021-04-19 14:18:03 +08:00