王怡栋
|
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
|
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 |
|
王怡栋
|
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 |
|
李玉春
|
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 |
|
孙广明
|
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 |
|
zhouxin
|
efbbc8a15e
|
* Fix bug.
|
2022-10-18 15:34:05 +08:00 |
|
tanghucheng
|
6c063505d6
|
Merge branch 'master' into tanghucheng_feedback_module
|
2022-10-18 15:33:45 +08:00 |
|
tanghucheng
|
6ed33f54dc
|
* Adjust modify comments.
|
2022-10-18 15:31:42 +08:00 |
|
tanghucheng
|
ccd017af47
|
* Finish task #72201,72130,72129.
|
2022-10-18 15:04:35 +08:00 |
|
liuhong
|
d7bb46cda5
|
*Finish feedback #1133.
|
2022-10-18 05:46:27 +00:00 |
|
李玉春
|
a3104fec30
|
Merge branch 'sprint/247_wzm_72349' into 'master'
Sprint/247 wzm 72349
See merge request easycorp/zentaopms!5774
|
2022-10-18 05:11:01 +00:00 |
|
wangzemei
|
9eb84fcc4e
|
* modify format
|
2022-10-18 13:06:15 +08:00 |
|
王怡栋
|
2ca0f0cf0c
|
Merge branch 'sprint/247' into 'master'
Sprint/247
See merge request easycorp/zentaopms!5757
|
2022-10-18 02:01:53 +00:00 |
|
王怡栋
|
c46e0d5c7b
|
Merge branch 'sprint/cdq_codereview' into 'master'
* code review
See merge request easycorp/zentaopms!5773
|
2022-10-18 01:58:03 +00:00 |
|
wangzemei
|
0b2907217f
|
* replace input component
|
2022-10-18 09:43:23 +08:00 |
|
chaideqing
|
e50dbc5be3
|
* code review
|
2022-10-18 09:39:39 +08:00 |
|
lanzongjun
|
3d2667f818
|
remove line
|
2022-10-18 09:32:16 +08:00 |
|
lanzongjun
|
aa6546a2ee
|
resolve conflict
|
2022-10-18 09:26:14 +08:00 |
|
wangzemei
|
7075426106
|
Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms into sprint/247_wzm_72349
|
2022-10-18 08:56:26 +08:00 |
|
周鑫
|
544b1418fe
|
Merge branch 'zentaobiz_ticket_zhouxin' into 'sprint/zentaobiz12_ticket'
* Fix bugs.
See merge request easycorp/zentaopms!5771
|
2022-10-17 15:06:13 +00:00 |
|
zhouxin
|
9593f24d92
|
* Fix bugs.
|
2022-10-17 23:05:00 +08:00 |
|
李玉春
|
bb90adf795
|
Merge branch 'sprint/247_tianshujie_fixbug' into 'master'
Sprint/247 tianshujie fixbug
See merge request easycorp/zentaopms!5759
|
2022-10-17 09:24:39 +00:00 |
|
李玉春
|
90b695432b
|
Merge branch 'sprint/247_tianshujie_72323' into 'master'
* Finish task #72323.
See merge request easycorp/zentaopms!5767
|
2022-10-17 09:23:58 +00:00 |
|
tianshujie
|
bc72a89801
|
* Finish task #72374.
|
2022-10-17 16:59:43 +08:00 |
|
tianshujie
|
e05f1e7f89
|
* Finish task #72374.
|
2022-10-17 16:58:30 +08:00 |
|
tianshujie
|
016125ea7c
|
* Finish task #72324.
|
2022-10-17 16:55:39 +08:00 |
|
tanghucheng
|
e32b0bf2ff
|
* Code for feedback module.
|
2022-10-17 16:55:25 +08:00 |
|
wangzemei
|
5064fc3669
|
* update createTaskTeam style
|
2022-10-17 16:45:59 +08:00 |
|
lanzongjun
|
c87b56d6f5
|
task #71834
|
2022-10-17 16:31:50 +08:00 |
|
tianshujie
|
4245745bec
|
* Finish task #72351.
|
2022-10-17 16:31:40 +08:00 |
|
wangzemei
|
72c1b4819e
|
* finish task #72349
|
2022-10-17 16:24:14 +08:00 |
|
tianshujie
|
f4fdd2c320
|
* Finish task #72323.
|
2022-10-17 16:19:42 +08:00 |
|
tianshujie
|
f9b2fd0aff
|
* Fix bug #28531.
|
2022-10-17 15:46:56 +08:00 |
|
lanzongjun
|
ccae5bfa00
|
Merge branch 'sprint/zentaobiz12_ticket' of https://gitlab.zcorp.cc/easycorp/zentaopms into sprint/zentaobiz12_ticket
|
2022-10-17 15:43:09 +08:00 |
|
lanzongjun
|
b3a7a4406f
|
task #71834
|
2022-10-17 15:43:01 +08:00 |
|