Streams/streams
Streams/streams
1
0
Fork 0
mirror of https://codeberg.org/streams/streams.git synced 2024-09-19 22:15:15 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'dev' of ../unfediverse.com into dev

Browse source
This commit is contained in:
nobody 2022-04-18 16:17:49 -07:00
commit 7c4d3b8e17
2 changed files with 4 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
doc/en/groups.mc
View file

@ -32,7 +32,7 @@ Once the new channel is created you may setup the profile photo, cover photo and
Joining a Group
===============
You join a group in the same way as you connect with any channel in the network. For public groups you may be automatically approved at the discretion of the group administrator.
You join a group in the same way as you connect with any channel in the network. If the option to connect isn't provided, open your Connections app and put the web address or url into the text input provided under "Add New Connection". For public groups you may be automatically approved at the discretion of the group administrator.
Leaving a Group
===============

7
view/js/main.js
View file

@ -631,23 +631,22 @@ function handleNotifications(data) {
if(data.stream || data.home || data.intros || data.register || data.mail || data.all_events || data.notify || data.files || data.pubs || data.forums) {
$('.notifications-btn').css('opacity', 1);
$('#no_notifications').hide();
$('#notifications_wrapper').show();
}
else {
$('.notifications-btn').css('opacity', 0.5);
$('#navbar-collapse-1').removeClass('show');
$('#no_notifications').show();
$('#notifications_wrapper').hide();
}
if(data.home || data.intros || data.register || data.mail || data.notify || data.files) {
$('.notifications-btn-icon').removeClass('fa-exclamation-circle');
$('.notifications-btn-icon').addClass('fa-exclamation-triangle');
$('#notifications_wrapper').show();
$('.notifications-btn-icon').addClass('fa-exclamation-triangle');
}
if(!data.home && !data.intros && !data.register && !data.mail && !data.notify && !data.files) {
$('.notifications-btn-icon').removeClass('fa-exclamation-triangle');
$('.notifications-btn-icon').addClass('fa-exclamation-circle');
$('#notifications_wrapper').hide();
}
if(data.all_events_today) {
$('.all_events-update').removeClass('badge-secondary');