Commit Graph

1262 Commits

Author SHA1 Message Date
王怡栋
c16478c5d0 * fix for upgrade from lower version. 2021-12-03 15:47:39 +08:00
孙广明
c42cca1249 Merge branch 'sprint/168' 2021-11-30 14:38:32 +08:00
孙广明
801c9ce3d0 Merge branch 'sprint/169' into sprint/168 2021-11-30 13:47:05 +08:00
王怡栋
8fc78ccd45 * adjust for api. 2021-11-29 13:06:47 +08:00
liumengyi
5dbd0ad4b9 * Fix bug #16869. 2021-11-29 10:28:52 +08:00
liumengyi
b6acb88c21 * Fix bug #16869. 2021-11-29 09:55:00 +08:00
liumengyi
c72bdbbdfb * Finish task #45158. 2021-11-26 10:50:16 +08:00
liumengyi
a9b865aa9f * Finish task #45158. 2021-11-26 10:47:53 +08:00
王怡栋
9a80f35962 Merge branch 'sprint/app10' 2021-11-25 10:25:05 +08:00
王怡栋
57c6ae78a8 * adjust for search. 2021-11-24 14:24:35 +08:00
孙广明
2dc2c46737 * Fix bug #16703. 2021-11-24 10:55:42 +08:00
hufangzhou
6d03387d4b * Add the new version. 2021-11-22 16:48:28 +08:00
liyuchun
412fbb2305 * Finish task #44370. 2021-11-16 16:25:00 +08:00
王怡栋
77b0b5d61e * code for task #44305. 2021-11-16 09:31:10 +08:00
王怡栋
3cdf3b3395 Merge branch 'sprint/167_wangyidong_api' into sprint/app10 2021-11-01 15:35:49 +08:00
王怡栋
076f328914 * add lang for zentaoapp and adjust api. 2021-10-27 19:58:50 +08:00
zhouxin
b28abf1c4c Finish task#43538. 2021-10-26 13:02:12 +08:00
王怡栋
784f729a81 * code for task #43338. 2021-10-21 15:10:40 +08:00
xieqiyu
3e8e0dbcce * Fix bug#15457. 2021-10-16 15:32:13 +08:00
王怡栋
a44472fb45 Merge branch '15.6' into sprint/167 2021-10-14 15:48:14 +08:00
hufangzhou
3363c1adbf * Code for bug #15518. 2021-10-14 14:28:49 +08:00
hufangzhou
52e49919d2 * Code for bug #15518. 2021-10-14 13:51:59 +08:00
liyuchun
cfdce3652f * Finish task #43187. 2021-10-14 13:51:47 +08:00
hufangzhou
bf78fe9be4 * Add the 15.6 version and upgrade. 2021-10-12 09:35:39 +08:00
王怡栋
96a8ef6b04 Merge branch '15.5' into 165 2021-10-09 10:06:05 +08:00
朱金勇
fa879ae303 Merge branch 'sprint/165_tianshujie_42854' into 'sprint/165'
* Finish task #42854.

See merge request easycorp/zentaopms!39
2021-09-28 07:35:23 +00:00
tianshujie
4f977efaeb * Finish task #42854. 2021-09-28 13:14:32 +08:00
王怡栋
f30eb20fbd * code for task #42835. 2021-09-27 14:50:09 +08:00
zenggang
1a0effc1e6 * Fix bug15211,14525 2021-09-17 09:51:23 +08:00
zenggang
ee07a042a4 * Fix bug#15211,14525 2021-09-16 17:31:40 +08:00
Hao Sun
bc312bfe2d * improve UI for cropavatar dialog and fix conflict with autosize feature of ModalTrigger. 2021-09-15 19:23:32 +08:00
hufangzhou
2d636f7ab9 * Fix the upload avatar. 2021-09-15 18:12:05 +08:00
dingna
8fc5296ee3 * Fix bug #15161. 2021-09-14 16:05:32 +08:00
王怡栋
6cb052396f * finish task #42429. 2021-09-08 13:25:37 +08:00
王怡栋
4eee4d5523 Merge branch '15.4' 2021-09-02 19:21:30 +08:00
王怡栋
6230063da0 * Add autocomplete attr for input. 2021-08-31 15:59:27 +08:00
liyuchun
46f2dc73c3 * Finish task #41764. 2021-08-30 13:00:53 +08:00
王怡栋
c6922215ae * fix bug for edit build and compute userview. 2021-08-27 14:42:14 +08:00
Hao Sun
09f4a426d4 * task #41783, #task 41765, improve UI for tutorial mode. 2021-08-26 10:05:35 +08:00
holan20180123
9cdb127be6 * Finish task #41712. 2021-08-25 10:50:21 +08:00
王怡栋
11f7edc064 * finish task #41753. 2021-08-25 09:55:44 +08:00
王怡栋
75f004f38a * add new version and upgrade. 2021-08-23 10:24:12 +08:00
王怡栋
808932285c Merge branch '15.2' 2021-08-23 10:02:31 +08:00
王怡栋
4c841a2f23 * finish task #41529. 2021-08-20 13:58:50 +08:00
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