孙广明
|
f3f8e20c9b
|
Merge branch 'sprint/201_zhouxin_my_work' into 'master'
* Finish task #56461,56462,56458,56465.
See merge request easycorp/zentaopms!3819
|
2022-06-09 05:23:01 +00:00 |
|
zhouxin
|
c056b7e567
|
* Finish task #56461,56462,56458,56465.
|
2022-06-09 05:18:27 +00:00 |
|
王怡栋
|
fd0cb543ba
|
Merge branch 'master' into 'sprint_200'
# Conflicts:
# module/execution/lang/en.php
# module/execution/lang/zh-cn.php
# module/execution/view/kanban.html.php
# module/kanban/css/space.css
|
2022-06-09 03:16:20 +00:00 |
|
wangyidong
|
11e6edcd22
|
Merge branch 'zdoo18'
|
2022-06-08 17:06:07 +08:00 |
|
孙广明
|
b896377846
|
* Change zentao license.
|
2022-06-08 10:02:29 +08:00 |
|
孙广明
|
b528156589
|
* Change license.
|
2022-06-08 09:34:46 +08:00 |
|
leiyong
|
bb31bbdca2
|
* Finish task#56360.
|
2022-06-07 07:55:58 +00:00 |
|
sunjun
|
1c8db1da3a
|
fixbug_sunjun_22531
|
2022-06-01 09:14:12 +00:00 |
|
wangyidong
|
2400dfc83a
|
* code for task #55568.
|
2022-06-01 14:48:35 +08:00 |
|
宋辰轩
|
7d1341e710
|
* Fix bug #23068.
|
2022-06-01 10:59:52 +08:00 |
|
宋辰轩
|
081b7352e9
|
* Fix bug #23068.
|
2022-06-01 09:51:55 +08:00 |
|
liumengyi
|
6a61aa3500
|
* Fix bug #22533.
|
2022-05-27 11:08:15 +08:00 |
|
hufangzhou
|
9e3133e2a3
|
* Resolve issue #644.
|
2022-05-25 13:49:25 +08:00 |
|
wangyidong
|
967d24dd06
|
Merge branch 'sprint/189_package'
|
2022-05-24 10:32:09 +08:00 |
|
liumengyi
|
47ec417f16
|
* Fix bug #22689.
|
2022-05-19 15:39:10 +08:00 |
|
hufangzhou
|
775a397395
|
* Finish task #54484,#54485,#54486.
|
2022-05-19 11:09:53 +08:00 |
|
liumengyi
|
7659a2376c
|
* Code format for task #54320.
|
2022-05-19 10:38:00 +08:00 |
|
liumengyi
|
6aabf4eae0
|
* Finish task #54320.
|
2022-05-18 17:00:48 +08:00 |
|
wangyidong
|
415d9ed538
|
* adjust for merge master code.
|
2022-05-17 17:12:12 +08:00 |
|
tianshujie
|
e848ea7d3f
|
* Fix the project logic to which the lookup execution belongs.
|
2022-05-17 09:39:07 +08:00 |
|
王怡栋
|
3cd2d727a7
|
Merge branch 'sprint/master_zhouxudong_22531' into 'master'
* Fix bug #22531.
See merge request easycorp/zentaopms!3431
|
2022-05-16 09:26:34 +00:00 |
|
zhouxudong
|
48c052efad
|
* Fix bug #22531.
|
2022-05-16 09:23:29 +00:00 |
|
tanghucheng
|
a0bd326f3b
|
* Fix bug.
|
2022-05-16 06:43:34 +00:00 |
|
liumengyi
|
6d61b45068
|
* Refactoring bug search code.
|
2022-05-11 16:15:07 +08:00 |
|
liumengyi
|
ed90476621
|
* Refactoring bug search code.
|
2022-05-11 16:10:07 +08:00 |
|
liumengyi
|
3f0101ac01
|
* Fix bug #22320,#22317.
|
2022-05-11 13:37:49 +08:00 |
|
liumengyi
|
460f597c60
|
* Fix bug for #task 53647.
|
2022-05-11 10:46:40 +08:00 |
|
liumengyi
|
8c6c09d699
|
* Finish task #53647.
|
2022-05-11 10:02:02 +08:00 |
|
liumengyi
|
977e100d04
|
* Finish task #53647.
|
2022-05-11 09:48:08 +08:00 |
|
daitingting
|
d577d57a33
|
* Add id for checking unique field.
|
2022-05-09 17:02:23 +08:00 |
|
wangyuting2
|
a607161591
|
* Finish task #53549.
|
2022-05-09 17:00:41 +08:00 |
|
wangyuting2
|
19631c8b97
|
* Adjust return.
|
2022-05-09 16:14:53 +08:00 |
|
wangyuting2
|
e86f32df24
|
* Adjust feedback menu.
|
2022-05-09 15:58:02 +08:00 |
|
wangyuting2
|
73dce33bc3
|
* Adjust bug action menu.
|
2022-05-09 13:49:02 +08:00 |
|
wangyuting2
|
91366891f4
|
* Adjust bug action menu.
|
2022-05-09 13:46:59 +08:00 |
|
wangyuting2
|
219eb1060e
|
* Fix bug.
|
2022-05-09 13:38:21 +08:00 |
|
wangyuting2
|
cc57fc819a
|
* Add buildOperateMenu for bug module.
|
2022-05-09 11:16:14 +08:00 |
|
wangyuting2
|
45ae4de775
|
* Do task 53548.
|
2022-05-09 09:20:01 +08:00 |
|
mayue
|
aeda6fbe78
|
* Fix bug #22064#22065.
|
2022-04-28 06:43:05 +00:00 |
|
liyuchun
|
537c1bea2d
|
* Fix bug #15039.
|
2022-04-28 02:06:10 +00:00 |
|
朱金勇
|
8b4e68b5a4
|
Merge branch 'api_zry' into 'master'
Api zry
See merge request easycorp/zentaopms!3159
|
2022-04-27 08:19:56 +00:00 |
|
zhengrunyu
|
00dda5315a
|
* Change function name.
|
2022-04-27 16:17:08 +08:00 |
|
zhengrunyu
|
9bd5524ef3
|
* Add remark.
|
2022-04-27 15:21:20 +08:00 |
|
zhengrunyu
|
6f18ae83c2
|
* Add model function to static.
|
2022-04-27 15:01:46 +08:00 |
|
李玉春
|
409115aaaa
|
Merge branch 'sprint/tianshujie_fixbug' into 'master'
Sprint/tianshujie fixbug
See merge request easycorp/zentaopms!3106
|
2022-04-25 05:33:23 +00:00 |
|
tianshujie
|
42676bf558
|
* Adjust the scope of modules when searching for bugs.
|
2022-04-25 01:27:24 +00:00 |
|
wangyidong
|
0705daa805
|
* adjust for performance issue.
|
2022-04-25 08:55:03 +08:00 |
|
朱金勇
|
e63ab95fe5
|
Merge branch 'sprint/renying_bug17274' into 'master'
Fix bug#17274
See merge request easycorp/zentaopms!2941
|
2022-04-14 06:45:01 +00:00 |
|
renying
|
d219dac730
|
Fix bug#17274
|
2022-04-14 14:37:10 +08:00 |
|
wangxiaomeng
|
b085ec1029
|
Aborting commit due to empty commit message
|
2022-04-14 13:56:03 +08:00 |
|