 李玉春
|
cfde5172f3
|
Merge branch 'sprint/168_sgm_fixbug' into 'sprint/168'
* Fix bug #16703.
See merge request easycorp/zentaopms!605
|
2021-11-24 05:03:12 +00:00 |
|
|
朱金勇
|
40e772acea
|
Merge branch 'sprint/168_chaideqing_44636' into 'sprint/168'
modify zentao bug/task/story card page's srollbar and actionbar
See merge request easycorp/zentaopms!604
|
2021-11-24 05:01:16 +00:00 |
|
|
chaideqing
|
45556985f7
|
* refactor ifelse code
|
2021-11-24 11:22:07 +08:00 |
|
|
孙广明
|
2dc2c46737
|
* Fix bug #16703.
|
2021-11-24 10:55:42 +08:00 |
|
|
chaideqing
|
70677f0673
|
modify zentao bug/task/story card page's srollbar and actionbar
|
2021-11-24 10:50:51 +08:00 |
|
|
李玉春
|
052157902a
|
Merge branch 'sprint/168_sgm_fixbug' into 'sprint/168'
* Fix bug #16530.
See merge request easycorp/zentaopms!602
zentaopms_16.0.alpha3_20211124
|
2021-11-23 09:13:54 +00:00 |
|
|
孙广明
|
c6d990a3f5
|
* Fix bug #16530.
|
2021-11-23 16:26:30 +08:00 |
|
|
孙广明
|
e42559561e
|
Merge branch 'sprint/172_liyuchun_16518' into 'sprint/168'
* Fix bug #16518.
See merge request easycorp/zentaopms!588
|
2021-11-23 06:08:49 +00:00 |
|
|
liyuchun
|
d396d4e6a9
|
* Adjust code style.
|
2021-11-23 14:05:43 +08:00 |
|
|
朱金勇
|
9d2bb37821
|
Merge branch 'sprint/168_sunhao/task44358' into 'sprint/168'
* Task #44358, drop card immediately on mouse leave page.
See merge request easycorp/zentaopms!598
|
2021-11-22 09:40:44 +00:00 |
|
|
Hao Sun
|
ff1d07fdf1
|
* task #44358, drop card immediately on mouse leave page.
|
2021-11-22 17:13:41 +08:00 |
|
|
王怡栋
|
6b32de5910
|
Merge branch 'sprint/168_qixinzhi_44632' into 'sprint/168'
* fix scroll bar css invalid after merge
See merge request easycorp/zentaopms!582
|
2021-11-22 08:15:47 +00:00 |
|
|
朱金勇
|
4801bd8ea7
|
Merge branch 'sprint/168_sunhao/client_integrated' into 'sprint/168'
* task #44639, task #44637, support for using zentao apps in client left navbar.
See merge request easycorp/zentaopms!581
|
2021-11-22 07:47:53 +00:00 |
|
|
Hao Sun
|
b011796c15
|
* fix php syntax error.
|
2021-11-22 15:33:59 +08:00 |
|
|
liyuchun
|
afafa08d92
|
* Fix bug #16518.
|
2021-11-22 15:17:00 +08:00 |
|
|
Hao Sun
|
6619652319
|
* append special class to body in client mode.
|
2021-11-22 15:10:00 +08:00 |
|
|
孙广明
|
1016c9762c
|
Merge branch 'sprint/172_liyuchun_16523' into 'sprint/168'
* Fix bug #16523.
See merge request easycorp/zentaopms!568
|
2021-11-22 06:51:02 +00:00 |
|
|
孙广明
|
11a320555c
|
Merge branch 'sprint/172_liyuchun_16384' into 'sprint/168'
* Adjust execution button name.
See merge request easycorp/zentaopms!578
|
2021-11-22 06:50:34 +00:00 |
|
|
liyuchun
|
5dc23ad4f2
|
* Adjust create bug view.
|
2021-11-22 14:48:33 +08:00 |
|
|
Hao Sun
|
f7b8fcd85f
|
* fix app menu not show in browser.
|
2021-11-22 14:41:15 +08:00 |
|
|
李玉春
|
c5751d1de2
|
Merge branch 'sprint/168_hufangzhou_16509' into 'sprint/168'
* Fix bug #16509.
See merge request easycorp/zentaopms!583
|
2021-11-22 06:36:09 +00:00 |
|
|
Hao Sun
|
5a92064d51
|
* update zentao integrated extension.
|
2021-11-22 14:30:50 +08:00 |
|
|
hufangzhou
|
63bc9f80c4
|
* Fix bug #16509.
|
2021-11-22 14:11:13 +08:00 |
|
|
liyuchun
|
dfe63ef1a6
|
* Adjust style of create story.
|
2021-11-22 14:00:53 +08:00 |
|
|
qixinzhi
|
f5d89fee3d
|
* fix scroll bar css invalid after merge
|
2021-11-22 13:51:27 +08:00 |
|
|
Hao Sun
|
5d6a255a73
|
* support for using zentao apps in client left navbar.
|
2021-11-22 13:43:23 +08:00 |
|
|
liyuchun
|
da47c729d9
|
* Adjust execution button name.
|
2021-11-22 13:36:52 +08:00 |
|
|
liyuchun
|
e43ea2001f
|
* Fix bug #16523.
|
2021-11-22 10:44:00 +08:00 |
|
|
孙广明
|
319e30a822
|
Merge branch 'sprint/172_liyuchun_16510' into 'sprint/168'
Sprint/172 liyuchun 16510
See merge request easycorp/zentaopms!565
|
2021-11-22 02:36:53 +00:00 |
|
|
李玉春
|
bc262dd295
|
Merge branch 'sprint/168_liumengyi_16505' into 'sprint/168'
* Fix Bug #16505.
See merge request easycorp/zentaopms!567
|
2021-11-22 02:31:29 +00:00 |
|
|
liumengyi
|
e477c580bf
|
* Fix Bug #16505.
|
2021-11-22 10:28:18 +08:00 |
|
|
liumengyi
|
3836941efd
|
* Fix Bug #16505.
|
2021-11-22 10:26:45 +08:00 |
|
|
liyuchun
|
fb594d53f8
|
* Fix bug #16518.
|
2021-11-22 10:23:52 +08:00 |
|
|
liyuchun
|
98061fa481
|
* Fix bug #16513.
|
2021-11-22 10:15:03 +08:00 |
|
|
liyuchun
|
48909fa19b
|
* Fix bug #16511.
|
2021-11-22 10:06:49 +08:00 |
|
|
liyuchun
|
83d49cb8d9
|
* Fix bug #16510.
|
2021-11-22 10:01:31 +08:00 |
|
|
liyuchun
|
55d9e9f7d1
|
Merge branch 'sprint/168' of https://gitlab.zcorp.cc/easycorp/zentaopms into 168
|
2021-11-22 09:53:54 +08:00 |
|
|
孙广明
|
11f2c39369
|
Merge branch 'sprint/172_liyuchun_bug' into 'sprint/168'
Sprint/172 liyuchun bug
See merge request easycorp/zentaopms!561
|
2021-11-22 01:13:44 +00:00 |
|
|
liyuchun
|
f943413c6d
|
* Adjust style.
|
2021-11-22 09:12:08 +08:00 |
|
|
zhujinyong
|
9bfa67680f
|
Merge branch 'sprint/168_chaideqing_44636' into sprint/168
|
2021-11-22 08:56:02 +08:00 |
|
|
zhujinyong
|
3d89875eb0
|
Merge branch 'sprint/168_chaideqing_44634' into sprint/168
|
2021-11-22 08:53:58 +08:00 |
|
|
zhujinyong
|
b5706189c3
|
Merge branch 'sprint/168_chaideqing_44635' into sprint/168
|
2021-11-22 08:51:49 +08:00 |
|
|
liyuchun
|
9502610ece
|
* Fix error for task #44358.
|
2021-11-22 08:39:34 +08:00 |
|
|
文睿 李
|
68edb2f0a4
|
Merge branch 'sprint/168' into 'sprint/168_chaideqing_44636'
# Conflicts:
# module/task/css/x.view.css
|
2021-11-22 00:23:57 +00:00 |
|
|
文睿 李
|
36c7fc5a94
|
Merge branch 'sprint/168' into 'sprint/168_chaideqing_44635'
# Conflicts:
# module/bug/css/x.view.css
|
2021-11-22 00:23:13 +00:00 |
|
|
文睿 李
|
5c6023a75e
|
* resolve conflict, Merge branch 'sprint/168' into 'sprint/168_chaideqing_44634'
# Conflicts Resolved:
# module/story/css/x.view.css
|
2021-11-22 00:21:55 +00:00 |
|
|
liyuchun
|
a946e26bfc
|
Merge branch 'sprint/168' of https://gitlab.zcorp.cc/easycorp/zentaopms into 168
|
2021-11-22 08:16:01 +08:00 |
|
|
朱金勇
|
b3762e84aa
|
Merge branch 'sprint/168_qixinzhi_44632' into 'sprint/168'
* beautify scroll bar for task/bug/story card
See merge request easycorp/zentaopms!519
|
2021-11-22 00:14:33 +00:00 |
|
|
chaideqing
|
7bfb998913
|
* refactor
|
2021-11-19 16:14:47 +08:00 |
|
|
chaideqing
|
be154ba960
|
* refactor
|
2021-11-19 16:12:10 +08:00 |
|