Commit Graph

24898 Commits

Author SHA1 Message Date
zhengrunyu
e78c876216 *Finish task #45148. 2021-11-30 09:22:04 +08:00
zhengrunyu
b3c8ee7ccb *Finish task #45148. 2021-11-29 09:29:44 +08:00
zhengrunyu
9dac5358e3 *Finish task #45148. 2021-11-26 15:20:17 +08:00
zhengrunyu
07363c68ff *Finish task #45148. 2021-11-26 09:01:56 +08:00
zhengrunyu
2f41e85fda *Finish task #sprint/168_zhengrunyu_45148. 2021-11-26 08:30:55 +08:00
zhengrunyu
0edae7664d *Finish task #45148. 2021-11-25 15:42:18 +08:00
zhengrunyu
3340a383f1 *Finish task #45151. 2021-11-25 15:03:43 +08:00
孙广明
c5e7bd91c3 * Fix php 5.3 bug. 2021-11-24 15:06:09 +08:00
孙广明
59172b420e * Fix project and product relation bug. 2021-11-24 14:01:50 +08:00
孙广明
b956e21448 * Fix bug. 2021-11-24 13:10:40 +08:00
李玉春
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
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
孙广明
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
王怡栋
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
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
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
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
孙广明
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
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
朱金勇
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
chaideqing
7f72b77b36 * refactor 2021-11-19 16:01:00 +08:00
liyuchun
d185d6db49 * Fix bug #16380,#16387. 2021-11-19 15:13:34 +08:00