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

Merge stable into develop #1779

Merged
merged 14 commits into from
May 5, 2023
Merged

Merge stable into develop #1779

merged 14 commits into from
May 5, 2023

Conversation

ReimarBauer
Copy link
Member

this needs a merge

joernu76 and others added 14 commits April 28, 2023 08:48
@joernu76
Small UI bug fixes to MSUI/MSCOlab UI (#1759)
657d0f7 
* Only one flighttrack/operation/inactive operation can be selected.
* "Activate operation" is now disablked by default
* Only one flighttrack/operation can be displayed in bold

Fix #1756, #1755, #1752
@joernu76 @ReimarBauer
Issue1754 (#1757)
bae2d42 
* renamed inactive/active operations to ''/archived

Fix #1754

* function to archive existing operations

---------

Co-authored-by: ReimarBauer <rb.proj@gmail.com>
@joernu76 @ReimarBauer
Fixed several activation/selection bugs in flight track/operation han… (
61e2bf3 
#1761)

* Fixed several activation/selection bugs in flight track/operation handling

Fix #1760

* additional fixes

---------

Co-authored-by: ReimarBauer <rb.proj@gmail.com>
@ReimarBauer
improved usage of docker containers for devs (#1763)
dad6019
@ReimarBauer @joernu76
fixes useability bug of migration (#1767)
ca50218 
doing what the user expects

Co-authored-by: J. Ungermann <j.ungermann@fz-juelich.de>
@ReimarBauer @joernu76
use only none archived operations for cloning of permissions (#1768)
5616efa 
Co-authored-by: J. Ungermann <j.ungermann@fz-juelich.de>
@ReimarBauer @joernu76
fixed link problem (#1771)
891bc2a 
Co-authored-by: J. Ungermann <j.ungermann@fz-juelich.de>
@ReimarBauer @joernu76
trigger navbar action when it was clicked for viewer (#1769)
6770e11 
* trigger navbar action when it was clicked for viewer

this releases the button clicked

* link corrected

* undo link change

* undo

---------

Co-authored-by: J. Ungermann <j.ungermann@fz-juelich.de>
@ReimarBauer @joernu76
use the name of the old active OP for the user who deletes an OP (#1765)
d7b424c 
Co-authored-by: J. Ungermann <j.ungermann@fz-juelich.de>
@ReimarBauer
prepare v8.1.0 (#1772)
870724f
@ReimarBauer
update flask (#1774)
7ad0dae
@ReimarBauer
mscolab pictures for tutorial updated (#1776)
f4275f3 
* update flask

* pictures updated
@ReimarBauer
more exceptions for pint (any defined unit) (#1778)
580c729 
* update flask

* encapsulating of any unit definition

ToDos added
@ReimarBauer
Merge branch 'stable' into merge_stable_into_develop
3d64cd3
@ReimarBauer ReimarBauer requested a review from joernu76 May 5, 2023 13:35
@ReimarBauer ReimarBauer merged commit 665e2fd into develop May 5, 2023
@ReimarBauer ReimarBauer deleted the merge_stable_into_develop branch May 5, 2023 15:10
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@joernu76 joernu76 joernu76 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.
2 participants
@ReimarBauer @joernu76