diff --git a/first_note.mp4 b/first_note.mp4 new file mode 100644 index 0000000000..38717adc4f Binary files /dev/null and b/first_note.mp4 differ diff --git a/src/backend/src/routers/hosting/puter-site.js b/src/backend/src/routers/hosting/puter-site.js index d9d81bf48f..29c7255d05 100644 --- a/src/backend/src/routers/hosting/puter-site.js +++ b/src/backend/src/routers/hosting/puter-site.js @@ -147,6 +147,14 @@ class PuterSiteMiddleware extends AdvancedBase { res.status(502).send('subdomain is pointing to non-directory'); } + // Verify subdomain owner permission + const subdomain_actor = Actor.adapt(subdomain_owner); + const svc_acl = services.get('acl'); + if ( ! await svc_acl.check(subdomain_actor, node, 'read') ) { + res.status(502).send('subdomain owner does not have access to directory'); + return; + } + subdomain_root_path = await node.get('path'); } diff --git a/src/gui/src/UI/UITaskbar.js b/src/gui/src/UI/UITaskbar.js index 172243409e..0977a853c2 100644 --- a/src/gui/src/UI/UITaskbar.js +++ b/src/gui/src/UI/UITaskbar.js @@ -148,7 +148,6 @@ async function UITaskbar(options){ appendTo: "body", revert: "invalid", connectToSortable: ".taskbar", - //containment: "document", zIndex: parseInt($(popover).css('z-index')) + 1, scroll: false, distance: 5, @@ -292,7 +291,6 @@ window.make_taskbar_sortable = function(){ }); let el = ($(item).detach()) $(el).insertAfter(ui.item); - // $(ui.item).insertBefore(`

Hello!

`); $(el).show(); $(ui.item).removeItems(); window.update_taskbar(); diff --git a/src/gui/src/initgui.js b/src/gui/src/initgui.js index f2ed081c97..59a8e4ddd3 100644 --- a/src/gui/src/initgui.js +++ b/src/gui/src/initgui.js @@ -34,7 +34,6 @@ import UIWindowChangeUsername from './UI/UIWindowChangeUsername.js'; import update_last_touch_coordinates from './helpers/update_last_touch_coordinates.js'; import update_title_based_on_uploads from './helpers/update_title_based_on_uploads.js'; import PuterDialog from './UI/PuterDialog.js'; -import determine_active_container_parent from './helpers/determine_active_container_parent.js'; import { ThemeService } from './services/ThemeService.js'; import { BroadcastService } from './services/BroadcastService.js'; import { ProcessService } from './services/ProcessService.js';