Skip to content

Release 4.0#436

Merged
MarcelGeo merged 60 commits intomasterfrom
develop
May 2, 2025
Merged

Release 4.0#436
MarcelGeo merged 60 commits intomasterfrom
develop

Conversation

@MarcelGeo
Copy link
Collaborator

@MarcelGeo MarcelGeo commented Apr 29, 2025

No description provided.

harminius and others added 30 commits April 2, 2025 10:27
@harminius
Don't allow SSO users update their profile (#416)
49fca15 
* Show 'Change password' and 'Edit profile' only when user created account through our registration form

* Backend blocks update profile for SSO users

* Allow creating mock of SSO user

* Add test for admin

* black .

* Add checks for others methods, address reviews

* decorate can_edit_profile

* black .

* Do not duplicate can_edit_profile check
@harminius
Send SSO connections for server in statistics
fe34b9f
@MarcelGeo
Merge pull request #417 from MerginMaps/sso_statistics
0606136 
Send SSO connections for server in statistics
@MarcelGeo
Add service id to server check command
46f95c7
@MarcelGeo
Merge pull request #419 from MerginMaps/add-service-id-to-server-check
4131094 
Add service id to `server check` command
@harminius
Add possibility to lock a project
bfd28c3 
- add column to project table
- block push
- do not count to workspace storage and project number
@harminius
Adjust error type and message
d919799
@varmar05
Initial version for zip download rework
28ca996
@harminius
Make prpoerty optional for an external link
a5b7290
@MarcelGeo
Merge pull request #425 from MerginMaps/boxy_link_to_admin
aff5104 
Make sidebarItem proerty optional for an external link
@harminius
Add custom error for blocking push to locked project
6e07388
@MarcelGeo
Merge pull request #422 from MerginMaps/frozen_remove_after
80340be 
Add possibility to lock a project
@harminius
Merge remote-tracking branch 'origin/develop' into rewrite_zip_download
70c0c7c
@harminius
Move download() function to private api
7ce05d6
@harminius
Add safecheck for inactive partials
e09fe49
@harminius
Tests
0b9fd20
@harminius
Rm legacy tests
c8bc4b6
@harminius
Rm unused deps
75e5255
@harminius
Fix marshmallow version
4b6a743
@harminius
Fix marshmallow version II
d32fb67
@MarcelGeo
initial version of fe
a30aac2 
- timeut for downloadArchive
- admin, project dashboard and project version download
@MarcelGeo
Merge pull request #431 from MerginMaps/master
a44e9ca 
Backport master to develop
@MarcelGeo
cleanup docker-compose
a8dcfc1
@MarcelGeo
Merge remote-tracking branch 'origin/develop' into rewrite_zip_download
f811c96
@MarcelGeo
Cleanup of version and more detailed description about /download endp…
9661ed2 
…oint
@MarcelGeo
Introduce get_x_accel method to create valid accel url for nginx
fbb56af
@MarcelGeo
add max 100 retries for download
272ceef
@MarcelGeo
cancel using method + make retries maximum working properly
900902e
@MarcelGeo
Cleanup of download progress
ede4e3c
@harminius
Address review
2629588 
- add test for 200
- increase max download size limit to 20GB
- functions description
- partial archive expiration in seconds
@MarcelGeo MarcelGeo requested a review from varmar05 April 29, 2025 09:30
@coveralls
Copy link

coveralls commented Apr 29, 2025 •
edited
Loading

Pull Request Test Coverage Report for Build 14793595278

Details

  • 199 of 220 (90.45%) changed or added relevant lines in 22 files are covered.
  • 40 unchanged lines in 2 files lost coverage.
  • Overall coverage decreased (-0.6%) to 91.641%
Changes Missing Coverage Covered Lines Changed/Added Lines %
server/mergin/auth/app.py 10 11 90.91%
server/mergin/sync/public_api_controller.py 6 7 85.71%
server/mergin/auth/controller.py 6 9 66.67%
server/mergin/sync/private_api_controller.py 24 29 82.76%
server/mergin/sync/tasks.py 24 29 82.76%
server/mergin/commands.py 0 6 0.0%
Files with Coverage Reduction New Missed Lines %
server/mergin/sync/storages/disk.py 15 81.01%
server/mergin/sync/storages/storage.py 25 44.44%
Totals Coverage Status
Change from base Build 14619139561: -0.6%
Covered Lines: 6951
Relevant Lines: 7585
💛 - Coveralls

harminius and others added 17 commits April 30, 2025 09:57
@harminius
Fix link in project access request email
c206f99
@MarcelGeo
Merge pull request #439 from MerginMaps/Mergin_base_url_in_invitations
da5ac28 
Fix link in project access request email
@MarcelGeo
initial gradient
d3f069b
@MarcelGeo
tweaks for default values for download
28f664f 
- introduce new varibles for download to .env.templates
@MarcelGeo
Update texts:
04dec00 
- in case of preparing archive
- in case of big file
- introduce 413 status code for file is too large archive
@MarcelGeo
Return 400 instad 413 of large files
d01812d 
- upgrades for large files error
@MarcelGeo
Add error message for large files to admin
6b09bb3
@MarcelGeo
Merge pull request #440 from MerginMaps/release-tweaks
92c485c 
Release tweaks
@MarcelGeo
Added primary and info severity. info is just fallback
b70a218
@varmar05
Send corresponding signal whenever new project member is added
da78ad7
@MarcelGeo
add severity as optional param
9dc0ad1
@MarcelGeo
Merge pull request #441 from MerginMaps/add-severity-app-section-banner
1d45960 
Add severity app section banner
@MarcelGeo
Merge pull request #443 from MerginMaps/fix_inconsistent_permissions
5b9dbfa 
Send corresponding signal whenever new project member is added
@MarcelGeo
call download project version properly from version details
8883296
@MarcelGeo
preparing download and use downloadArchive polling
22bdbb3
@MarcelGeo
add ) to text
24f6fab
@MarcelGeo
Merge pull request #444 from MerginMaps/fix-download-version-rom-detail
b76db66 
call download project version properly from version details
@MarcelGeo MarcelGeo merged commit 7c81a88 into master May 2, 2025
4 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@varmar05 varmar05 Awaiting requested review from varmar05

Assignees

No one assigned

Labels

None yet

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

4 participants

@MarcelGeo @coveralls @harminius @varmar05