Skip to content

Stable to develop#939

Merged
joernu76 merged 18 commits intodevelopfrom
stable_to_develop
May 10, 2021
Merged

Stable to develop#939
joernu76 merged 18 commits intodevelopfrom
stable_to_develop

Conversation

@joernu76
Copy link
Member

@joernu76 joernu76 commented May 10, 2021 •
edited
Loading

CAREFUL

This merge request must be merged without semi-linear history.

Marilyth and others added 18 commits April 30, 2021 13:53
@Marilyth
Fix signal leak (#874)
c91efd1
@Marilyth
Check path doesn't contain illegal characters (#877)
b51336b
@Marilyth
Fix not all windows closing (#880)
f77981a
@ReimarBauer
enable login for stored credential (#882)
6463cf1
@Marilyth @ReimarBauer
Fix text changed leak (#884)
f3ab3b8 
Co-authored-by: ReimarBauer <rb.proj@gmail.com>
@ReimarBauer
catch max retries error (#885)
c0a0336 
* catch max retries error

* show in error message mscolab server url
@ReimarBauer
prepare v3.0.2 (#878)
e03301d
@joernu76
Fix conversion problem for dimensionless units such as "1" (#890)
006ed89 
Fix issue #889
@ReimarBauer @joernu76
about new features link fixed (#891)
5367fb7 
* about new features link fixed

* improved url name

* removed re search

Co-authored-by: J. Ungermann <j.ungermann@fz-juelich.de>
@Marilyth
fix load config error (#893)
283fab5
@joernu76
Properly handle closing of Views. (#895)
82959f8 
Fix issue #894
@joernu76
Compare with proper string for authorization (#905)
06f6f30 
Fix issue #904
@Marilyth
Fix scaling hitboxes (#935)
a1da5f7
@Marilyth @joernu76
Hotfix for #901 (#932)
1a15a95 
* Hotfix for 901

* Only replace if exists

Co-authored-by: J. Ungermann <j.ungermann@fz-juelich.de>
@ReimarBauer
Fatal error in config loader because of invalid character, related to #…
4ad43ea 
…901 (#936)

* use MSS_SETTINGS if nothing is cached

* save path to cached_config_file

* condition improved for default of self.path

* file_save_and_quit skipped, because of changing setup for all other tests

* saves as to default first, then configeditor
@ReimarBauer
mscolab working locally without created ~/mss folder, fixes #900 (#931)
3bbc084 
* working locally without ~/mss folder, fixes #900

* improved parameter handling
@Marilyth
Make testsuite more stable (#937)
6629d71
@joernu76
Merge branch 'stable' into stable_to_develop
255a01a
@joernu76 joernu76 requested a review from ReimarBauer May 10, 2021 10:57
@joernu76
Copy link
Member Author

joernu76 commented May 10, 2021 •
edited
Loading

edit: posted to wrong thread

ReimarBauer
ReimarBauer approved these changes May 10, 2021
View reviewed changes
Copy link
Member

@ReimarBauer ReimarBauer left a comment

Choose a reason for hiding this comment

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

thx

@ReimarBauer
Copy link
Member

ReimarBauer commented May 10, 2021

Ran into this error:

CRITICAL: Platform: Linux-5.10.0-6-amd64-x86_64-with-glibc2.10 (('64bit', 'ELF'))
CRITICAL: Fatal error: Traceback (most recent call last):
  File "/home/icg173/src/mss/mslib/msui/wms_control.py", line 1071, in init_time_changed
    self.multilayers.get_current_layer().set_itime(self.cbInitTime.currentText())
  File "/home/icg173/src/mss/mslib/msui/multilayers.py", line 642, in set_itime
    self.set_vtime()
TypeError: set_vtime() missing 1 required positional argument: 'vtime'

To reproduce:
init time on 2021-05-09T00 valid time on 2021-05-09T12
choose init time 2021-05-10T00 -> error

@joernu76 please file this as question/bug to stable

@joernu76
Copy link
Member Author

joernu76 commented May 10, 2021

Arg, sorry, wrong PR!

@joernu76 joernu76 merged commit 3e6160c into develop May 10, 2021
@joernu76 joernu76 deleted the stable_to_develop branch May 12, 2021 08:50
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@ReimarBauer ReimarBauer ReimarBauer approved these changes

Assignees

No one assigned

Labels

None yet

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

3 participants

@joernu76 @ReimarBauer @Marilyth