Skip to content

Merge stable to develop#876

Merged
ReimarBauer merged 14 commits intodevelopfrom
merge_stable_to_develop
Apr 30, 2021
Merged

Merge stable to develop#876
ReimarBauer merged 14 commits intodevelopfrom
merge_stable_to_develop

Conversation

@joernu76
Copy link
Member

No description provided.

ReimarBauer and others added 13 commits April 21, 2021 09:52
Co-authored-by: ReimarBauer <[email protected]>
* replaced some nice, but unparseable unit strings
* fixed wrong conversion ratios
* added test

Co-authored-by: ReimarBauer <[email protected]>
Temporary hot fix.
Co-authored-by: ReimarBauer <[email protected]>
* improved installation guide

* Update installation.rst

typo fixed
* fixed mscolab permission upgrade

in the server code a line reverted from 3db9e60
because of SQLLite objects created in a thread cam only be used in that
same thread also the API for submitting the access_level extended.

* superfluous linebreak removed
* enable relogin, don't clear password entry

* remove storing/using email from settings

* enabled cycling of login data by disconnect/connect

* http authentication cancelable, feadback to user

* simplified authenticate

* Marilyth:auth-login-fix added to fix #849
* Update mscolab login

* updated file

Co-authored-by: ReimarBauer <[email protected]>
@joernu76
Copy link
Member Author

NOTE: This pull request must neither be squased nor rebased, but merged with a MERGE COMMIT.

@joernu76 joernu76 requested a review from ReimarBauer April 30, 2021 11:54
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.

much work done :)

@ReimarBauer ReimarBauer merged commit 3605e3d into develop Apr 30, 2021
@joernu76 joernu76 deleted the merge_stable_to_develop branch May 3, 2021 12:25
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants