Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Release 6.1.2 update #613

Closed
wants to merge 42 commits into from
Closed

Release 6.1.2 update #613

wants to merge 42 commits into from

Conversation

teddychao
Copy link
Contributor

@teddychao teddychao commented Jan 25, 2024 •
edited

Put everything available in the branch 6.1.2 release to develop.

teddychao and others added 30 commits December 18, 2023 17:19
@teddychao
Update pspm_convert_ppg2hb.m
e664523
@teddychao
Update pspm_cfg_run_interpolate.m
1a78e81
@teddychao
update
7264cab
@teddychao
update functions
f351809
@teddychao
update functions
f66bc78
@teddychao
update
6df7736
@teddychao
update cfg functions
74dbbca
@teddychao
update
1160ce6
@teddychao
Update pspm_cfg_run_dcm.m
f9d429f
@teddychao
update update_struct
03b9b9e
@teddychao
update
ff38200
@teddychao
Merge branch 'develop' into 559-pspm_convert_ppg2hb-supports-both-opt…
ff130ac 
…ionsreplace-and-optionschannel_action
@teddychao
Merge branch 'develop' into 559-pspm_convert_ppg2hb-supports-both-opt…
eb34c44 
…ionsreplace-and-optionschannel_action
@teddychao
update functions
a17bcaa
@teddychao
Merge branch '559-pspm_convert_ppg2hb-supports-both-optionsreplace-an…
aeb1f0d 
…d-optionschannel_action' of https://github.com/bachlab/PsPM into 559-pspm_convert_ppg2hb-supports-both-optionsreplace-and-optionschannel_action
@teddychao
Merge branch 'develop' into 559-pspm_convert_ppg2hb-supports-both-opt…
98b4416 
…ionsreplace-and-optionschannel_action
@teddychao
update functions
740c8d6
@teddychao
Merge branch '559-pspm_convert_ppg2hb-supports-both-optionsreplace-an…
f50fd41 
…d-optionschannel_action' of https://github.com/bachlab/PsPM into 559-pspm_convert_ppg2hb-supports-both-optionsreplace-and-optionschannel_action
@teddychao
update
45929a3
@teddychao
update CFG
806e1d0
@teddychao
Update pspm_cfg_run_artefact_rm.m
b27df55
@teddychao
minor update
bf93d03
@teddychao
Update pspm_cfg_run_dcm.m
d7638be
@teddychao
minor update
2368eed
@teddychao
minor fix
c4f1c85
@teddychao
Merge branch 'fix-578' into 561-release-version-611
da304e3
@teddychao
Merge branch 'develop' into 561-release-version-611
a31d3a1
@uzaygokay
Update pspm_msg.txt
37a247d
@uzaygokay
Update pspm_quit.m
1257133
@uzaygokay
Update pspm_ui.m
5a77505
@teddychao teddychao marked this pull request as ready for review January 25, 2024 19:06
@teddychao teddychao changed the title Release 6 1 2 update Release 6.1.2 update Jan 25, 2024
@teddychao teddychao self-assigned this Jan 25, 2024
@teddychao teddychao added the Completed & Waiting for Review Completed and waiting for review label Jan 25, 2024
@teddychao teddychao added this to the v6.1.2 milestone Jan 25, 2024
@dominikbach dominikbach removed the request for review from uzaygokay January 26, 2024 08:09
dominikbach
dominikbach requested changes Jan 26, 2024
View reviewed changes
Copy link
Contributor

@dominikbach dominikbach left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This pull request contains the same bug noted in previous pull requests:
#562
#584
this has not been fixed - the same error still occurs when running the "import" step of the GLM tutorial. Release 6.1.2 should be created fro the develop branch.

@teddychao teddychao closed this Jan 26, 2024
@teddychao
Copy link
Contributor Author

Hi @dominikbach
Apologies. I seem to have selected the wrong branch. Let me update the release.
Best wishes
Teddy

@teddychao teddychao deleted the release_6_1_2_update branch January 26, 2024 12:01
@teddychao teddychao removed the Completed & Waiting for Review Completed and waiting for review label Feb 26, 2024
@teddychao teddychao mentioned this pull request Apr 8, 2024
Merged
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@dominikbach dominikbach dominikbach requested changes

Assignees

@teddychao teddychao

Labels
None yet
Projects
None yet
Milestone
v6.1.2
Development

Successfully merging this pull request may close these issues.

None yet
3 participants
@teddychao @dominikbach @uzaygokay