 王怡栋
|
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 |
|
|
guofeilong
|
dafb0452d3
|
* Fix bug #23351
|
2022-07-14 05:50:28 +00:00 |
|
|
guofeilong
|
618d44374a
|
Fix bug #23351 in bug and task batchcreate
|
2022-07-14 05:37:00 +00:00 |
|
|
chaideqing
|
69f20c1205
|
* replace xhtml to html when click card
|
2022-07-13 10:54:12 +08:00 |
|
|
wangyidong
|
bb0fdc74c9
|
* code for bug #24927.
|
2022-07-08 17:35:06 +08:00 |
|
|
tianshujie
|
3213065954
|
* Fix bug #24802.
|
2022-07-08 13:05:07 +08:00 |
|
|
tianshujie
|
be1ca95624
|
* Fix bug #24977.
|
2022-07-08 08:15:42 +08:00 |
|
|
tianshujie
|
5ccd62ea84
|
* Merge insensitive refresh custom forms into one method.
|
2022-07-07 10:44:29 +08:00 |
|
|
tianshujie
|
dc7e0ec546
|
* Put the functions that add and remove elements in my.full.js.
|
2022-07-06 16:37:10 +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 |
|
|
zhouxudong
|
1e1ce39096
|
* Fix bug #24736 #24738 #24745 #24748 #24844 #24849.
|
2022-07-06 06:18:09 +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 |
|
|
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 |
|
|
王怡栋
|
bc00e9f66c
|
Merge branch 'sprint/211_tianshujie_59475' into 'master'
Sprint/211 tianshujie 59475
See merge request easycorp/zentaopms!4353
|
2022-07-05 08:30:47 +00:00 |
|
|
tianshujie
|
987421cc77
|
* Finish task #59475.
|
2022-07-05 15:44:09 +08:00 |
|
|
王怡栋
|
1ab6ed7a95
|
Merge branch 'sprint/master_zhouxudong_59522' into 'master'
* Finish task #59518 #59522.
See merge request easycorp/zentaopms!4350
|
2022-07-05 07:36:15 +00:00 |
|
|
zhouxudong
|
b9ee65ddfd
|
* Fix bug #24751.
|
2022-07-05 06:54:04 +00:00 |
|
|
tianshujie
|
4c4e67f7e8
|
* Finish task #59475.
|
2022-07-05 14:08:00 +08:00 |
|
|
zhouxudong
|
60ddcc7894
|
* Finish task #59518 #59522.
|
2022-07-05 05:49:04 +00:00 |
|
|
王怡栋
|
a6916a73c5
|
Merge branch 'sprint/master_zhouxudong_59527' into 'master'
Sprint/master zhouxudong 59527
See merge request easycorp/zentaopms!4326
|
2022-07-05 02:07:26 +00:00 |
|
|
zhouxudong
|
6003adcd19
|
* Finish task #59527.
|
2022-07-05 00:43:34 +00:00 |
|
|
zhouxudong
|
1c00265c79
|
* Finish task #59527 #59572.
|
2022-07-04 07:21:39 +00:00 |
|
|
王怡栋
|
04b2a5994f
|
Merge branch 'sprint/208_tianshujie_58554' into 'master'
Sprint/208 tianshujie 58554
See merge request easycorp/zentaopms!4317
|
2022-07-04 06:59:21 +00:00 |
|
|
tianshujie
|
31ea99dae1
|
* Finish task #58556.
|
2022-07-04 14:12:48 +08:00 |
|
|
tianshujie
|
d597775c7e
|
* Finish task #58560.
|
2022-06-29 08:35:21 +08:00 |
|
|
tianshujie
|
12fd7102a1
|
* Finish task #58556.
|
2022-06-28 17:55:19 +08:00 |
|
|
tianshujie
|
26f37ec09c
|
* Finish task #58560.
|
2022-06-27 15:38:33 +08:00 |
|
|
王怡栋
|
c69384617a
|
Merge branch 'master_xieqiyu_57850' into 'master'
* Code for task#57850.
See merge request easycorp/zentaopms!4083
|
2022-06-23 00:39:25 +00:00 |
|
|
xieqiyu
|
21b0217aa8
|
* Code for task#57850.
|
2022-06-22 13:15:44 +08:00 |
|
|
wangzemei
|
b11a919ccd
|
* Fix bug #24000
|
2022-06-21 06:08:36 +00:00 |
|
|
leiyong
|
f4e3a0dc61
|
* Fix bug#23707.
|
2022-06-16 09:14:11 +00:00 |
|
|
leiyong
|
b6f5c18dc9
|
* Finish task#56933.
|
2022-06-14 07:56:43 +00:00 |
|
|
孙广明
|
5c1f32c3d9
|
Merge branch 'sprint_194' into 'master'
sprint_194 add project in batchcreate view
See merge request easycorp/zentaopms!3876
|
2022-06-13 02:06:00 +00:00 |
|
|
zhouxin
|
68b8268391
|
* Finish task #55258.
|
2022-06-13 01:25:38 +00:00 |
|
|
sunjun
|
a69d10d9db
|
sprint_194 add project in batchcreate view
|
2022-06-10 06:36:12 +00:00 |
|
|
孙广明
|
b896377846
|
* Change zentao license.
|
2022-06-08 10:02:29 +08:00 |
|
|
孙广明
|
b528156589
|
* Change license.
|
2022-06-08 09:34:46 +08:00 |
|
|
xieqiyu
|
1d2ca05e50
|
* Fix bug#23154.
|
2022-06-02 03:54:17 +08:00 |
|
|
sunjun
|
1c8db1da3a
|
fixbug_sunjun_22531
|
2022-06-01 09:14:12 +00:00 |
|
|
zhouxudong
|
71a55f5dcf
|
* Finish task #55623.
|
2022-06-01 01:37:18 +00:00 |
|
|
lanzongjun
|
36010b797f
|
* fix bug #54940
|
2022-05-25 15:58:26 +08:00 |
|
|
lanzongjun
|
0a84e5fb81
|
* fix bug #54940
|
2022-05-25 15:51:48 +08:00 |
|
|
李玉春
|
19718e6249
|
Merge branch 'master' into 'sprint_sunjun_55259'
# Conflicts:
# module/bug/view/batchcreate.html.php
|
2022-05-25 02:31:37 +00:00 |
|
|
sunjun
|
ca20a35a26
|
sprint_sunjun_55259
|
2022-05-25 01:34:10 +00:00 |
|
|
daitingting
|
e2f7c10296
|
* Set default value in getFieldControl function, finish task #54954.
|
2022-05-25 01:03:06 +00:00 |
|
|
hufangzhou
|
0a7b3d4786
|
* Adjust the color.
|
2022-05-19 13:54:14 +08:00 |
|
|
hufangzhou
|
775a397395
|
* Finish task #54484,#54485,#54486.
|
2022-05-19 11:09:53 +08:00 |
|