Commit Graph

2328 Commits

Author SHA1 Message Date
chaideqing
45556985f7 * refactor ifelse code 2021-11-24 11:22:07 +08:00
chaideqing
70677f0673 modify zentao bug/task/story card page's srollbar and actionbar 2021-11-24 10:50:51 +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
liyuchun
5dc23ad4f2 * Adjust create bug view. 2021-11-22 14:48:33 +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
liumengyi
3836941efd * Fix Bug #16505. 2021-11-22 10:26:45 +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
文睿 李
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
朱金勇
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
be154ba960 * refactor 2021-11-19 16:12:10 +08:00
liyuchun
d185d6db49 * Fix bug #16380,#16387. 2021-11-19 15:13:34 +08:00
chaideqing
e792607430 * task #44635, optimize bug card in xuanxuan 2021-11-19 10:04:30 +08:00
liyuchun
d188fbd7b8 * Fix bug #16389,#16387. 2021-11-18 22:54:48 +08:00
reneeteng
8c15de95c5 * Edit lang for feedbackby. 2021-11-18 15:21:56 +08:00
qixinzhi
e502f80728 * beautify scroll bar for task/bug/story card 2021-11-18 15:13:17 +08:00
reneeteng
811d9ecae7 * Edit lang file for feedbackby interface. 2021-11-18 10:48:53 +08:00
liumengyi
dc807a53a5 * Fix bug #16390,#16388. 2021-11-17 17:29:08 +08:00
liumengyi
3e93ba664b * Fix bug #16390. 2021-11-17 16:33:42 +08:00
李玉春
851430dc48 Merge branch 'sprint/168_liumengyi_44369' into 'sprint/168'
* Finish task #44369.

See merge request easycorp/zentaopms!486
2021-11-17 07:21:54 +00:00
liumengyi
3f6bdc127b * Finish task #44369. 2021-11-17 15:20:28 +08:00
liumengyi
30204c1568 * Finish task #44369. 2021-11-17 14:39:37 +08:00
liyuchun
a9fa89985c * Adjust code for task #44367. 2021-11-17 12:50:19 +08:00
liyuchun
b5cfba165e * Finish task #44367. 2021-11-16 17:25:30 +08:00
liyuchun
1ae2cffc7c * Fix bug #16165. 2021-11-12 11:01:04 +08:00
liyuchun
970763b0c5 * Adjust create object in kanban. 2021-11-01 11:32:21 +08:00
zenggang
6bdf89c293 * Finish task#43410,43411,43413 2021-10-29 03:18:10 +00:00
李玉春
ff8f020485 Merge branch 'sprint/168_tianshujie_43426' into 'sprint/168'
* Refactoring the Kanban function.

See merge request easycorp/zentaopms!145
2021-10-26 02:51:13 +00:00
tianshujie
3d22a50a00 * Create the single execution Kanban lane and Kanban column. 2021-10-25 14:13:44 +08:00
zenggang
534254a5a3 * Fix bug#15682 2021-10-22 01:25:55 +00:00
zenggang
4c800f938a * Adjust code 2021-10-15 06:09:32 +00:00
zenggang
cae0dba070 * Fix bug15438 for classic mode 2021-10-14 09:32:03 +00:00
hufangzhou
52e49919d2 * Code for bug #15518. 2021-10-14 13:51:59 +08:00
朱金勇
a7b043f7b2 Merge branch 'sprint/165_zenggang_15439' into '15.6'
Sprint/165 zenggang 15439

See merge request easycorp/zentaopms!52
2021-10-12 14:01:00 +00:00
hufangzhou
bf78fe9be4 * Add the 15.6 version and upgrade. 2021-10-12 09:35:39 +08:00
zenggang
0b7c8943c0 * Fix bug#15438 2021-10-09 09:11:02 +00:00
王怡栋
96a8ef6b04 Merge branch '15.5' into 165 2021-10-09 10:06:05 +08:00
liyuchun
9b5a28392b * Finish task #42854. 2021-09-28 12:31:59 +08:00
zenggang
c6b7f25fa3 * Adjust code style. 2021-09-18 14:08:31 +08:00
zenggang
4380f4d4b0 * Fix bug#14580 2021-09-18 11:01:08 +08:00
zenggang
7650e33988 * Fix bug#15232 2021-09-17 17:23:15 +08:00
tianshujie
70358073e3 * Fix bug #42594. 2021-09-16 11:33:53 +08:00
tianshujie
441cda176d * Modify the global creation return link. 2021-09-15 15:56:19 +08:00
tianshujie
626c95b095 * Fix bug #15162. 2021-09-14 17:24:42 +08:00
tianshujie
87397bf86f * Fix bug #15138. 2021-09-14 11:23:56 +08:00
hufangzhou
b0f587b061 * Fix bug #14835. 2021-09-14 09:57:29 +08:00
liyuchun
1b8e9f4a71 * Finish task #42377. 2021-09-09 10:06:16 +08:00
王怡栋
d2403a6b8e * add new version and upgrade. 2021-09-08 16:00:42 +08:00
孙广明
1c9d3d38c9 * Fix code error. 2021-09-01 13:05:09 +08:00