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 v4.3.0 #100

Merged
merged 49 commits into from
Apr 1, 2020
Merged

Release v4.3.0 #100

merged 49 commits into from
Apr 1, 2020

Conversation

irojkov-ph
Copy link
Contributor

Release v4.3.0

See tag for more information

eozd and others added 30 commits November 6, 2019 10:13
@eozd
Add badges with various info about repository
0bcb60b
@irojkov-ph
Merge pull request #69 from bachlab/badges
b1590a2 
Add badges with various info about repository
@irojkov-ph
Changed the url in pspm_version.m
7562e7a
@eozd
Merge pull request #70 from bachlab/request40/pspm_version
61d8d41 
Changed the url in pspm_version.m
@eozd
Add build status badge
400ddfa
@eozd
Add build status to README
6583016
@irojkov-ph
Merge pull request #72 from bachlab/build_status_badge
b053549 
Build status badge
@irojkov-ph
changed marker catching process for eylink files
8d35065
@irojkov-ph
Bug fixed
5b4af7b
@irojkov-ph
Merge pull request #73 from bachlab/fix/issue67
7eaef73 
Fix/issue67 : New procedure for catching markers in an Eyelink file
@irojkov-ph
Added a warning for markers with same timestamp
9f87351
@irojkov-ph
Merge pull request #74 from bachlab/fix/issue67(bis)
af98722 
Added a warning for markers with same timestamps
@irojkov-ph
Added a warning in the tutorial about the toolbox.
00c1dae
@irojkov-ph
Merge pull request #81 from bachlab/fix/issue80
9a6ed16 
Added a warning in the tutorial about the toolbox.
@irojkov-ph
test
3d7317e
@irojkov-ph
Final changes for extract_segments
6bbdb06
@irojkov-ph
Revert some unwanted modification
ab4283e
@irojkov-ph
Small change
5817459
@irojkov-ph
let to choose any timeunit
5bba0c6
@irojkov-ph
Added pupil and gaze coord units
c56ba3e
@irojkov-ph
Merge branch 'issue/extract_segm' of https://github.com/bachlab/PsPM …
672431c 
…into feature82/pspm_display
@irojkov-ph
Changed the bf_lcrf and bf_ldrf
084db27
@irojkov-ph
Merge branch 'feature82/pspm_display' of https://github.com/bachlab/PsPM
41eabcd 
 into feature50/pupil_model
@irojkov-ph
Merge pull request #94 from bachlab/doc/update-data-links
6224b7a 
Change GLM and DCM tutorial data links

(cherry picked from commit 45b14e2)
@eozd @irojkov-ph
Merge pull request #83 from bachlab/issue/extract_segm
8fc1287 
Improvement for pspm_extract_segments

(cherry picked from commit d278181)
@irojkov-ph
Merge pull request #92 from bachlab/feature78/sps_spl
7f83e45 
Feature78/sps spl

(cherry picked from commit 5f39b14)
@irojkov-ph
Merge pull request #98 from bachlab/issue/yanfang
c1d49cc 
Issue/yanfang

(cherry picked from commit a72aff1)
@irojkov-ph
Reorganise './doc/' folder
13e83f0
@irojkov-ph
Create './ext/' folder
5c106af
@irojkov-ph
Update addpaths according to the change of folders
7a7d4b6
irojkov-ph added 19 commits March 30, 2020 12:38
@irojkov-ph
Update test functions according to the new folders
71dfcb5
@irojkov-ph
Update the version number
dcaa226
@irojkov-ph
Add the release note
742bc14
@irojkov-ph
Modify glm and document the new feature
118293a
@irojkov-ph
Modify text style of release note
c08de22
@irojkov-ph
Update manuals wrt to extract segments new feature
6880038
@irojkov-ph
Add minor changes
cd0148e
@irojkov-ph
Remove information about pfm
0207d78
@irojkov-ph
Move the './ext/' folder into './src/'
660ff37
@irojkov-ph
Delete './src/Data/' folder
6fe8033
@irojkov-ph
Update pspm_path and addpath occurencies
eabc1b0
@irojkov-ph
Update Manual
4ea5fe1
@irojkov-ph
Update the release checklist wrt. github
86346ae
@irojkov-ph
Add release message in release_notes.tex
97e57b4
@irojkov-ph
Revert "Merge pull request #98 from bachlab/issue/yanfang"
0bdc891 
This reverts commit c1d49cc.
@irojkov-ph
Change basis functions follow-up discussion with Y
1e210f3
@irojkov-ph
Modify the gamma bf according to Yanfang data
eaac059
@irojkov-ph
Delete the glm's new feature from Manual
999229a
@irojkov-ph
Delete the glm's new feature from release notes
a89c8fd
@irojkov-ph irojkov-ph added this to the v4.3.0 milestone Apr 1, 2020
@irojkov-ph irojkov-ph requested a review from eozd April 1, 2020 09:15
@irojkov-ph irojkov-ph self-assigned this Apr 1, 2020
eozd
eozd approved these changes Apr 1, 2020
View reviewed changes
Copy link
Contributor

@eozd eozd left a comment

Choose a reason for hiding this comment

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

LGTM

@irojkov-ph irojkov-ph merged commit f95d48b into master Apr 1, 2020
@irojkov-ph irojkov-ph deleted the hotfix/4.3.0 branch April 1, 2020 10:06
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@eozd eozd eozd approved these changes

Assignees

@irojkov-ph irojkov-ph

Labels
None yet
Projects
None yet
Milestone
v4.3.0
Development

Successfully merging this pull request may close these issues.
2 participants
@irojkov-ph @eozd