diff --git a/.gitignore b/.gitignore old mode 100644 new mode 100755 index 3133d97..c28fe92 --- a/.gitignore +++ b/.gitignore @@ -1,4 +1,4 @@ config.ini .ftpconfig data/ - +.htpasswd \ No newline at end of file diff --git a/.htaccess b/.htaccess old mode 100644 new mode 100755 diff --git a/404.php b/404.php old mode 100644 new mode 100755 diff --git a/Caddyfile b/Caddyfile old mode 100644 new mode 100755 diff --git a/LICENSE b/LICENSE old mode 100644 new mode 100755 diff --git a/README.md b/README.md old mode 100644 new mode 100755 diff --git a/assets/css/404.css b/assets/css/404.css old mode 100644 new mode 100755 diff --git a/assets/css/cookieconsent.min.css b/assets/css/cookieconsent.min.css old mode 100644 new mode 100755 diff --git a/assets/css/dark.css b/assets/css/dark.css old mode 100644 new mode 100755 diff --git a/assets/css/emojipicker.css b/assets/css/emojipicker.css old mode 100644 new mode 100755 diff --git a/assets/css/fontawesome.min.css b/assets/css/fontawesome.min.css old mode 100644 new mode 100755 diff --git a/assets/css/sharebox.css b/assets/css/sharebox.css old mode 100644 new mode 100755 diff --git a/assets/css/sharebox_dark.css b/assets/css/sharebox_dark.css old mode 100644 new mode 100755 diff --git a/assets/css/style.css b/assets/css/style.css old mode 100644 new mode 100755 diff --git a/assets/fonts/MIT-LICENSE.txt b/assets/fonts/MIT-LICENSE.txt old mode 100644 new mode 100755 diff --git a/assets/fonts/SIL-OFL-LICENSE.txt b/assets/fonts/SIL-OFL-LICENSE.txt old mode 100644 new mode 100755 diff --git a/assets/fonts/fontawesome.eot b/assets/fonts/fontawesome.eot old mode 100644 new mode 100755 diff --git a/assets/fonts/fontawesome.svg b/assets/fonts/fontawesome.svg old mode 100644 new mode 100755 diff --git a/assets/fonts/fontawesome.ttf b/assets/fonts/fontawesome.ttf old mode 100644 new mode 100755 diff --git a/assets/fonts/fontawesome.woff b/assets/fonts/fontawesome.woff old mode 100644 new mode 100755 diff --git a/assets/fonts/fontawesome.woff2 b/assets/fonts/fontawesome.woff2 old mode 100644 new mode 100755 diff --git a/assets/images/favicon.ico b/assets/images/favicon.ico old mode 100644 new mode 100755 diff --git a/assets/images/halcyon.png b/assets/images/halcyon.png old mode 100644 new mode 100755 diff --git a/assets/images/halcyon_logo.png b/assets/images/halcyon_logo.png old mode 100644 new mode 100755 diff --git a/assets/images/halcyon_w.png b/assets/images/halcyon_w.png old mode 100644 new mode 100755 diff --git a/assets/images/mastodon.png b/assets/images/mastodon.png old mode 100644 new mode 100755 diff --git a/assets/images/mastodon.svg b/assets/images/mastodon.svg old mode 100644 new mode 100755 diff --git a/assets/images/missing.png b/assets/images/missing.png old mode 100644 new mode 100755 diff --git a/assets/images/missing_header.png b/assets/images/missing_header.png old mode 100644 new mode 100755 diff --git a/assets/images/robot.svg b/assets/images/robot.svg old mode 100644 new mode 100755 diff --git a/assets/images/self_auth.png b/assets/images/self_auth.png old mode 100644 new mode 100755 diff --git a/assets/images/self_auth_min.png b/assets/images/self_auth_min.png old mode 100644 new mode 100755 diff --git a/assets/js/autocomplete/license-textarea.txt b/assets/js/autocomplete/license-textarea.txt old mode 100644 new mode 100755 diff --git a/assets/js/autocomplete/search.js b/assets/js/autocomplete/search.js old mode 100644 new mode 100755 diff --git a/assets/js/autocomplete/textarea.js b/assets/js/autocomplete/textarea.js old mode 100644 new mode 100755 diff --git a/assets/js/autosize/LICENSE b/assets/js/autosize/LICENSE old mode 100644 new mode 100755 diff --git a/assets/js/autosize/autosize.js b/assets/js/autosize/autosize.js old mode 100644 new mode 100755 diff --git a/assets/js/blurhash.js b/assets/js/blurhash.js old mode 100644 new mode 100755 diff --git a/assets/js/clipboard.js/LICENSE b/assets/js/clipboard.js/LICENSE old mode 100644 new mode 100755 diff --git a/assets/js/clipboard.js/clipboard.min.js b/assets/js/clipboard.js/clipboard.min.js old mode 100644 new mode 100755 diff --git a/assets/js/cookieconsent/cookieconsent.min.js b/assets/js/cookieconsent/cookieconsent.min.js old mode 100644 new mode 100755 diff --git a/assets/js/cookieconsent/licence b/assets/js/cookieconsent/licence old mode 100644 new mode 100755 diff --git a/assets/js/emojipicker/LICENSE b/assets/js/emojipicker/LICENSE old mode 100644 new mode 100755 diff --git a/assets/js/emojipicker/emojidata.js b/assets/js/emojipicker/emojidata.js old mode 100644 new mode 100755 diff --git a/assets/js/emojipicker/emojipicker.js b/assets/js/emojipicker/emojipicker.js old mode 100644 new mode 100755 diff --git a/assets/js/halcyon/halcyonFunctions.js b/assets/js/halcyon/halcyonFunctions.js old mode 100644 new mode 100755 index c66e268..2b8d68e --- a/assets/js/halcyon/halcyonFunctions.js +++ b/assets/js/halcyon/halcyonFunctions.js @@ -234,10 +234,10 @@ api.get("instance",function(data) { if(!data.max_toot_chars) data.max_toot_chars = 500; if(!data.poll_limits) { data.poll_limits = new Object(); -data.poll_limits.max_options = 4; -data.poll_limits.max_option_chars = 25; -data.poll_limits.min_expiration = 300; -data.poll_limits.max_expiration = 2629746; +data.poll_limits.max_options = 4; +data.poll_limits.max_option_chars = 25; +data.poll_limits.min_expiration = 300; +data.poll_limits.max_expiration = 2629746; } localStorage.setItem("current_instance_charlimit",data.max_toot_chars); current_instance_charlimit = data.max_toot_chars; @@ -460,7 +460,7 @@ ctx.fillText("😗",-2,4); return ctx.getImageData(0,0,1,1).data[3] > 0; } function openStatus(link) { -api.search("q="+encodeURIComponent(link),function(response) { +api.search("q="+encodeURIComponent(link)+"&resolve=true",function(response) { if(response.statuses.length > 0) { var data = response.statuses[0]; if(data.account.acct.indexOf("@") == -1) { diff --git a/assets/js/halcyon/halcyonLists.js b/assets/js/halcyon/halcyonLists.js old mode 100644 new mode 100755 diff --git a/assets/js/halcyon/halcyonSettings.js b/assets/js/halcyon/halcyonSettings.js old mode 100644 new mode 100755 diff --git a/assets/js/halcyon/halcyonSharebox.js b/assets/js/halcyon/halcyonSharebox.js old mode 100644 new mode 100755 diff --git a/assets/js/halcyon/halcyonTemplates.js b/assets/js/halcyon/halcyonTemplates.js old mode 100644 new mode 100755 index bbd4af9..2c00be0 --- a/assets/js/halcyon/halcyonTemplates.js +++ b/assets/js/halcyon/halcyonTemplates.js @@ -131,8 +131,9 @@ else if(expires_at.getUTCMinutes() == 1) expires_string = "1 "+__("minute"); else if(expires_at.getUTCMinutes() > 1) expires_string = expires_at.getUTCMinutes()+" "+__("minutes"); else if(expires_at.getUTCSeconds() == 1) expires_string = "1 "+__("second"); else expires_string = expires_at.getUTCSeconds()+" "+__("seconds"); -if(poll.voted || poll.expired) { -poll_html = (`