 王怡栋
|
2a03c9bfe3
|
Merge branch 'sprint/221_liumengyi_63455' into 'master'
* Finish task #63455.
See merge request easycorp/zentaopms!4797
|
2022-08-04 06:21:37 +00:00 |
|
|
liumengyi
|
02a3c130c0
|
* Fix bug for task #63455.
|
2022-08-04 13:37:17 +08:00 |
|
|
zenggang
|
9314b23885
|
* Fix bug#25998,26017
|
2022-08-04 02:48:29 +00:00 |
|
|
liumengyi
|
8900769999
|
* Finish task #63455.
|
2022-08-04 09:47:16 +08:00 |
|
|
tianshujie
|
737799378d
|
* Fix bug #24702.
|
2022-07-22 15:49:22 +08:00 |
|
|
tianshujie
|
f1998ad485
|
* Fix bug #24702.
|
2022-07-22 15:18:27 +08:00 |
|
|
tianshujie
|
29a889ddcf
|
* Fix bug #24702.
|
2022-07-22 12:03:23 +08:00 |
|
|
tianshujie
|
b8124e12f4
|
* Fix bug #25435.
|
2022-07-21 11:27:55 +08:00 |
|
|
tianshujie
|
e122aa3be7
|
* Fix bug #25435.
|
2022-07-21 11:11:21 +08:00 |
|
|
王怡栋
|
7e682c99c2
|
Merge branch 'sprint/xuanxuan_110' into 'master'
Sprint/xuanxuan 110
See merge request easycorp/zentaopms!4563
|
2022-07-15 03:17:39 +00:00 |
|
|
liumengyi
|
84c5bcd176
|
* Fix bug #24795.
|
2022-07-14 13:51:42 +08:00 |
|
|
王怡栋
|
e286a450fb
|
Merge branch 'sprint/215_liumengyi_24491' into 'master'
* Fix bug #24491.
See merge request easycorp/zentaopms!4504
|
2022-07-13 05:33:00 +00:00 |
|
|
liumengyi
|
cc31e0efa0
|
* Fix bug #24491.
|
2022-07-13 13:09:30 +08:00 |
|
|
liumengyi
|
424653ac7f
|
* Fix bug #24896.
|
2022-07-13 11:23:50 +08:00 |
|
|
leiyong
|
accd4feee5
|
* Adjust Modified Fields.
|
2022-07-13 02:57:28 +00:00 |
|
|
王怡栋
|
0ac2e857a4
|
Merge branch 'sprint214_leiyong_task_60384' into 'master'
Sprint214 leiyong task 60384
See merge request easycorp/zentaopms!4495
|
2022-07-13 02:25:36 +00:00 |
|
|
liumengyi
|
fab6829823
|
* Fix bug for task #60395.
|
2022-07-13 08:36:47 +08:00 |
|
|
leiyong
|
9ea1185649
|
* Finish task#60378.
|
2022-07-12 09:10:05 +00:00 |
|
|
chaideqing
|
3532e82841
|
* fix card show blank above header
|
2022-07-11 15:29:26 +08:00 |
|
|
liumengyi
|
b8642a3350
|
* Finish task #60395.
|
2022-07-11 14:49:36 +08:00 |
|
|
wangyidong
|
bb0fdc74c9
|
* code for bug #24927.
|
2022-07-08 17:35:06 +08:00 |
|
|
tianshujie
|
6792048cfc
|
* Fix bug #24802.
|
2022-07-08 11:08:40 +08:00 |
|
|
孙广明
|
c540e7002d
|
Merge branch 'sprint/211_tianshujie_58555' into 'master'
Sprint/211 tianshujie 58555
See merge request easycorp/zentaopms!4392
|
2022-07-07 02:51:51 +00:00 |
|
|
tianshujie
|
5ccd62ea84
|
* Merge insensitive refresh custom forms into one method.
|
2022-07-07 10:44:29 +08:00 |
|
|
王怡栋
|
5879801b8b
|
Merge branch 'sprint/211_liumengyi_59482' into 'master'
* Finish task #59482.
See merge request easycorp/zentaopms!4395
|
2022-07-07 01:49:35 +00:00 |
|
|
liumengyi
|
59bbb4577a
|
* Finish task #59482.
|
2022-07-07 09:44:33 +08:00 |
|
|
tianshujie
|
dc7e0ec546
|
* Put the functions that add and remove elements in my.full.js.
|
2022-07-06 16:37:10 +08:00 |
|
|
liumengyi
|
73fe07dd49
|
* Finish task #59482.
|
2022-07-06 16:18:44 +08:00 |
|
|
tianshujie
|
4aaaa2be85
|
* Finish task #59476.
|
2022-07-06 15:56:48 +08:00 |
|
|
tianshujie
|
2e74516127
|
* Finish task #59476.
|
2022-07-06 15:06:05 +08:00 |
|
|
王怡栋
|
f25fcc1eb2
|
Merge branch 'master' into 'sprint/211_tianshujie_58557'
# Conflicts:
# module/testcase/css/create.css
|
2022-07-06 06:47:25 +00:00 |
|
|
tianshujie
|
16a8bcf5f6
|
* Finish task #58557.
|
2022-07-06 14:40:42 +08:00 |
|
|
王怡栋
|
1653df17fd
|
Merge branch 'sprint/master_zhouxudong_24736' into 'master'
* Fix bug #24736 #24738 #24745 #24748 #24844 #24849.
See merge request easycorp/zentaopms!4375
|
2022-07-06 06:24:30 +00:00 |
|
|
zhouxudong
|
1e1ce39096
|
* Fix bug #24736 #24738 #24745 #24748 #24844 #24849.
|
2022-07-06 06:18:09 +00:00 |
|
|
王怡栋
|
bb859c6261
|
Merge branch 'sprint/211_liumengyi_fixbug' into 'master'
* Fix bug #24843.
See merge request easycorp/zentaopms!4373
|
2022-07-06 06:08:40 +00:00 |
|
|
孙广明
|
69ec58a361
|
Merge branch 'sprint_59471' into 'master'
Sprint 59471
See merge request easycorp/zentaopms!4370
|
2022-07-06 05:46:33 +00:00 |
|
|
liumengyi
|
ead37d6de6
|
* Fix bug #24843.
|
2022-07-06 13:43:51 +08:00 |
|
|
sunjun
|
654ae6fe91
|
sprint_59471
|
2022-07-06 04:23:38 +00:00 |
|
|
王怡栋
|
cea57edc73
|
Merge branch 'sprint/211_liumengyi_59477' into 'master'
* Fix bug of task #59477.
See merge request easycorp/zentaopms!4367
|
2022-07-06 02:17:51 +00:00 |
|
|
王怡栋
|
29bed0101b
|
Merge branch 'sprint/master_zhouxudong_59525' into 'master'
Sprint/master zhouxudong 59525
See merge request easycorp/zentaopms!4365
|
2022-07-06 02:17:24 +00:00 |
|
|
zhouxudong
|
bf19599c0e
|
* Finish task #59525.
|
2022-07-06 02:15:33 +00:00 |
|
|
liumengyi
|
625d04ff6f
|
* Fix bug of task #59477.
|
2022-07-06 09:51:14 +08:00 |
|
|
王怡栋
|
c7b10921f4
|
Merge branch 'sprint/211_liumengyi_59477' into 'master'
* Finish task #59477.
See merge request easycorp/zentaopms!4364
|
2022-07-06 01:50:59 +00:00 |
|
|
liumengyi
|
45183de128
|
* Add annotation.
|
2022-07-06 09:49:20 +08:00 |
|
|
zhouxudong
|
85f7dd9c95
|
* Finish task #59525.
|
2022-07-06 01:29:25 +00:00 |
|
|
liumengyi
|
500302a590
|
* Fix bug of task #59477.
|
2022-07-06 09:28:10 +08:00 |
|
|
liumengyi
|
4324454636
|
* Fix bug of task #59477.
|
2022-07-06 08:52:27 +08:00 |
|
|
tianshujie
|
577b42f32c
|
* Hide required fields in custom forms.
|
2022-07-06 08:41:20 +08:00 |
|
|
zhouxudong
|
ddecdf5cb8
|
* Finish task #59525.
|
2022-07-06 00:31:05 +00:00 |
|
|
tianshujie
|
cdaf164f0a
|
* Fix bug #24752,24747.
|
2022-07-06 08:26:27 +08:00 |
|