 leiyong
|
eb6e217f3c
|
* Adjust CSS.
|
2022-06-17 05:21:40 +00:00 |
|
|
leiyong
|
ae55e2c31e
|
* Fix bug#23841.
|
2022-06-17 01:30:09 +00:00 |
|
|
孙广明
|
3f83669de2
|
Merge branch 'sprint202_leiyong_fix_bug' into 'master'
* Fix bug#23707.
See merge request easycorp/zentaopms!3992
|
2022-06-16 09:28:33 +00:00 |
|
|
leiyong
|
f4e3a0dc61
|
* Fix bug#23707.
|
2022-06-16 09:14:11 +00:00 |
|
|
xieqiyu
|
d246bca164
|
* Fix bug#23655.
|
2022-06-16 13:49:47 +08:00 |
|
|
zhujinyong
|
dfcada81f1
|
Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms
|
2022-06-15 17:52:37 +08:00 |
|
|
王怡栋
|
a6b264d1a7
|
Merge branch 'sprint202_leiyong_task_56926' into 'master'
Sprint202 leiyong task 56926
See merge request easycorp/zentaopms!3942
|
2022-06-15 08:20:11 +00:00 |
|
|
leiyong
|
32b846cdf5
|
* Finish task#56926.
|
2022-06-15 07:57:50 +00:00 |
|
|
Hao Sun
|
c34385954d
|
* support for updating kanban without refresh the whole page.
|
2022-06-15 06:05:59 +00:00 |
|
|
朱金勇
|
cb9a0b6af9
|
Merge branch 'sprint202_leiyong_fix_bug' into 'master'
* Finish task#56933.
See merge request easycorp/zentaopms!3916
|
2022-06-14 09:44:45 +00:00 |
|
|
leiyong
|
b6f5c18dc9
|
* Finish task#56933.
|
2022-06-14 07:56:43 +00:00 |
|
|
mayue
|
a70fd10f87
|
* Fix bug #23410.
|
2022-06-14 11:17:25 +08:00 |
|
|
王怡栋
|
0e042d43ba
|
Merge branch 'sprint/master_zhouxudong_23427' into 'master'
Sprint/master zhouxudong 23427
See merge request easycorp/zentaopms!3881
|
2022-06-14 01:12:35 +00:00 |
|
|
zhouxudong
|
0ec97fbba4
|
* Finish task #56944 #56943 #56941 #56938.
|
2022-06-13 05:37:22 +00:00 |
|
|
zhouxudong
|
26a57e00cd
|
* Fix bug #23543 #23434 #23427 #23419.
|
2022-06-13 04:24:33 +00:00 |
|
|
孙广明
|
49f25c80e5
|
Merge branch 'sprint200_leiyong_adjust_style' into 'master'
* Adjust style.
See merge request easycorp/zentaopms!3864
|
2022-06-10 07:57:20 +00:00 |
|
|
leiyong
|
4ffde5d6dc
|
* Adjust style.
|
2022-06-10 06:56:42 +00:00 |
|
|
王怡栋
|
e87eb29642
|
Merge branch 'sprint/mater_zhouxudong_56368' into 'master'
* Finish task #56368.
See merge request easycorp/zentaopms!3855
|
2022-06-10 05:06:30 +00:00 |
|
|
zhouxudong
|
291b9a6606
|
* Fix bug #23510.
|
2022-06-10 04:59:12 +00:00 |
|
|
孙广明
|
23ae4cea1c
|
Merge branch 'master_xieqiyu_56376' into 'master'
* Finish task#56376.
See merge request easycorp/zentaopms!3859
|
2022-06-10 04:29:59 +00:00 |
|
|
xieqiyu
|
3e4fd3aa0f
|
* Finish task#56376.
|
2022-06-10 12:01:27 +08:00 |
|
|
zhouxudong
|
8f8eaaa837
|
* Finish task #56368.
|
2022-06-10 03:08:22 +00:00 |
|
|
王怡栋
|
2849f7a229
|
Merge branch 'sprint/mater_zhouxudong_56368' into 'master'
* Finish task #56368.
See merge request easycorp/zentaopms!3850
|
2022-06-10 02:07:33 +00:00 |
|
|
zhouxudong
|
de0d579bdd
|
* Finish task #56368.
|
2022-06-10 02:03:36 +00:00 |
|
|
王怡栋
|
097faf3c7d
|
Merge branch 'sprint/master_zhouxudong_56374' into 'master'
Sprint/master zhouxudong 56374
See merge request easycorp/zentaopms!3849
|
2022-06-10 02:01:58 +00:00 |
|
|
王怡栋
|
74554fe0bb
|
Merge branch 'sprint200_leiyong_task_56370' into 'master'
Sprint200 leiyong task 56370
See merge request easycorp/zentaopms!3847
|
2022-06-10 01:51:28 +00:00 |
|
|
zhouxudong
|
82afc7ae76
|
* Finish task #56374.
|
2022-06-10 01:43:08 +00:00 |
|
|
leiyong
|
82caa7ee4d
|
* Fix bug#23542.
|
2022-06-10 01:36:47 +00:00 |
|
|
zhouxudong
|
94c8b0a523
|
* Finish task #56374.
|
2022-06-10 01:32:52 +00:00 |
|
|
leiyong
|
3f03e8cb4a
|
* Finish task#56370.
|
2022-06-10 01:32:01 +00:00 |
|
|
tianshujie
|
3f1dc22664
|
* Finish task #56469.
|
2022-06-10 09:22:50 +08:00 |
|
|
王怡栋
|
a9981b0a33
|
Merge branch 'master' into 'sprint/201_tianshujie_56469'
# Conflicts:
# module/execution/control.php
# module/execution/js/kanban.js
# module/kanban/control.php
# module/kanban/model.php
|
2022-06-10 01:05:39 +00:00 |
|
|
liumengyi
|
a5d2a87fdf
|
* Finish task #56469.
|
2022-06-09 17:33:46 +08:00 |
|
|
leiyong
|
70c1b06e1c
|
* Adjust code.
|
2022-06-09 09:31:45 +00:00 |
|
|
王怡栋
|
7d3ea4b91e
|
Merge branch 'sprint200_fix_bug_23486' into 'master'
* Fix bug#23494,bug#23486.
See merge request easycorp/zentaopms!3839
|
2022-06-09 09:17:19 +00:00 |
|
|
leiyong
|
4d5ccc180e
|
* Fix bug#23494,bug#23486.
|
2022-06-09 08:58:05 +00:00 |
|
|
liumengyi
|
f3ce4377a8
|
* Fix bug #23506, #23439.
|
2022-06-09 16:22:58 +08:00 |
|
|
王怡栋
|
c9a29bb420
|
Merge branch 'master' into 'sprint200_leiyong_task_56384'
# Conflicts:
# module/kanban/view/space.html.php
|
2022-06-09 07:40:03 +00:00 |
|
|
leiyong
|
1b511cac59
|
* Handling html tags.
|
2022-06-09 07:33:00 +00:00 |
|
|
王怡栋
|
ad0ebf0aa1
|
Merge branch 'master' into 'sprint/201_liumengyi_fixbug'
# Conflicts:
# module/execution/js/kanban.js
|
2022-06-09 07:24:23 +00:00 |
|
|
王怡栋
|
349260a146
|
Merge branch 'master_xieqiyu_56386' into 'master'
* Finish task#56386.
See merge request easycorp/zentaopms!3825
|
2022-06-09 07:20:12 +00:00 |
|
|
liumengyi
|
63717f4fd0
|
* Fix bug of task #56454.
|
2022-06-09 15:18:56 +08:00 |
|
|
leiyong
|
c44b1096c4
|
* Adjust code.
|
2022-06-09 07:06:22 +00:00 |
|
|
leiyong
|
70ee0323f6
|
* Fix bug#23487.
|
2022-06-09 06:48:21 +00:00 |
|
|
xieqiyu
|
5d5bc8f927
|
* Finish task#56386.
|
2022-06-09 14:35:20 +08:00 |
|
|
王怡栋
|
ce38afd825
|
Merge branch 'sprint/master_zhouxudong_fixbug' into 'master'
* Fix bug.
See merge request easycorp/zentaopms!3817
|
2022-06-09 06:35:07 +00:00 |
|
|
王怡栋
|
084f66dd51
|
Merge branch 'master' into 'sprint/master_zhouxudong_56362'
# Conflicts:
# module/kanban/model.php
|
2022-06-09 06:32:06 +00:00 |
|
|
leiyong
|
aec5b3612e
|
* Finish task#56384.
|
2022-06-09 06:23:50 +00:00 |
|
|
leiyong
|
a71825d731
|
* Fix bug.
|
2022-06-09 05:08:33 +00:00 |
|
|
leiyong
|
38a7d7334a
|
* Fix bug#23481,bug#23466.
|
2022-06-09 03:42:53 +00:00 |
|