 wangzemei
|
5974c2bb13
|
Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms into sprint/247_wzm_72350
|
2022-10-20 09:22:29 +08:00 |
|
|
王怡栋
|
5bed328848
|
Merge branch 'master_feedback_1133' into 'master'
* Adjust code format.
See merge request easycorp/zentaopms!5815
|
2022-10-20 00:30:53 +00:00 |
|
|
wangzemei
|
244f9ac4b2
|
* finish task
|
2022-10-19 21:26:24 +08:00 |
|
|
liuhong
|
f756b892d6
|
* Adjust code format.
|
2022-10-19 12:53:54 +00:00 |
|
|
孙广明
|
563f523f9c
|
Merge branch 'sprint/247_tianshujie_fixbug' into 'master'
* Fix bug #28499.
See merge request easycorp/zentaopms!5810
|
2022-10-19 09:04:51 +00:00 |
|
|
李玉春
|
45db98047c
|
Merge branch 'cyy_bug' into 'master'
* Fix bug #28128.
See merge request easycorp/zentaopms!5814
|
2022-10-19 09:03:36 +00:00 |
|
|
李玉春
|
4aeb260282
|
Merge branch 'sprint/247_wangzemei_28395' into 'master'
* Solve width calculation problems
See merge request easycorp/zentaopms!5807
|
2022-10-19 09:02:52 +00:00 |
|
|
曹延义
|
e16a4eb765
|
* Fix bug #28128.
|
2022-10-19 17:01:56 +08:00 |
|
|
wangzemei
|
18226622ab
|
show imgs
|
2022-10-19 17:01:31 +08:00 |
|
|
孙广明
|
ec22de682f
|
Merge branch 'biz13_mayue_bug#28337' into 'master'
* Add the status column of Kanban import ticket.
See merge request easycorp/zentaopms!5812
|
2022-10-19 08:59:05 +00:00 |
|
|
王怡栋
|
7ed78a0b05
|
Merge branch 'master_feedback_420' into 'master'
* Adjust the code format.
See merge request easycorp/zentaopms!5806
|
2022-10-19 08:57:34 +00:00 |
|
|
王怡栋
|
e3f2bce7ca
|
Merge branch 'tanghucheng_feedback_module' into 'master'
* Fix bug #28684.
See merge request easycorp/zentaopms!5811
|
2022-10-19 08:55:39 +00:00 |
|
|
mayue
|
06e4a05403
|
* Add the status column of Kanban import ticket.
|
2022-10-19 16:36:01 +08:00 |
|
|
tanghucheng
|
c0a9e98cd1
|
* Fix bug #28684,28680.
|
2022-10-19 15:42:46 +08:00 |
|
|
tianshujie
|
80f9e9ab61
|
* Fix bug #28499.
|
2022-10-19 15:34:54 +08:00 |
|
|
wangzemei
|
062e796b01
|
* show echarts autoPlay
|
2022-10-19 15:27:14 +08:00 |
|
|
wangzemei
|
700f08b5d5
|
* show echarts autoPlay
|
2022-10-19 15:24:40 +08:00 |
|
|
孙广明
|
af6634eaad
|
Merge branch 'biz13_mayue_bug#28666' into 'master'
* Fix bug #28666.
See merge request easycorp/zentaopms!5809
|
2022-10-19 07:17:43 +00:00 |
|
|
mayue
|
1221260f0b
|
* Fix bug #28666.
|
2022-10-19 15:13:16 +08:00 |
|
|
wangzemei
|
84f1b64aae
|
* remove useless class
|
2022-10-19 14:35:12 +08:00 |
|
|
wangzemei
|
25f8023fef
|
* Solve width calculation problems
|
2022-10-19 14:31:55 +08:00 |
|
|
liuhong
|
6133c2ca58
|
* Adjust the code format.
|
2022-10-19 06:25:39 +00:00 |
|
|
王怡栋
|
171ad26855
|
Merge branch 'master_feedback_1133' into 'master'
* Adjust the code format.
See merge request easycorp/zentaopms!5805
|
2022-10-19 06:21:49 +00:00 |
|
|
liuhong
|
a7765cfae8
|
* Adjust the code format.
|
2022-10-19 06:13:35 +00:00 |
|
|
王怡栋
|
cb645f4d50
|
Merge branch 'tanghucheng_feedback_module' into 'master'
* Fix bug #28639.
See merge request easycorp/zentaopms!5801
|
2022-10-19 06:11:24 +00:00 |
|
|
hufangzhou
|
10c07b964f
|
* Added empty row for alignment.
|
2022-10-19 06:06:26 +00:00 |
|
|
tanghucheng
|
14f82baf7e
|
* Fix bug #28639.
|
2022-10-19 13:57:00 +08:00 |
|
|
hufangzhou
|
d3f7df5518
|
* Add the new version.
|
2022-10-19 05:41:40 +00:00 |
|
|
王怡栋
|
cdb458bb9f
|
Merge branch 'master_feedback_1133' into 'master'
*Fix feedback #1133 for waterfall project choose stagefilteri with Related pages.
See merge request easycorp/zentaopms!5796
|
2022-10-19 05:29:12 +00:00 |
|
|
王怡栋
|
7497d48e95
|
Merge branch 'tanghucheng_feedback_module' into 'master'
* Fix bug #28647.
See merge request easycorp/zentaopms!5793
|
2022-10-19 05:18:05 +00:00 |
|
|
李玉春
|
a18bb50ef9
|
Merge branch 'sprint/247_tianshujie_fixbug' into 'master'
* Fixed maintenance task team style issues.
See merge request easycorp/zentaopms!5795
|
2022-10-19 05:13:36 +00:00 |
|
|
liuhong
|
db48df1bb5
|
*Fix feedback #1133 for waterfall project choose stagefilteri with Related pages.
|
2022-10-19 05:09:01 +00:00 |
|
|
tianshujie
|
056358363d
|
* Fixed maintenance task team style issues.
|
2022-10-19 11:56:03 +08:00 |
|
|
tanghucheng
|
30bf3b8d3d
|
* Add language for tree.
|
2022-10-19 11:25:31 +08:00 |
|
|
wangzemei
|
268feebd44
|
Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms into sprint/247_wzm_72350
|
2022-10-19 11:10:09 +08:00 |
|
|
wangzemei
|
68f702d9ef
|
* fix 28395 28640 28406
|
2022-10-19 11:07:04 +08:00 |
|
|
tanghucheng
|
7959557283
|
* Fix bug #28647.
|
2022-10-19 11:05:35 +08:00 |
|
|
wangzemei
|
5b1f27fb47
|
* stash modify
|
2022-10-19 10:15:58 +08:00 |
|
|
王怡栋
|
e093a27d20
|
Merge branch 'master' into 'tanghucheng_feedback_module'
# Conflicts:
# db/update17.6.2.sql
|
2022-10-19 01:36:16 +00:00 |
|
|
tanghucheng
|
484cffa1a1
|
* Add ticket module.
|
2022-10-19 09:33:26 +08:00 |
|
|
tianshujie
|
5af1516780
|
* Finish task #72350.
|
2022-10-19 09:28:35 +08:00 |
|
|
李玉春
|
ada905ca46
|
Merge branch 'sprint/247_tianshujie_fixbug' into 'master'
* Fix bug #28573.
See merge request easycorp/zentaopms!5787
|
2022-10-19 01:14:12 +00:00 |
|
|
王怡栋
|
dfe8483aea
|
Merge branch 'tanghucheng_feedback_module' into 'master'
* Fix bug #28624.
See merge request easycorp/zentaopms!5786
|
2022-10-19 00:26:33 +00:00 |
|
|
tianshujie
|
80ee6fb2b1
|
* Fix bug #28573.
|
2022-10-19 08:25:02 +08:00 |
|
|
tanghucheng
|
9ea2d135b3
|
* Fix bug #28624.
|
2022-10-18 17:29:34 +08:00 |
|
|
wangzemei
|
e4126b0778
|
* rename classname
|
2022-10-18 16:36:25 +08:00 |
|
|
wangzemei
|
bf166ccbfb
|
* remove unused file
|
2022-10-18 16:34:30 +08:00 |
|
|
wangzemei
|
11a5a5fbf3
|
* task 72350
|
2022-10-18 16:32:06 +08:00 |
|
|
孙广明
|
412c1a68fe
|
Merge branch 'zentaobiz_zhouxin_ticket' into 'master'
* Fix bug.
See merge request easycorp/zentaopms!5784
|
2022-10-18 07:56:51 +00:00 |
|
|
王怡栋
|
9264c95e92
|
Merge branch 'master_feedback_1133' into 'master'
*Finish feedback #1133.
See merge request easycorp/zentaopms!5780
|
2022-10-18 07:37:04 +00:00 |
|