Skip to content

Commit d264d7a

Browse files
authored
Merge branch 'master' into issues/692-different-identity-verification
2 parents 4d77cf6 + e3a880d commit d264d7a

6 files changed

Lines changed: 18 additions & 22 deletions

File tree

CHANGES.rst

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,22 @@ Version 1.3.0 [unreleased]
66

77
Work in progress.
88

9+
Version 1.2.2 [2026-04-25]
10+
--------------------------
11+
12+
Changes
13+
~~~~~~~
14+
15+
Dependencies
16+
++++++++++++
17+
18+
- Bumped openwisp-users to 1.2.2
19+
20+
Bugfixes
21+
~~~~~~~~
22+
23+
- Removed re-registering of SocialAppAdmin
24+
925
Version 1.2.1 [2026-04-10]
1026
--------------------------
1127

openwisp_radius/admin.py

Lines changed: 0 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -642,24 +642,6 @@ class Media:
642642
OrganizationAdmin.save_on_top = True
643643
OrganizationAdmin.inlines.append(OrganizationRadiusSettingsInline)
644644

645-
# avoid cluttering the admin with too many models, leave only the
646-
# minimum required to configure social login and check if it's working
647-
if app_settings.SOCIAL_REGISTRATION_CONFIGURED:
648-
from allauth.socialaccount.admin import SocialAccount
649-
650-
class SocialAccountInline(admin.StackedInline):
651-
model = SocialAccount
652-
extra = 0
653-
readonly_fields = ("provider", "uid", "extra_data")
654-
655-
def has_add_permission(self, request, obj):
656-
return False
657-
658-
def has_delete_permission(self, request, obj=None):
659-
return False
660-
661-
UserAdmin.inlines += [SocialAccountInline]
662-
663645

664646
if app_settings.USER_ADMIN_RADIUSTOKEN_INLINE:
665647

openwisp_radius/integrations/monitoring/static/radius-monitoring/css/device-change.css

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
height: 4em;
1111
}
1212
#radius-session-tbody strong {
13-
color: green;
13+
color: var(--ow-color-success);
1414
}
1515
#radius-session-tbody tr td p {
1616
white-space: nowrap;

openwisp_radius/static/openwisp-radius/css/mode-switcher.css

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,5 +6,4 @@
66
.form-row.field-user label,
77
.form-row.field-username label {
88
font-weight: bold;
9-
color: #333;
109
}

openwisp_radius/static/openwisp-radius/css/radiusbatch.css

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,5 +2,4 @@
22
.field-prefix label,
33
.field-number_of_users label {
44
font-weight: bold;
5-
color: #000;
65
}

setup.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@
5151
"passlib~=1.7.1",
5252
"djangorestframework-link-header-pagination~=0.1.1",
5353
"weasyprint>=65,<68",
54-
"dj-rest-auth>=6.0,<7.2",
54+
"dj-rest-auth>=6.0,<7.3",
5555
"django-sendsms~=0.5.0",
5656
"jsonfield~=3.1.0",
5757
"django-private-storage~=3.1.0",

0 commit comments

Comments
 (0)