 王怡栋
|
7bc7fe0e54
|
Merge branch 'sprint/master_zhouxudong_60389' into 'master'
Sprint/master zhouxudong 60389
See merge request easycorp/zentaopms!4451
|
2022-07-11 07:56:48 +00:00 |
|
|
王怡栋
|
4c3d59333a
|
Merge branch 'sprint/215_liumengyi_60395' into 'master'
* Finish task #60395.
See merge request easycorp/zentaopms!4450
|
2022-07-11 07:56:19 +00:00 |
|
|
王怡栋
|
e3439cedae
|
Merge branch 'sprint/ZUI_guofeilong_add_icon_save' into 'master'
* Add ZentaoIcon Save
See merge request easycorp/zentaopms!4454
|
2022-07-11 07:54:51 +00:00 |
|
|
孙广明
|
4ad6e1d062
|
Merge branch 'sprint/216_mayue_task#60641' into 'master'
* Finish task #60641.
See merge request easycorp/zentaopms!4453
|
2022-07-11 07:28:47 +00:00 |
|
|
guofeilong
|
bf624cdc5d
|
* Add ZentaoIcon Save
|
2022-07-11 07:28:08 +00:00 |
|
|
mayue
|
ea0500a20c
|
* Finish task #60641.
|
2022-07-11 15:26:14 +08:00 |
|
|
wangyidong
|
5446bcf1f4
|
Merge branch 'sprint/212_hufangzhou_59535'
|
2022-07-11 15:10:47 +08:00 |
|
|
王怡栋
|
e9809af13a
|
Merge branch 'master' into 'sprint/212_hufangzhou_59535'
# Conflicts:
# www/js/my.full.js
|
2022-07-11 07:10:23 +00:00 |
|
|
hufangzhou
|
3f2b98e71c
|
* Move the functions to my.full.js file.
|
2022-07-11 15:03:40 +08:00 |
|
|
hufangzhou
|
21dbff52ca
|
* Rename method names.
|
2022-07-11 14:57:43 +08:00 |
|
|
zhouxudong
|
d2fe52d3b2
|
* Finish task #60394 #60392 #60389.
|
2022-07-11 06:55:36 +00:00 |
|
|
liumengyi
|
38a91dba02
|
* Optimize code for task#60395.
|
2022-07-11 14:52:26 +08:00 |
|
|
liumengyi
|
b8642a3350
|
* Finish task #60395.
|
2022-07-11 14:49:36 +08:00 |
|
|
hufangzhou
|
2993ba53f8
|
* Finish task #59535.
|
2022-07-11 14:41:09 +08:00 |
|
|
李玉春
|
a5b2c8de20
|
Merge branch 'sprint/wangzemei/25041' into 'master'
* Fix bug #25041
See merge request easycorp/zentaopms!4448
|
2022-07-11 06:11:53 +00:00 |
|
|
wangzemei
|
7bb8a64638
|
* Fix bug #25041
|
2022-07-11 06:04:07 +00:00 |
|
|
zhouxudong
|
b5475f51b2
|
* Finish task #60394 #60392 #60389.
|
2022-07-11 03:28:17 +00:00 |
|
|
王怡栋
|
00b073ba18
|
Merge branch 'sprint/tianshujie_fixbug' into 'master'
Sprint/tianshujie fixbug
See merge request easycorp/zentaopms!4447
|
2022-07-11 02:36:02 +00:00 |
|
|
wangyidong
|
35c8543a74
|
* adjust for check account in set vision.
|
2022-07-11 10:08:40 +08:00 |
|
|
王怡栋
|
43cc464b54
|
Merge branch 'sprint/213_mayue_bug25031' into 'master'
* Fix bug #25031.
See merge request easycorp/zentaopms!4446
|
2022-07-11 02:08:13 +00:00 |
|
|
mayue
|
88a580898d
|
* Optimize code.
|
2022-07-11 10:06:43 +08:00 |
|
|
mayue
|
5bedd02491
|
* Fix bug #25031.
|
2022-07-11 09:54:58 +08:00 |
|
|
tianshujie
|
07a1f0bf6a
|
* Fix bug #24981.
|
2022-07-11 09:16:44 +08:00 |
|
|
tianshujie
|
8e5ac76ae7
|
* Fix bug #24923.
|
2022-07-11 08:49:00 +08:00 |
|
|
wangyidong
|
43c9570c98
|
Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms
|
2022-07-08 17:36:59 +08:00 |
|
|
wangyidong
|
bb0fdc74c9
|
* code for bug #24927.
|
2022-07-08 17:35:06 +08:00 |
|
|
刘刚
|
f37e8309a3
|
Merge branch 'sprint/zentaobiz10' into 'master'
* Finish task #59641.
See merge request easycorp/zentaopms!4444
|
2022-07-08 09:34:43 +00:00 |
|
|
liuruogu
|
3f7f25dd8a
|
* Finish task #59641.
|
2022-07-08 09:20:14 +00:00 |
|
|
王怡栋
|
96ad1bfff8
|
Merge branch 'sprint/master_lanzongjun_fixbug' into 'master'
* fix bug #25016
See merge request easycorp/zentaopms!4440
|
2022-07-08 07:22:37 +00:00 |
|
|
王怡栋
|
fb8bd88891
|
Merge branch 'sprint/tianshujie_24913' into 'master'
* Fix bug #24913.
See merge request easycorp/zentaopms!4441
|
2022-07-08 07:21:44 +00:00 |
|
|
tianshujie
|
fe226c094b
|
* Fix bug #24913.
|
2022-07-08 15:17:02 +08:00 |
|
|
孙广明
|
0264b6c3f9
|
Merge branch 'sprint/scx_translate' into 'master'
Sprint/scx translate
See merge request easycorp/zentaopms!4429
|
2022-07-08 07:11:20 +00:00 |
|
|
孙广明
|
3fc4834248
|
Merge branch 'liyuchun_24840' into 'master'
* Fix bug when download code zip.
See merge request easycorp/zentaopms!4439
|
2022-07-08 07:11:01 +00:00 |
|
|
孙广明
|
77ec1c0bac
|
Merge branch 'master_xieqiyu_kanban' into 'master'
* Code for task#59543.
See merge request easycorp/zentaopms!4433
|
2022-07-08 07:10:47 +00:00 |
|
|
lanzongjun
|
5c95d9fd18
|
* fix bug #25016
|
2022-07-08 14:52:46 +08:00 |
|
|
wangyidong
|
9c61acba52
|
* fix bug for misc-captcha.
|
2022-07-08 14:46:25 +08:00 |
|
|
liyuchun
|
69871d4c69
|
* Fix bug when download code zip.
|
2022-07-08 06:35:36 +00:00 |
|
|
王怡栋
|
8fb0a728cd
|
Merge branch 'sprint/master_zhouxudong_24844' into 'master'
* Fix bug #24844.
See merge request easycorp/zentaopms!4438
|
2022-07-08 06:29:01 +00:00 |
|
|
李玉春
|
be3823aa09
|
Merge branch 'cyy_25032' into 'master'
* Fix bug #25032.
See merge request easycorp/zentaopms!4436
|
2022-07-08 06:23:43 +00:00 |
|
|
李玉春
|
30401195fa
|
Merge branch 'sprint/wangzemei/59544_1' into 'master'
Sprint/wangzemei/59544 1
See merge request easycorp/zentaopms!4437
|
2022-07-08 05:57:16 +00:00 |
|
|
孙广明
|
b2634d5e85
|
Merge branch 'sprint/211_liumengyi_fixbug' into 'master'
* Fix bug #23123.
See merge request easycorp/zentaopms!4434
|
2022-07-08 05:57:06 +00:00 |
|
|
liumengyi
|
29993afa9e
|
* Optimize code for bug #23123.
|
2022-07-08 13:55:41 +08:00 |
|
|
liumengyi
|
f9b24fb48c
|
* Fix bug of task #23123.
|
2022-07-08 13:52:33 +08:00 |
|
|
zhouxudong
|
f7b8ef064f
|
* Fix bug #24844.
|
2022-07-08 05:51:40 +00:00 |
|
|
caoyanyi
|
8267cfaa94
|
* Fix bug #25032.
|
2022-07-08 13:50:23 +08:00 |
|
|
wangzemei
|
cc1f3ca95b
|
Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms into sprint/wangzemei/59544_1
|
2022-07-08 05:50:14 +00:00 |
|
|
朱金勇
|
1a9fd62e71
|
Merge branch 'sprint/tianshujie_25034' into 'master'
* Fix bug #25034.
See merge request easycorp/zentaopms!4435
|
2022-07-08 05:49:32 +00:00 |
|
|
liumengyi
|
9921474711
|
* Fix bug #23123.
|
2022-07-08 13:43:43 +08:00 |
|
|
tianshujie
|
b09a5907ec
|
* Fix bug #25034.
|
2022-07-08 13:43:23 +08:00 |
|
|
liumengyi
|
26b430660a
|
* Fix bug #23123.
|
2022-07-08 13:29:56 +08:00 |
|