Skip to content
Navigation Menu
Sign in
Appearance settings
Platform
AI CODE CREATION
GitHub Copilot
Write better code with AI
GitHub Copilot app
Direct agents from issue to merge
MCP Registry
Integrate external tools
DEVELOPER WORKFLOWS
Actions
Automate any workflow
Codespaces
Instant dev environments
Issues
Plan and track work
Code Review
Manage code changes
Code Quality
Enforce quality at merge
APPLICATION SECURITY
GitHub Advanced Security
Find and fix vulnerabilities
Code security
Secure your code as you build
Secret protection
Stop leaks before they start
EXPLORE
Why GitHub
Documentation
Blog
Changelog
Marketplace
View all features
Solutions
BY COMPANY SIZE
Enterprises
Small and medium teams
Startups
Nonprofits
BY USE CASE
App Modernization
DevSecOps
DevOps
CI/CD
View all use cases
BY INDUSTRY
Healthcare
Financial services
Manufacturing
Government
View all industries
View all solutions
Resources
EXPLORE BY TOPIC
AI
Software Development
DevOps
Security
View all topics
EXPLORE BY TYPE
Customer stories
Events & webinars
Ebooks & reports
Business insights
GitHub Skills
SUPPORT & SERVICES
Documentation
Customer support
Community forum
Trust center
Partners
View all resources
Open Source
COMMUNITY
GitHub Sponsors
Fund open source developers
PROGRAMS
Security Lab
Maintainer Community
GitHub Stars
Archive Program
REPOSITORIES
Topics
Trending
Collections
Enterprise
ENTERPRISE SOLUTIONS
Enterprise platform
AI-powered developer platform
AVAILABLE ADD-ONS
GitHub Advanced Security
Enterprise-grade security features
Copilot for Business
Enterprise-grade AI features
Premium Support
Enterprise-grade 24/7 support
Pricing
Search
/
Sign in
Sign up
Appearance settings
You signed in with another tab or window.
Reload
to refresh your session.
You signed out in another tab or window.
Reload
to refresh your session.
You switched accounts on another tab or window.
Reload
to refresh your session.
Dismiss alert
{{ message }}
Uh oh!
There was an error while loading.
Please reload this page
.
MerginMaps
/
server
Public
Notifications
You must be signed in to change notification settings
Fork
72
Star
178
Code
Issues
10
Pull requests
4
Actions
Projects
Security and quality
0
Insights
Additional navigation options
Code
Issues
Pull requests
Actions
Projects
Security and quality
Insights
2026.7.0
- #668
#668
Merged
MarcelGeo
merged 35 commits into
master
MerginMaps/server:master
from
develop
MerginMaps/server:develop
Copy head branch name to clipboard
Aug 27, 2026
Conversation
Commits
35
(35)
Checks
Files changed
Merged
2026.7.0
#668
MarcelGeo
merged 35 commits into
master
MerginMaps/server:master
from
develop
MerginMaps/server:develop
Copy head branch name to clipboard
Commits
Commits on Jun 17, 2026
Fixed session cookie gap for deactivated users
Show description for c0d57d2
varmar05
committed
c0d57d2
View commit details
Copy full SHA for c0d57d2
Browse repository at this point
Add configurable bcrypt cost factor
Show description for 26a0698
varmar05
committed
26a0698
View commit details
Copy full SHA for 26a0698
Browse repository at this point
Add temporary account lockout
varmar05
committed
ce00ed3
View commit details
Copy full SHA for ce00ed3
Browse repository at this point
Commits on Jun 19, 2026
Fix tests
varmar05
committed
3373220
View commit details
Copy full SHA for 3373220
Browse repository at this point
Add missing import
varmar05
committed
f2708ce
View commit details
Copy full SHA for f2708ce
Browse repository at this point
Commits on Jun 22, 2026
Support for whitelisting extensions/mimetype
harminius
committed
022e1a9
View commit details
Copy full SHA for 022e1a9
Browse repository at this point
rm debugging residue
harminius
committed
c001c7a
View commit details
Copy full SHA for c001c7a
Browse repository at this point
Commits on Jul 1, 2026
Remove locked_until from response and other minor fixes
varmar05
committed
956e01b
View commit details
Copy full SHA for 956e01b
Browse repository at this point
Merge pull request #640 from MerginMaps/auth_fixes
Show description for 8efd371
MarcelGeo
authored
8efd371
View commit details
Copy full SHA for 8efd371
Browse repository at this point
Commits on Jul 2, 2026
address @MarcelGeo comments - use check_skip_validation -> also skips mimetype check -> mime_type config var is not needed
harminius
committed
64a3844
View commit details
Copy full SHA for 64a3844
Browse repository at this point
Commits on Jul 3, 2026
Merge pull request #643 from MerginMaps/whitelisting_extensions_mimetypes
Show description for 4ddde36
MarcelGeo
authored
4ddde36
View commit details
Copy full SHA for 4ddde36
Browse repository at this point
Commits on Jul 22, 2026
Display whitespaces in delete dialogs
harminius
committed
f83a49d
View commit details
Copy full SHA for f83a49d
Browse repository at this point
Merge pull request #653 from MerginMaps/dialog_display_whitespaces
Show description for f0ca92f
MarcelGeo
authored
f0ca92f
View commit details
Copy full SHA for f0ca92f
Browse repository at this point
Commits on Jul 23, 2026
Merge branch 'master' into backport_master
varmar05
committed
c57d2e7
View commit details
Copy full SHA for c57d2e7
Browse repository at this point
Merge pull request #654 from MerginMaps/backport_master
Show description for 4419742
MarcelGeo
authored
4419742
View commit details
Copy full SHA for 4419742
Browse repository at this point
Commits on Jul 24, 2026
Send email notification with self-service unlock link on account lockout
Show description for de772e5
varmar05
and
claude
committed
de772e5
View commit details
Copy full SHA for de772e5
Browse repository at this point
Commits on Jul 27, 2026
fix account lockout component
varmar05
committed
56626f6
View commit details
Copy full SHA for 56626f6
Browse repository at this point
address review comments
varmar05
committed
5f7aefe
View commit details
Copy full SHA for 5f7aefe
Browse repository at this point
Commits on Jul 28, 2026
Merge pull request #656 from MerginMaps/account_locked_emails
Show description for ce69919
varmar05
authored
ce69919
View commit details
Copy full SHA for ce69919
Browse repository at this point
Commits on Aug 4, 2026
Count lockout failures over a rolling window via LoginHistory
Show description for 243d4f9
varmar05
and
claude
committed
243d4f9
View commit details
Copy full SHA for 243d4f9
Browse repository at this point
Commits on Aug 6, 2026
Fix axios error handling in user store
varmar05
committed
2c68b50
View commit details
Copy full SHA for 2c68b50
Browse repository at this point
Commits on Aug 12, 2026
Merge pull request #657 from MerginMaps/locked_account_fixes
Show description for 0f07ecb
MarcelGeo
authored
0f07ecb
View commit details
Copy full SHA for 0f07ecb
Browse repository at this point
Commits on Aug 17, 2026
Remove special response for locked account error
varmar05
committed
579896d
View commit details
Copy full SHA for 579896d
Browse repository at this point
Make response uniform regardless of account existence
Show description for 48a57df
varmar05
and
claude
committed
48a57df
View commit details
Copy full SHA for 48a57df
Browse repository at this point
Commits on Aug 18, 2026
Ensure the same timing for all auth routes
Show description for cab687f
varmar05
and
claude
committed
cab687f
View commit details
Copy full SHA for cab687f
Browse repository at this point
Added outlined severty handling in css
MarcelGeo
committed
7ea1865
View commit details
Copy full SHA for 7ea1865
Browse repository at this point
Merge pull request #663 from MerginMaps/fix_auth_responses
Show description for c374a52
MarcelGeo
authored
c374a52
View commit details
Copy full SHA for c374a52
Browse repository at this point
Commits on Aug 19, 2026
Merge pull request #664 from MerginMaps/confirm-dialog-cancel-buttons
Show description for d380168
MarcelGeo
authored
d380168
View commit details
Copy full SHA for d380168
Browse repository at this point
Commits on Aug 24, 2026
Fix locked account page in case of invalid link
varmar05
committed
57d37b2
View commit details
Copy full SHA for 57d37b2
Browse repository at this point
Successful login cleans failed attempts history for the lockout window
Show description for f526f28
varmar05
and
claude
committed
f526f28
View commit details
Copy full SHA for f526f28
Browse repository at this point
Commits on Aug 25, 2026
Trigger lockout only on tier's border
Show description for 8aebc22
varmar05
committed
8aebc22
View commit details
Copy full SHA for 8aebc22
Browse repository at this point
Tweak unlock account page
varmar05
committed
72c59e9
View commit details
Copy full SHA for 72c59e9
Browse repository at this point
Merge pull request #665 from MerginMaps/fix_locked_account_issues
Show description for c07ee6d
MarcelGeo
authored
c07ee6d
View commit details
Copy full SHA for c07ee6d
Browse repository at this point
Commits on Aug 27, 2026
added data-cy for tests compatibility
MarcelGeo
committed
7cbf024
View commit details
Copy full SHA for 7cbf024
Browse repository at this point
Merge pull request #667 from MerginMaps/styles-tunning
Show description for 215b96f
MarcelGeo
authored
215b96f
View commit details
Copy full SHA for 215b96f
Browse repository at this point
You can’t perform that action at this time.