Skip to content

Integrate last sign in #551

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
Open
harminius wants to merge 15 commits into
base: develop
Choose a base branch
from
Open

Integrate last sign in #551

harminius wants to merge 15 commits into from

Conversation

@harminius
Copy link
Contributor

@harminius harminius commented Jan 9, 2026 •
edited
Loading

Resolves https://github.com/MerginMaps/server-private/issues/3077

Updates

  • collaborators tab - decrease number of columns and put all user name info together
  • common UserSummary component created = avatar + fullname if present + username + email

Collaborators:
image

User detail in admin
Screenshot from 2026-01-12 16-52-17

varmar05
varmar05 reviewed Jan 13, 2026
View reviewed changes
@varmar05
Copy link
Collaborator

varmar05 commented Jan 13, 2026

@harminius can you check tests? I thought we already fixed gevent timeout issues.

@coveralls
Copy link

coveralls commented Jan 13, 2026 •
edited
Loading

Pull Request Test Coverage Report for Build 20999070300

Details

  • 4 of 6 (66.67%) changed or added relevant lines in 4 files are covered.
  • No unchanged relevant lines lost coverage.
  • Overall coverage decreased (-0.02%) to 94.344%
Changes Missing Coverage Covered Lines Changed/Added Lines %
server/mergin/auth/controller.py 1 3 33.33%
Totals Coverage Status
Change from base Build 20922162384: -0.02%
Covered Lines: 8023
Relevant Lines: 8504
💛 - Coveralls

@harminius harminius changed the base branch from master to develop January 13, 2026 13:42
MarcelGeo
MarcelGeo requested changes Jan 13, 2026
View reviewed changes
server/mergin/sync/models.py Outdated
workspace_role: WorkspaceRole
project_role: Optional[ProjectRole]
role: ProjectRole
fullname: str
Copy link
Collaborator

@MarcelGeo MarcelGeo Jan 13, 2026

Choose a reason for hiding this comment

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

i think use unified value name here

@harminius harminius requested a review from MarcelGeo January 14, 2026 15:10
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@varmar05 varmar05 varmar05 approved these changes

@MarcelGeo MarcelGeo Awaiting requested review from MarcelGeo

Requested changes must be addressed to merge this pull request.

Assignees

No one assigned

Labels

None yet

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

5 participants

@harminius @varmar05 @coveralls @MarcelGeo