 孙广明
|
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 |
|
|
孙广明
|
3092800655
|
Merge branch 'sprint/199_zg_56544' into 'master'
* Finish task#56544
See merge request easycorp/zentaopms!3791
|
2022-06-09 01:19:51 +00:00 |
|
|
zenggang
|
14ea5d8273
|
* Adjust code
|
2022-06-08 09:20:00 +00:00 |
|
|
zenggang
|
9549b91f83
|
* Adjust code
|
2022-06-08 09:13:48 +00:00 |
|
|
wangyidong
|
11e6edcd22
|
Merge branch 'zdoo18'
|
2022-06-08 17:06:07 +08:00 |
|
|
zenggang
|
6471116e48
|
* Finish task#56544
|
2022-06-08 06:25:13 +00:00 |
|
|
xieqiyu
|
86561ba4ca
|
* Code for task#56393,#56390,#56389.
|
2022-06-08 10:15:01 +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 |
|
|
xieqiyu
|
36e609f808
|
* Fix bug#23116.
|
2022-06-06 16:52:30 +08:00 |
|
|
xieqiyu
|
e69afb987b
|
* Fix bug#23242.
|
2022-06-05 20:13:05 +08:00 |
|
|
孙广明
|
716c7ca6e6
|
Merge branch 'fixbug_sunjun_23182' into 'master'
fixbug_sunjun_23182
See merge request easycorp/zentaopms!3703
|
2022-06-02 06:17:56 +00:00 |
|
|
sunjun
|
5b35fab5f6
|
fixbug_sunjun_23182
|
2022-06-02 01:43:24 +00:00 |
|
|
孙广明
|
2d572a9d14
|
Merge branch '197'
|
2022-06-02 08:32:45 +08:00 |
|
|
tianshujie
|
c8a4fdd798
|
* Fix bug #23117.
|
2022-06-01 16:11:30 +08:00 |
|
|
wangyidong
|
2400dfc83a
|
* code for task #55568.
|
2022-06-01 14:48:35 +08:00 |
|
|
zhouxudong
|
5c3ac663e6
|
* Fix bug #23129 #23126 #23108.
|
2022-06-01 06:30:45 +00:00 |
|
|
王怡栋
|
f64b61a487
|
Merge branch 'sprint/196' into 'master'
Sprint/196
See merge request easycorp/zentaopms!3677
|
2022-06-01 02:28:26 +00:00 |
|
|
唐胡成
|
0b68898f0a
|
Update model.php
|
2022-06-01 00:43:27 +00:00 |
|
|
tanghucheng
|
f3a1f7cf2a
|
* Fix bug #23114.
|
2022-05-31 16:47:13 +08:00 |
|
|
zhouxudong
|
93e753b39e
|
* Finish task #55619 #55626.
|
2022-05-31 06:03:37 +00:00 |
|
|
liumengyi
|
ad84595992
|
* Optimized code for task #55683.
|
2022-05-31 14:00:13 +08:00 |
|
|
liumengyi
|
1b89018e2f
|
* Optimized code for task #55684, #55683.
|
2022-05-31 13:55:59 +08:00 |
|
|
liumengyi
|
e661948d67
|
* Finish story #32879,#32887,#32935,#32934.
|
2022-05-31 09:21:05 +08:00 |
|
|
zhouxudong
|
afa9003035
|
* Finisha task #55626 #55619.
|
2022-05-31 05:09:49 +00:00 |
|
|
孙广明
|
051fd7b74f
|
Merge branch 'sprint/195_mayue_bug#22880' into 'master'
* Fix bug #22880.
See merge request easycorp/zentaopms!3575
|
2022-05-25 03:28:42 +00:00 |
|
|
mayue
|
33730f3787
|
* Fix bug #22880.
|
2022-05-25 01:56:04 +00:00 |
|
|
lanzongjun
|
5eb84a81d0
|
Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms into sprint/189_package_lanzongjun
|
2022-05-25 09:45:32 +08:00 |
|
|
lanzongjun
|
ae45c26343
|
* fix bug #54947
|
2022-05-25 09:45:13 +08:00 |
|
|
wangyidong
|
967d24dd06
|
Merge branch 'sprint/189_package'
|
2022-05-24 10:32:09 +08:00 |
|
|
hufangzhou
|
9f1ac822bf
|
* Adjust the code.
|
2022-05-20 18:55:46 +08:00 |
|
|
mayue
|
99b0f22baa
|
* Fix bug #22632.
|
2022-05-20 09:10:22 +00:00 |
|
|
wangyidong
|
55b68c8a57
|
* adjust for round error.
|
2022-05-20 15:23:02 +08:00 |
|
|
王怡栋
|
e093aac4ca
|
Merge branch 'sprint/master_zhouxudong_54477' into 'master'
Sprint/master zhouxudong 54477
See merge request easycorp/zentaopms!3541
|
2022-05-20 06:07:46 +00:00 |
|
|
xieqiyu
|
cd1c1e1b63
|
* Finish task#54477.
|
2022-05-20 10:52:30 +08:00 |
|
|
tianshujie
|
4ff0410aca
|
* Fix bug #22617.
|
2022-05-20 10:45:48 +08:00 |
|
|
李玉春
|
0fa2c55ece
|
Merge branch 'sprint/192_leiyong_task_54488' into 'master'
* Finish task#54488.
See merge request easycorp/zentaopms!3531
|
2022-05-20 00:29:05 +00:00 |
|
|
leiyong
|
143e9aff96
|
* Finish task#54488.
|
2022-05-19 09:32:47 +00:00 |
|
|
wangyidong
|
92e8a84230
|
* adjust for edit project.
|
2022-05-19 16:15:55 +08:00 |
|
|
孙广明
|
57a7f0bcef
|
Merge branch 'sprint/sunhao/optimize_kanban' into 'master'
* task #54187, optimize kanban with a lot of cards with virtualList.
See merge request easycorp/zentaopms!3511
|
2022-05-19 07:43:19 +00:00 |
|
|
zhouxin
|
83248ea9f7
|
* Fix bug #22651,#22645.
|
2022-05-19 05:52:24 +00:00 |
|
|
wangyidong
|
f289e08b9d
|
* use buildOperateMenu method for build and projectrelease module.
|
2022-05-19 13:34:02 +08:00 |
|
|
Hao Sun
|
4d895c53f4
|
* task #54187, optimize kanbans with virtual scroll list.
|
2022-05-19 05:10:32 +00:00 |
|
|
xieqiyu
|
0cdfceebc9
|
* Code for task#54477.
|
2022-05-18 17:11:09 +08:00 |
|
|
zhouxin
|
c5be32065d
|
* Fix bug.
|
2022-05-18 07:50:26 +00:00 |
|
|
zhouxin
|
094db2e505
|
* Adjust code.
|
2022-05-18 07:39:05 +00:00 |
|
|
zhouxin
|
5ef4782e82
|
* Finish task #54351.
|
2022-05-18 07:31:45 +00:00 |
|
|
zhouxudong
|
50b39ac2d5
|
* Finish task #54477.
|
2022-05-18 03:13:21 +00:00 |
|