From 82ae0882d18cd1af8bf8b8fef559a2792d840a35 Mon Sep 17 00:00:00 2001 From: nipos Date: Wed, 22 Jul 2020 16:11:54 +0000 Subject: [PATCH] View state of ongoing polls,Fix some links,fix search for urls,add Chinese translation,update media API --- .gitignore | 2 +- .htaccess | 0 404.php | 0 Caddyfile | 0 LICENSE | 0 README.md | 0 assets/css/404.css | 0 assets/css/cookieconsent.min.css | 0 assets/css/dark.css | 0 assets/css/emojipicker.css | 0 assets/css/fontawesome.min.css | 0 assets/css/sharebox.css | 0 assets/css/sharebox_dark.css | 0 assets/css/style.css | 0 assets/fonts/MIT-LICENSE.txt | 0 assets/fonts/SIL-OFL-LICENSE.txt | 0 assets/fonts/fontawesome.eot | Bin assets/fonts/fontawesome.svg | 0 assets/fonts/fontawesome.ttf | Bin assets/fonts/fontawesome.woff | Bin assets/fonts/fontawesome.woff2 | Bin assets/images/favicon.ico | Bin assets/images/halcyon.png | Bin assets/images/halcyon_logo.png | Bin assets/images/halcyon_w.png | Bin assets/images/mastodon.png | Bin assets/images/mastodon.svg | 0 assets/images/missing.png | Bin assets/images/missing_header.png | Bin assets/images/robot.svg | 0 assets/images/self_auth.png | Bin assets/images/self_auth_min.png | Bin assets/js/autocomplete/license-textarea.txt | 0 assets/js/autocomplete/search.js | 0 assets/js/autocomplete/textarea.js | 0 assets/js/autosize/LICENSE | 0 assets/js/autosize/autosize.js | 0 assets/js/blurhash.js | 0 assets/js/clipboard.js/LICENSE | 0 assets/js/clipboard.js/clipboard.min.js | 0 assets/js/cookieconsent/cookieconsent.min.js | 0 assets/js/cookieconsent/licence | 0 assets/js/emojipicker/LICENSE | 0 assets/js/emojipicker/emojidata.js | 0 assets/js/emojipicker/emojipicker.js | 0 assets/js/halcyon/halcyonFunctions.js | 10 +- assets/js/halcyon/halcyonLists.js | 0 assets/js/halcyon/halcyonSettings.js | 0 assets/js/halcyon/halcyonSharebox.js | 0 assets/js/halcyon/halcyonTemplates.js | 21 +- assets/js/halcyon/halcyonUI.js | 25 +- assets/js/halcyon/halcyonWorker.js | 0 assets/js/jquery-cookie/MIT-LICENSE.txt | 0 assets/js/jquery-cookie/src/jquery.cookie.js | 0 assets/js/jquery/LICENSE.txt | 0 assets/js/jquery/jquery.min.js | 0 assets/js/mastodon.js/LICENSE | 0 assets/js/mastodon.js/mastodon.js | 4 +- assets/js/player/LICENSE-audio.txt | 0 assets/js/player/LICENSE-soundmanager.txt | 0 assets/js/player/LICENSE-youplay.txt | 0 assets/js/player/audio.js | 0 assets/js/player/soundmanager.js | 0 assets/js/player/youplay.js | 0 assets/js/pomo/LICENSE.txt | 0 assets/js/pomo/pomo.js | 0 assets/js/replace_emoji.js | 0 assets/js/shortcut.js | 0 assets/js/twemoji/LICENSE | 0 assets/js/twemoji/twemoji.min.js | 0 authorize/.htaccess | 0 authorize/mastodon-api/LICENSE | 0 authorize/mastodon-api/mastodon.php | 0 authorize/mastodon.php | 0 bookmarks.php | 0 config/config.ini.sample | 12 +- config/footerlinks.txt.sample | 0 config/imprint.txt.sample | 0 config/privacy.txt | 0 config/terms.txt | 0 data/.htaccess | 0 direct.php | 0 docker/.dockerignore | 0 docker/.gitignore | 0 docker/Dockerfile | 0 docker/README.md | 0 docker/etc/supervisord.conf | 0 docker/locale/default | 0 docker/locale/locale.gen | 0 .../usr/local/etc/php-fpm.d/50-clear-env.conf | 0 .../local/etc/php-fpm.d/50-no-access-log.conf | 0 docker/usr/local/etc/php-fpm.d/50-socket.conf | 0 .../etc/php/conf.d/00-best-practices.ini | 0 .../local/etc/php/conf.d/00-performance.ini | 0 .../usr/local/etc/php/conf.d/00-security.ini | 0 federated.php | 0 footer.php | 0 header.php | 0 home.php | 0 index.php | 0 instance.php | 0 language.php | 0 lighttpd.conf | 2 +- lists.php | 0 lists_add.php | 0 lists_view.php | 0 local.php | 0 locale/ar_DZ/LC_MESSAGES/messages.mo | Bin locale/ar_DZ/LC_MESSAGES/messages.po | 0 locale/ca_ES/LC_MESSAGES/messages.mo | Bin locale/ca_ES/LC_MESSAGES/messages.po | 0 locale/cs_CZ/LC_MESSAGES/messages.mo | Bin locale/cs_CZ/LC_MESSAGES/messages.po | 0 locale/de_DE/LC_MESSAGES/messages.mo | Bin locale/de_DE/LC_MESSAGES/messages.po | 0 locale/en_US/LC_MESSAGES/messages.mo | Bin locale/en_US/LC_MESSAGES/messages.po | 0 locale/es_ES/LC_MESSAGES/messages.mo | Bin locale/es_ES/LC_MESSAGES/messages.po | 0 locale/fr_FR/LC_MESSAGES/messages.mo | Bin locale/fr_FR/LC_MESSAGES/messages.po | 0 locale/gl_ES/LC_MESSAGES/messages.mo | Bin locale/gl_ES/LC_MESSAGES/messages.po | 0 locale/it_IT/LC_MESSAGES/messages.mo | Bin locale/it_IT/LC_MESSAGES/messages.po | 0 locale/ja_JP/LC_MESSAGES/messages.mo | Bin locale/ja_JP/LC_MESSAGES/messages.po | 0 locale/ko_KR/LC_MESSAGES/messages.mo | Bin locale/ko_KR/LC_MESSAGES/messages.po | 0 locale/nl_NL/LC_MESSAGES/messages.mo | Bin locale/nl_NL/LC_MESSAGES/messages.po | 0 locale/pl_PL/LC_MESSAGES/messages.mo | Bin locale/pl_PL/LC_MESSAGES/messages.po | 0 locale/pt_BR/LC_MESSAGES/messages.mo | Bin locale/pt_BR/LC_MESSAGES/messages.po | 0 locale/zh_CN/LC_MESSAGES/messages.mo | Bin 0 -> 17787 bytes locale/zh_CN/LC_MESSAGES/messages.po | 1000 +++++++++++++++++ login/assets/css/style.css | 0 login/assets/images/background.jpg | Bin login/assets/images/halcyon-title.png | Bin login/assets/images/halcyon_logo.png | Bin login/assets/images/preview0.png | Bin login/assets/images/preview1.png | Bin login/assets/images/preview2.png | Bin login/assets/js/halcyon_login.js | 0 login/auth.php | 0 login/footer.php | 0 login/header.php | 0 login/imprint.php | 0 login/login.php | 0 login/logout.php | 0 login/privacy.php | 0 login/terms.php | 0 media/image.php | 0 media/invidious.php | 0 media/video.php | 0 media/vimeo.php | 0 media/vimeocaption.php | 0 media/vimeoclass.php | 0 media/youplay.php | 0 media/ytcaption.php | 0 media/ytclass.php | 0 media/ytthumbs.php | 0 nginx.conf | 0 notifications.php | 0 search_hash_tag.php | 0 search_user.php | 0 settings_accounts.php | 0 settings_appearance.php | 0 settings_filters.php | 0 settings_general.php | 0 settings_media.php | 0 settings_profile.php | 0 share.php | 0 unshorten.php | 0 user.php | 0 user_favorite.php | 0 user_followers.php | 0 user_following.php | 0 user_include_replies.php | 0 user_only_media.php | 0 version.txt | 0 who_to_follow.php | 0 widgets/create_status.php | 0 widgets/lists_header.php | 0 widgets/overlay_addlist.php | 0 widgets/overlay_caption.php | 0 widgets/overlay_confirm.php | 0 widgets/overlay_copy_link.php | 0 widgets/overlay_create_status.php | 0 widgets/overlay_filter.php | 0 widgets/overlay_message.php | 0 widgets/overlay_prompt.php | 0 widgets/overlay_redirect_bibliogram.php | 0 widgets/overlay_redirect_invidious.php | 0 widgets/overlay_redirect_nitter.php | 0 widgets/overlay_redirect_nofb.php | 0 widgets/overlay_report_status.php | 0 widgets/overlay_rewrite_bibliogram.php | 0 widgets/overlay_rewrite_invidious.php | 0 widgets/overlay_rewrite_nitter.php | 0 widgets/overlay_rewrite_nofb.php | 0 widgets/overlay_single_reply.php | 0 widgets/search_header.php | 0 widgets/settings_header.php | 0 widgets/side_change_local.php | 0 widgets/side_current_user.php | 0 widgets/side_dev_team.php | 0 widgets/side_firefox_addon.php | 0 widgets/side_footer.php | 0 widgets/side_trending.php | 0 widgets/side_who_to_follow.php | 0 widgets/user_header.php | 0 widgets/user_recent_images.php | 0 214 files changed, 1050 insertions(+), 26 deletions(-) mode change 100644 => 100755 .gitignore mode change 100644 => 100755 .htaccess mode change 100644 => 100755 404.php mode change 100644 => 100755 Caddyfile mode change 100644 => 100755 LICENSE mode change 100644 => 100755 README.md mode change 100644 => 100755 assets/css/404.css mode change 100644 => 100755 assets/css/cookieconsent.min.css mode change 100644 => 100755 assets/css/dark.css mode change 100644 => 100755 assets/css/emojipicker.css mode change 100644 => 100755 assets/css/fontawesome.min.css mode change 100644 => 100755 assets/css/sharebox.css mode change 100644 => 100755 assets/css/sharebox_dark.css mode change 100644 => 100755 assets/css/style.css mode change 100644 => 100755 assets/fonts/MIT-LICENSE.txt mode change 100644 => 100755 assets/fonts/SIL-OFL-LICENSE.txt mode change 100644 => 100755 assets/fonts/fontawesome.eot mode change 100644 => 100755 assets/fonts/fontawesome.svg mode change 100644 => 100755 assets/fonts/fontawesome.ttf mode change 100644 => 100755 assets/fonts/fontawesome.woff mode change 100644 => 100755 assets/fonts/fontawesome.woff2 mode change 100644 => 100755 assets/images/favicon.ico mode change 100644 => 100755 assets/images/halcyon.png mode change 100644 => 100755 assets/images/halcyon_logo.png mode change 100644 => 100755 assets/images/halcyon_w.png mode change 100644 => 100755 assets/images/mastodon.png mode change 100644 => 100755 assets/images/mastodon.svg mode change 100644 => 100755 assets/images/missing.png mode change 100644 => 100755 assets/images/missing_header.png mode change 100644 => 100755 assets/images/robot.svg mode change 100644 => 100755 assets/images/self_auth.png mode change 100644 => 100755 assets/images/self_auth_min.png mode change 100644 => 100755 assets/js/autocomplete/license-textarea.txt mode change 100644 => 100755 assets/js/autocomplete/search.js mode change 100644 => 100755 assets/js/autocomplete/textarea.js mode change 100644 => 100755 assets/js/autosize/LICENSE mode change 100644 => 100755 assets/js/autosize/autosize.js mode change 100644 => 100755 assets/js/blurhash.js mode change 100644 => 100755 assets/js/clipboard.js/LICENSE mode change 100644 => 100755 assets/js/clipboard.js/clipboard.min.js mode change 100644 => 100755 assets/js/cookieconsent/cookieconsent.min.js mode change 100644 => 100755 assets/js/cookieconsent/licence mode change 100644 => 100755 assets/js/emojipicker/LICENSE mode change 100644 => 100755 assets/js/emojipicker/emojidata.js mode change 100644 => 100755 assets/js/emojipicker/emojipicker.js mode change 100644 => 100755 assets/js/halcyon/halcyonFunctions.js mode change 100644 => 100755 assets/js/halcyon/halcyonLists.js mode change 100644 => 100755 assets/js/halcyon/halcyonSettings.js mode change 100644 => 100755 assets/js/halcyon/halcyonSharebox.js mode change 100644 => 100755 assets/js/halcyon/halcyonTemplates.js mode change 100644 => 100755 assets/js/halcyon/halcyonUI.js mode change 100644 => 100755 assets/js/halcyon/halcyonWorker.js mode change 100644 => 100755 assets/js/jquery-cookie/MIT-LICENSE.txt mode change 100644 => 100755 assets/js/jquery-cookie/src/jquery.cookie.js mode change 100644 => 100755 assets/js/jquery/LICENSE.txt mode change 100644 => 100755 assets/js/jquery/jquery.min.js mode change 100644 => 100755 assets/js/mastodon.js/LICENSE mode change 100644 => 100755 assets/js/mastodon.js/mastodon.js mode change 100644 => 100755 assets/js/player/LICENSE-audio.txt mode change 100644 => 100755 assets/js/player/LICENSE-soundmanager.txt mode change 100644 => 100755 assets/js/player/LICENSE-youplay.txt mode change 100644 => 100755 assets/js/player/audio.js mode change 100644 => 100755 assets/js/player/soundmanager.js mode change 100644 => 100755 assets/js/player/youplay.js mode change 100644 => 100755 assets/js/pomo/LICENSE.txt mode change 100644 => 100755 assets/js/pomo/pomo.js mode change 100644 => 100755 assets/js/replace_emoji.js mode change 100644 => 100755 assets/js/shortcut.js mode change 100644 => 100755 assets/js/twemoji/LICENSE mode change 100644 => 100755 assets/js/twemoji/twemoji.min.js mode change 100644 => 100755 authorize/.htaccess mode change 100644 => 100755 authorize/mastodon-api/LICENSE mode change 100644 => 100755 authorize/mastodon-api/mastodon.php mode change 100644 => 100755 authorize/mastodon.php mode change 100644 => 100755 bookmarks.php mode change 100644 => 100755 config/config.ini.sample mode change 100644 => 100755 config/footerlinks.txt.sample mode change 100644 => 100755 config/imprint.txt.sample mode change 100644 => 100755 config/privacy.txt mode change 100644 => 100755 config/terms.txt mode change 100644 => 100755 data/.htaccess mode change 100644 => 100755 direct.php mode change 100644 => 100755 docker/.dockerignore mode change 100644 => 100755 docker/.gitignore mode change 100644 => 100755 docker/Dockerfile mode change 100644 => 100755 docker/README.md mode change 100644 => 100755 docker/etc/supervisord.conf mode change 100644 => 100755 docker/locale/default mode change 100644 => 100755 docker/locale/locale.gen mode change 100644 => 100755 docker/usr/local/etc/php-fpm.d/50-clear-env.conf mode change 100644 => 100755 docker/usr/local/etc/php-fpm.d/50-no-access-log.conf mode change 100644 => 100755 docker/usr/local/etc/php-fpm.d/50-socket.conf mode change 100644 => 100755 docker/usr/local/etc/php/conf.d/00-best-practices.ini mode change 100644 => 100755 docker/usr/local/etc/php/conf.d/00-performance.ini mode change 100644 => 100755 docker/usr/local/etc/php/conf.d/00-security.ini mode change 100644 => 100755 federated.php mode change 100644 => 100755 footer.php mode change 100644 => 100755 header.php mode change 100644 => 100755 home.php mode change 100644 => 100755 index.php mode change 100644 => 100755 instance.php mode change 100644 => 100755 language.php mode change 100644 => 100755 lighttpd.conf mode change 100644 => 100755 lists.php mode change 100644 => 100755 lists_add.php mode change 100644 => 100755 lists_view.php mode change 100644 => 100755 local.php mode change 100644 => 100755 locale/ar_DZ/LC_MESSAGES/messages.mo mode change 100644 => 100755 locale/ar_DZ/LC_MESSAGES/messages.po mode change 100644 => 100755 locale/ca_ES/LC_MESSAGES/messages.mo mode change 100644 => 100755 locale/ca_ES/LC_MESSAGES/messages.po mode change 100644 => 100755 locale/cs_CZ/LC_MESSAGES/messages.mo mode change 100644 => 100755 locale/cs_CZ/LC_MESSAGES/messages.po mode change 100644 => 100755 locale/de_DE/LC_MESSAGES/messages.mo mode change 100644 => 100755 locale/de_DE/LC_MESSAGES/messages.po mode change 100644 => 100755 locale/en_US/LC_MESSAGES/messages.mo mode change 100644 => 100755 locale/en_US/LC_MESSAGES/messages.po mode change 100644 => 100755 locale/es_ES/LC_MESSAGES/messages.mo mode change 100644 => 100755 locale/es_ES/LC_MESSAGES/messages.po mode change 100644 => 100755 locale/fr_FR/LC_MESSAGES/messages.mo mode change 100644 => 100755 locale/fr_FR/LC_MESSAGES/messages.po mode change 100644 => 100755 locale/gl_ES/LC_MESSAGES/messages.mo mode change 100644 => 100755 locale/gl_ES/LC_MESSAGES/messages.po mode change 100644 => 100755 locale/it_IT/LC_MESSAGES/messages.mo mode change 100644 => 100755 locale/it_IT/LC_MESSAGES/messages.po mode change 100644 => 100755 locale/ja_JP/LC_MESSAGES/messages.mo mode change 100644 => 100755 locale/ja_JP/LC_MESSAGES/messages.po mode change 100644 => 100755 locale/ko_KR/LC_MESSAGES/messages.mo mode change 100644 => 100755 locale/ko_KR/LC_MESSAGES/messages.po mode change 100644 => 100755 locale/nl_NL/LC_MESSAGES/messages.mo mode change 100644 => 100755 locale/nl_NL/LC_MESSAGES/messages.po mode change 100644 => 100755 locale/pl_PL/LC_MESSAGES/messages.mo mode change 100644 => 100755 locale/pl_PL/LC_MESSAGES/messages.po mode change 100644 => 100755 locale/pt_BR/LC_MESSAGES/messages.mo mode change 100644 => 100755 locale/pt_BR/LC_MESSAGES/messages.po create mode 100755 locale/zh_CN/LC_MESSAGES/messages.mo create mode 100755 locale/zh_CN/LC_MESSAGES/messages.po mode change 100644 => 100755 login/assets/css/style.css mode change 100644 => 100755 login/assets/images/background.jpg mode change 100644 => 100755 login/assets/images/halcyon-title.png mode change 100644 => 100755 login/assets/images/halcyon_logo.png mode change 100644 => 100755 login/assets/images/preview0.png mode change 100644 => 100755 login/assets/images/preview1.png mode change 100644 => 100755 login/assets/images/preview2.png mode change 100644 => 100755 login/assets/js/halcyon_login.js mode change 100644 => 100755 login/auth.php mode change 100644 => 100755 login/footer.php mode change 100644 => 100755 login/header.php mode change 100644 => 100755 login/imprint.php mode change 100644 => 100755 login/login.php mode change 100644 => 100755 login/logout.php mode change 100644 => 100755 login/privacy.php mode change 100644 => 100755 login/terms.php mode change 100644 => 100755 media/image.php mode change 100644 => 100755 media/invidious.php mode change 100644 => 100755 media/video.php mode change 100644 => 100755 media/vimeo.php mode change 100644 => 100755 media/vimeocaption.php mode change 100644 => 100755 media/vimeoclass.php mode change 100644 => 100755 media/youplay.php mode change 100644 => 100755 media/ytcaption.php mode change 100644 => 100755 media/ytclass.php mode change 100644 => 100755 media/ytthumbs.php mode change 100644 => 100755 nginx.conf mode change 100644 => 100755 notifications.php mode change 100644 => 100755 search_hash_tag.php mode change 100644 => 100755 search_user.php mode change 100644 => 100755 settings_accounts.php mode change 100644 => 100755 settings_appearance.php mode change 100644 => 100755 settings_filters.php mode change 100644 => 100755 settings_general.php mode change 100644 => 100755 settings_media.php mode change 100644 => 100755 settings_profile.php mode change 100644 => 100755 share.php mode change 100644 => 100755 unshorten.php mode change 100644 => 100755 user.php mode change 100644 => 100755 user_favorite.php mode change 100644 => 100755 user_followers.php mode change 100644 => 100755 user_following.php mode change 100644 => 100755 user_include_replies.php mode change 100644 => 100755 user_only_media.php mode change 100644 => 100755 version.txt mode change 100644 => 100755 who_to_follow.php mode change 100644 => 100755 widgets/create_status.php mode change 100644 => 100755 widgets/lists_header.php mode change 100644 => 100755 widgets/overlay_addlist.php mode change 100644 => 100755 widgets/overlay_caption.php mode change 100644 => 100755 widgets/overlay_confirm.php mode change 100644 => 100755 widgets/overlay_copy_link.php mode change 100644 => 100755 widgets/overlay_create_status.php mode change 100644 => 100755 widgets/overlay_filter.php mode change 100644 => 100755 widgets/overlay_message.php mode change 100644 => 100755 widgets/overlay_prompt.php mode change 100644 => 100755 widgets/overlay_redirect_bibliogram.php mode change 100644 => 100755 widgets/overlay_redirect_invidious.php mode change 100644 => 100755 widgets/overlay_redirect_nitter.php mode change 100644 => 100755 widgets/overlay_redirect_nofb.php mode change 100644 => 100755 widgets/overlay_report_status.php mode change 100644 => 100755 widgets/overlay_rewrite_bibliogram.php mode change 100644 => 100755 widgets/overlay_rewrite_invidious.php mode change 100644 => 100755 widgets/overlay_rewrite_nitter.php mode change 100644 => 100755 widgets/overlay_rewrite_nofb.php mode change 100644 => 100755 widgets/overlay_single_reply.php mode change 100644 => 100755 widgets/search_header.php mode change 100644 => 100755 widgets/settings_header.php mode change 100644 => 100755 widgets/side_change_local.php mode change 100644 => 100755 widgets/side_current_user.php mode change 100644 => 100755 widgets/side_dev_team.php mode change 100644 => 100755 widgets/side_firefox_addon.php mode change 100644 => 100755 widgets/side_footer.php mode change 100644 => 100755 widgets/side_trending.php mode change 100644 => 100755 widgets/side_who_to_follow.php mode change 100644 => 100755 widgets/user_header.php mode change 100644 => 100755 widgets/user_recent_images.php 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 = (`
`); +const poll_random = Math.round(Math.random()*1000); +if(poll.voted || poll.expired || poll.seeresult) { +poll_html = (`
`); optionsort = [...poll.options]; optionsort.sort(function(a,b) {return a.votes_count - b.votes_count}); optionsort.reverse(); @@ -143,11 +144,11 @@ if(poll.options[i].winner) winner = " poll_winner"; poll_html += (`
`); } -if(poll.expired) poll_html += (`
${poll.votes_count} ${__("votes")} • ${__("Final results")}`); -else poll_html += (`
${poll.votes_count} ${__("votes")} • ${expires_string} ${__("left")}`); +if(poll.expired) poll_html += (`
${poll.votes_count} ${__("votes")} • ${__("Final results")} • ${__("Refresh")}`); +else if(poll.seeresult) poll_html += (`
${poll.votes_count} ${__("votes")} • ${expires_string} ${__("left")} • ${__("Back")}`); +else poll_html += (`
${poll.votes_count} ${__("votes")} • ${expires_string} ${__("left")} • ${__("Refresh")}`); } else { -const poll_random = Math.round(Math.random()*1000); poll_html = (`
`); for(var i=0;i${__("Vote")} -${poll.votes_count} ${__("votes")} • ${expires_string} ${__("left")}`); +${poll.votes_count} ${__("votes")} • ${expires_string} ${__("left")} • ${__("Show results")}`); } poll_html += (`
`); return poll_html; @@ -289,7 +290,7 @@ const html = (`
- + ${NotificationObj.status.account.display_name} @@ -327,7 +328,7 @@ html = (`
- + ${NotificationObj.status.account.display_name} @@ -366,7 +367,7 @@ const html = (`
- + ${NotificationObj.status.account.display_name} @@ -474,7 +475,7 @@ html.find(".toot_article").append(NotificationObj.status.halcyon.poll_object); return html; } else if(NotificationObj.type === 'follow') { const html=(` -
  • +
  • diff --git a/assets/js/halcyon/halcyonUI.js b/assets/js/halcyon/halcyonUI.js old mode 100644 new mode 100755 index 52dd64d..bcce817 --- a/assets/js/halcyon/halcyonUI.js +++ b/assets/js/halcyon/halcyonUI.js @@ -1316,7 +1316,7 @@ $(document).on('click','.player',function(e) { e.stopPropagation(); }); $(document).on('click','.toot_entry', function(e) { -setOverlayStatus($(this).attr('sid')); +if($(this).attr('sid')) setOverlayStatus($(this).attr('sid')); }); }) function setOverlayMedia(sid,mediacount) { @@ -2298,6 +2298,29 @@ $(".poll_"+poll_id).remove(); } return false; }); +$(document).on('click','.poll_show_result',function(e) { +var poll_id = $(this).parent().data('poll'); +var poll_random = $(this).parent().data('random'); +if(poll_id !== null && poll_random !== null) { +api.get('polls/'+poll_id,function(data) { +data.seeresult = true; +$("#poll_"+poll_id+"_"+poll_random).after(poll_template(data)); +$("#poll_"+poll_id+"_"+poll_random).remove(); +}); +} +return false; +}); +$(document).on('click','.poll_refresh',function(e) { +var poll_id = $(this).parent().parent().data('poll'); +var poll_random = $(this).parent().parent().data('random'); +if(poll_id !== null && poll_random !== null) { +api.get('polls/'+poll_id,function(data) { +$("#poll_"+poll_id+"_"+poll_random).after(poll_template(data)); +$("#poll_"+poll_id+"_"+poll_random).remove(); +}); +} +return false; +}); $(document).on('click','.link_preview',function(e) { e.stopPropagation(); const ytcom = $(this).data("url").match(/https?:\/\/(www\.)?youtube\.com\/watch\?v=([a-zA-Z\d_-]+)/); diff --git a/assets/js/halcyon/halcyonWorker.js b/assets/js/halcyon/halcyonWorker.js old mode 100644 new mode 100755 diff --git a/assets/js/jquery-cookie/MIT-LICENSE.txt b/assets/js/jquery-cookie/MIT-LICENSE.txt old mode 100644 new mode 100755 diff --git a/assets/js/jquery-cookie/src/jquery.cookie.js b/assets/js/jquery-cookie/src/jquery.cookie.js old mode 100644 new mode 100755 diff --git a/assets/js/jquery/LICENSE.txt b/assets/js/jquery/LICENSE.txt old mode 100644 new mode 100755 diff --git a/assets/js/jquery/jquery.min.js b/assets/js/jquery/jquery.min.js old mode 100644 new mode 100755 diff --git a/assets/js/mastodon.js/LICENSE b/assets/js/mastodon.js/LICENSE old mode 100644 new mode 100755 diff --git a/assets/js/mastodon.js/mastodon.js b/assets/js/mastodon.js/mastodon.js old mode 100644 new mode 100755 index c066909..eea2e80 --- a/assets/js/mastodon.js/mastodon.js +++ b/assets/js/mastodon.js/mastodon.js @@ -218,14 +218,14 @@ postData = arguments[1]; callback = arguments[2]; } $.ajax({ -url: apiBase + endpoint, +url: config.instance + "/api/v2/" + endpoint, type: "POST", data: postData, contentType: false, processData: false, headers: {"Authorization": "Bearer " + config.api_user_token}, success: function(data, textStatus) { -console.log("Successful POST API request to " +apiBase+endpoint); +console.log("Successful POST API request to " +config.instance + "/api/v2/"+endpoint); callback(data,textStatus) }, error: function(xhr, textStatus, errorThrown) { diff --git a/assets/js/player/LICENSE-audio.txt b/assets/js/player/LICENSE-audio.txt old mode 100644 new mode 100755 diff --git a/assets/js/player/LICENSE-soundmanager.txt b/assets/js/player/LICENSE-soundmanager.txt old mode 100644 new mode 100755 diff --git a/assets/js/player/LICENSE-youplay.txt b/assets/js/player/LICENSE-youplay.txt old mode 100644 new mode 100755 diff --git a/assets/js/player/audio.js b/assets/js/player/audio.js old mode 100644 new mode 100755 diff --git a/assets/js/player/soundmanager.js b/assets/js/player/soundmanager.js old mode 100644 new mode 100755 diff --git a/assets/js/player/youplay.js b/assets/js/player/youplay.js old mode 100644 new mode 100755 diff --git a/assets/js/pomo/LICENSE.txt b/assets/js/pomo/LICENSE.txt old mode 100644 new mode 100755 diff --git a/assets/js/pomo/pomo.js b/assets/js/pomo/pomo.js old mode 100644 new mode 100755 diff --git a/assets/js/replace_emoji.js b/assets/js/replace_emoji.js old mode 100644 new mode 100755 diff --git a/assets/js/shortcut.js b/assets/js/shortcut.js old mode 100644 new mode 100755 diff --git a/assets/js/twemoji/LICENSE b/assets/js/twemoji/LICENSE old mode 100644 new mode 100755 diff --git a/assets/js/twemoji/twemoji.min.js b/assets/js/twemoji/twemoji.min.js old mode 100644 new mode 100755 diff --git a/authorize/.htaccess b/authorize/.htaccess old mode 100644 new mode 100755 diff --git a/authorize/mastodon-api/LICENSE b/authorize/mastodon-api/LICENSE old mode 100644 new mode 100755 diff --git a/authorize/mastodon-api/mastodon.php b/authorize/mastodon-api/mastodon.php old mode 100644 new mode 100755 diff --git a/authorize/mastodon.php b/authorize/mastodon.php old mode 100644 new mode 100755 diff --git a/bookmarks.php b/bookmarks.php old mode 100644 new mode 100755 diff --git a/config/config.ini.sample b/config/config.ini.sample old mode 100644 new mode 100755 index cb015ce..59cf395 --- a/config/config.ini.sample +++ b/config/config.ini.sample @@ -19,15 +19,15 @@ url_unshortener = true youplay = true vimeo = true youplay_fallback = true -invidious = invidiou.sh +invidious = invidious.snopyta.org nitter = nitter.13ad.de -bibliogram = bibliogram.dsrev.ru +bibliogram = bibliogram.ggc-project.de ; The proxy can be used optionally to resolve data for privacy-friendly media embeds on the server side - It is not used for Mastodon API requests on login -; Proxy type can be set to none, socks5, socks4, http or https - Example settings for locally installed Tor client +; Proxy type can be set to none, socks5, socks4, http or https [Proxy] -type = socks5 -domain = 127.0.0.1 -port = 9050 +type = none +domain = +port = username = password = diff --git a/config/footerlinks.txt.sample b/config/footerlinks.txt.sample old mode 100644 new mode 100755 diff --git a/config/imprint.txt.sample b/config/imprint.txt.sample old mode 100644 new mode 100755 diff --git a/config/privacy.txt b/config/privacy.txt old mode 100644 new mode 100755 diff --git a/config/terms.txt b/config/terms.txt old mode 100644 new mode 100755 diff --git a/data/.htaccess b/data/.htaccess old mode 100644 new mode 100755 diff --git a/direct.php b/direct.php old mode 100644 new mode 100755 diff --git a/docker/.dockerignore b/docker/.dockerignore old mode 100644 new mode 100755 diff --git a/docker/.gitignore b/docker/.gitignore old mode 100644 new mode 100755 diff --git a/docker/Dockerfile b/docker/Dockerfile old mode 100644 new mode 100755 diff --git a/docker/README.md b/docker/README.md old mode 100644 new mode 100755 diff --git a/docker/etc/supervisord.conf b/docker/etc/supervisord.conf old mode 100644 new mode 100755 diff --git a/docker/locale/default b/docker/locale/default old mode 100644 new mode 100755 diff --git a/docker/locale/locale.gen b/docker/locale/locale.gen old mode 100644 new mode 100755 diff --git a/docker/usr/local/etc/php-fpm.d/50-clear-env.conf b/docker/usr/local/etc/php-fpm.d/50-clear-env.conf old mode 100644 new mode 100755 diff --git a/docker/usr/local/etc/php-fpm.d/50-no-access-log.conf b/docker/usr/local/etc/php-fpm.d/50-no-access-log.conf old mode 100644 new mode 100755 diff --git a/docker/usr/local/etc/php-fpm.d/50-socket.conf b/docker/usr/local/etc/php-fpm.d/50-socket.conf old mode 100644 new mode 100755 diff --git a/docker/usr/local/etc/php/conf.d/00-best-practices.ini b/docker/usr/local/etc/php/conf.d/00-best-practices.ini old mode 100644 new mode 100755 diff --git a/docker/usr/local/etc/php/conf.d/00-performance.ini b/docker/usr/local/etc/php/conf.d/00-performance.ini old mode 100644 new mode 100755 diff --git a/docker/usr/local/etc/php/conf.d/00-security.ini b/docker/usr/local/etc/php/conf.d/00-security.ini old mode 100644 new mode 100755 diff --git a/federated.php b/federated.php old mode 100644 new mode 100755 diff --git a/footer.php b/footer.php old mode 100644 new mode 100755 diff --git a/header.php b/header.php old mode 100644 new mode 100755 diff --git a/home.php b/home.php old mode 100644 new mode 100755 diff --git a/index.php b/index.php old mode 100644 new mode 100755 diff --git a/instance.php b/instance.php old mode 100644 new mode 100755 diff --git a/language.php b/language.php old mode 100644 new mode 100755 diff --git a/lighttpd.conf b/lighttpd.conf old mode 100644 new mode 100755 index 54dd37a..1b8c3db --- a/lighttpd.conf +++ b/lighttpd.conf @@ -58,7 +58,7 @@ url.rewrite = ( "^/settings/followers/?$" => "/settings_accounts.php", "^/settings/mutes/?$" => "/settings_accounts.php", "^/settings/blocks/?$" => "/settings_accounts.php", -"^/@(.+)@(.+)\.([a-z]+)/status/(.+?)\/?\??(.*)/?$" => "/user.php?user=@$1@$2\.$3&status=$4&$5", +"^/@(.+)@(.+)\.([a-z]+)/status/(\w+)\/?\??(.*)/?$" => "/user.php?user=@$1@$2\.$3&status=$4&$5", "^/@(.+)@(.+)\.([a-z]+)/media\/?\??(.*)/?$" => "/user_only_media.php?user=@$1@$2\.$3&$4", "^/@(.+)@(.+)\.([a-z]+)/with_replies\/?\??(.*)/?$" => "/user_include_replies.php?user=@$1@$2\.$3&$4", "^/@(.+)@(.+)\.([a-z]+)/followers\/?\??(.*)/?$" => "/user_followers.php?user=@$1@$2\.$3&$4", diff --git a/lists.php b/lists.php old mode 100644 new mode 100755 diff --git a/lists_add.php b/lists_add.php old mode 100644 new mode 100755 diff --git a/lists_view.php b/lists_view.php old mode 100644 new mode 100755 diff --git a/local.php b/local.php old mode 100644 new mode 100755 diff --git a/locale/ar_DZ/LC_MESSAGES/messages.mo b/locale/ar_DZ/LC_MESSAGES/messages.mo old mode 100644 new mode 100755 diff --git a/locale/ar_DZ/LC_MESSAGES/messages.po b/locale/ar_DZ/LC_MESSAGES/messages.po old mode 100644 new mode 100755 diff --git a/locale/ca_ES/LC_MESSAGES/messages.mo b/locale/ca_ES/LC_MESSAGES/messages.mo old mode 100644 new mode 100755 diff --git a/locale/ca_ES/LC_MESSAGES/messages.po b/locale/ca_ES/LC_MESSAGES/messages.po old mode 100644 new mode 100755 diff --git a/locale/cs_CZ/LC_MESSAGES/messages.mo b/locale/cs_CZ/LC_MESSAGES/messages.mo old mode 100644 new mode 100755 diff --git a/locale/cs_CZ/LC_MESSAGES/messages.po b/locale/cs_CZ/LC_MESSAGES/messages.po old mode 100644 new mode 100755 diff --git a/locale/de_DE/LC_MESSAGES/messages.mo b/locale/de_DE/LC_MESSAGES/messages.mo old mode 100644 new mode 100755 diff --git a/locale/de_DE/LC_MESSAGES/messages.po b/locale/de_DE/LC_MESSAGES/messages.po old mode 100644 new mode 100755 diff --git a/locale/en_US/LC_MESSAGES/messages.mo b/locale/en_US/LC_MESSAGES/messages.mo old mode 100644 new mode 100755 diff --git a/locale/en_US/LC_MESSAGES/messages.po b/locale/en_US/LC_MESSAGES/messages.po old mode 100644 new mode 100755 diff --git a/locale/es_ES/LC_MESSAGES/messages.mo b/locale/es_ES/LC_MESSAGES/messages.mo old mode 100644 new mode 100755 diff --git a/locale/es_ES/LC_MESSAGES/messages.po b/locale/es_ES/LC_MESSAGES/messages.po old mode 100644 new mode 100755 diff --git a/locale/fr_FR/LC_MESSAGES/messages.mo b/locale/fr_FR/LC_MESSAGES/messages.mo old mode 100644 new mode 100755 diff --git a/locale/fr_FR/LC_MESSAGES/messages.po b/locale/fr_FR/LC_MESSAGES/messages.po old mode 100644 new mode 100755 diff --git a/locale/gl_ES/LC_MESSAGES/messages.mo b/locale/gl_ES/LC_MESSAGES/messages.mo old mode 100644 new mode 100755 diff --git a/locale/gl_ES/LC_MESSAGES/messages.po b/locale/gl_ES/LC_MESSAGES/messages.po old mode 100644 new mode 100755 diff --git a/locale/it_IT/LC_MESSAGES/messages.mo b/locale/it_IT/LC_MESSAGES/messages.mo old mode 100644 new mode 100755 diff --git a/locale/it_IT/LC_MESSAGES/messages.po b/locale/it_IT/LC_MESSAGES/messages.po old mode 100644 new mode 100755 diff --git a/locale/ja_JP/LC_MESSAGES/messages.mo b/locale/ja_JP/LC_MESSAGES/messages.mo old mode 100644 new mode 100755 diff --git a/locale/ja_JP/LC_MESSAGES/messages.po b/locale/ja_JP/LC_MESSAGES/messages.po old mode 100644 new mode 100755 diff --git a/locale/ko_KR/LC_MESSAGES/messages.mo b/locale/ko_KR/LC_MESSAGES/messages.mo old mode 100644 new mode 100755 diff --git a/locale/ko_KR/LC_MESSAGES/messages.po b/locale/ko_KR/LC_MESSAGES/messages.po old mode 100644 new mode 100755 diff --git a/locale/nl_NL/LC_MESSAGES/messages.mo b/locale/nl_NL/LC_MESSAGES/messages.mo old mode 100644 new mode 100755 diff --git a/locale/nl_NL/LC_MESSAGES/messages.po b/locale/nl_NL/LC_MESSAGES/messages.po old mode 100644 new mode 100755 diff --git a/locale/pl_PL/LC_MESSAGES/messages.mo b/locale/pl_PL/LC_MESSAGES/messages.mo old mode 100644 new mode 100755 diff --git a/locale/pl_PL/LC_MESSAGES/messages.po b/locale/pl_PL/LC_MESSAGES/messages.po old mode 100644 new mode 100755 diff --git a/locale/pt_BR/LC_MESSAGES/messages.mo b/locale/pt_BR/LC_MESSAGES/messages.mo old mode 100644 new mode 100755 diff --git a/locale/pt_BR/LC_MESSAGES/messages.po b/locale/pt_BR/LC_MESSAGES/messages.po old mode 100644 new mode 100755 diff --git a/locale/zh_CN/LC_MESSAGES/messages.mo b/locale/zh_CN/LC_MESSAGES/messages.mo new file mode 100755 index 0000000000000000000000000000000000000000..a3f6502911ceb33f571d6d75e355f15db7c0785f GIT binary patch literal 17787 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 YhwtUt9q;EroA{udnAq)hUZoZP|K&qDZ~y=R literal 0 HcmV?d00001 diff --git a/locale/zh_CN/LC_MESSAGES/messages.po b/locale/zh_CN/LC_MESSAGES/messages.po new file mode 100755 index 0000000..7e1a960 --- /dev/null +++ b/locale/zh_CN/LC_MESSAGES/messages.po @@ -0,0 +1,1000 @@ +msgid "" +msgstr "" +"Project-Id-Version: PACKAGE VERSION\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2019-06-21 08:47+0000\n" +"PO-Revision-Date: 2020-05-21 07:02+0000\n" +"Last-Translator: DylanWu \n" +"Language-Team: LANGUAGE \n" +"Language: zh_CN\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"Plural-Forms: nplurals=1; plural=0;\n" +"X-Generator: Pootle 2.8\n" +"X-Loco-Source-Locale: de_DE\n" +"X-Loco-Parser: loco_parse_po\n" +"X-POOTLE-MTIME: 1590044566.904773\n" + +msgid "Language" +msgstr "语言" + +msgid "Language_en_US" +msgstr "英语" + +msgid "Language_de_DE" +msgstr "德语" + +msgid "Language_ja_JP" +msgstr "日语" + +msgid "Language_ko_KR" +msgstr "韩语" + +msgid "Language_pl_PL" +msgstr "波兰语" + +msgid "Language_gl_ES" +msgstr "加里西亚语" + +msgid "Language_pt_BR" +msgstr "葡萄牙语(巴西)" + +msgid "Language_it_IT" +msgstr "意大利语(意大利)" + +msgid "Language_cs_CZ" +msgstr "捷克语" + +msgid "Language_fr_FR" +msgstr "法语(法国)" + +msgid "Language_nl_NL" +msgstr "荷兰语(荷兰)" + +msgid "Language_ca_ES" +msgstr "加泰隆语" + +msgid "Language_ar_DZ" +msgstr "阿拉伯语(阿尔及利亚)" + +msgid "Sensitive content" +msgstr "敏感内容" + +msgid "Click to view" +msgstr "单击以打开" + +msgid "SHOW MORE" +msgstr "显示更多" + +msgid "SHOW LESS" +msgstr "收起" + +msgid "Public" +msgstr "公开" + +msgid "Unlisted" +msgstr "不列出" + +msgid "Followers-only" +msgstr "关注者可见" + +msgid "Direct" +msgstr "私信" + +msgid "Delete Toot" +msgstr "删除嘟文" + +msgid "Unpin Toot" +msgstr "取消置顶嘟文" + +msgid "Pin Toot" +msgstr "置顶嘟文" + +msgid "Mute" +msgstr "静音" + +msgid "Block" +msgstr "屏蔽" + +msgid "Report this Toot" +msgstr "报告此嘟文" + +msgid "Copy link to Toot" +msgstr "复制嘟文链接" + +msgid "View original" +msgstr "查看源地址" + +msgid "Boosted" +msgstr "转发了" + +msgid "Pinned Toot" +msgstr "置顶嘟文" + +msgid "favourited Your Toot" +msgstr "赞了你的嘟文" + +msgid "boosted Your Toot" +msgstr "转发了你的嘟文" + +msgid "followed you" +msgstr "关注了你" + +msgid "Follow" +msgstr "关注" + +msgid "Toot your reply" +msgstr "输入你的回复" + +msgid "Reply" +msgstr "回复" + +msgid "Content warning" +msgstr "内容预警" + +msgid "Jan" +msgstr "1月" + +msgid "Feb" +msgstr "2月" + +msgid "Mar" +msgstr "3月" + +msgid "Apr" +msgstr "4月" + +msgid "May" +msgstr "5月" + +msgid "Jun" +msgstr "6月" + +msgid "Jul" +msgstr "7月" + +msgid "Aug" +msgstr "8月" + +msgid "Sep" +msgstr "9月" + +msgid "Oct" +msgstr "10月" + +msgid "Nov" +msgstr "11月" + +msgid "Dec" +msgstr "12月" + +msgid "Changed setting to" +msgstr "将设置更改为" + +msgid "Mark as NSFW by default enabled" +msgstr "默认标记为“工作場所不宜” 已启用" + +msgid "Mark as NSFW by default disabled" +msgstr "默认标记为“工作場所不宜” 已禁用" + +msgid "Who to follow enabled" +msgstr "推荐关注 已启用" + +msgid "Who to follow disabled" +msgstr "推荐关注 已禁用" + +msgid "Changed about me setting" +msgstr "更改了关于我的设置" + +msgid "Uploaded new avatar" +msgstr "上传了新头像" + +msgid "Uploaded new header" +msgstr "上传了新横幅" + +msgid "Account locked" +msgstr "帐号已上锁" + +msgid "Account unlocked" +msgstr "帐号已解锁" + +msgid "Link previews enabled" +msgstr "链接预览 已启用" + +msgid "Link previews disabled" +msgstr "链接预览 已禁用" + +msgid "You didn't allow notifications" +msgstr "未开启通知权限" + +msgid "Desktop notifications enabled" +msgstr "桌面通知 已启用" + +msgid "Desktop notifications disabled" +msgstr "桌面通知 已禁用" + +msgid "Replies shown" +msgstr "显示回复" + +msgid "Replies hidden" +msgstr "隐藏回复" + +msgid "CW content shown" +msgstr "显示警告内容" + +msgid "CW content hidden" +msgstr "隐藏警告内容" + +msgid "NSFW content shown" +msgstr "显示工作场所不宜内容" + +msgid "NSFW content hidden" +msgstr "隐藏工作场所不宜内容" + +msgid "Reply to" +msgstr "回复" + +msgid "Report" +msgstr "报告" + +msgid "Report a Toot of" +msgstr "报告一个嘟文" + +msgid "What's happening?" +msgstr "发生了什么？" + +msgid "Toot" +msgstr "嘟文" + +msgid "Compose new Toot" +msgstr "撰写新嘟文" + +msgid "Please describe what the problem with the Toot is." +msgstr "请描述这则嘟文的问题" + +msgid "TOOTS" +msgstr "嘟文" + +msgid "PEOPLE" +msgstr "人们" + +msgid "Settings" +msgstr "设置" + +msgid "GENERAL" +msgstr "常规" + +msgid "PROFILE" +msgstr "个人资料" + +msgid "APPEARANCE" +msgstr "外观" + +msgid "Change instance" +msgstr "更改实例" + +msgid "Blank for default" +msgstr "默认为空白" + +msgid "FOLLOWING" +msgstr "正在关注" + +msgid "Interesting accounts of devs" +msgstr "关注开发者帐户" + +msgid "Halcyon for" +msgstr "Halcyon for" + +msgid "About" +msgstr "关于" + +msgid "Terms" +msgstr "使用条款" + +msgid "Apps" +msgstr "应用" + +msgid "Source code" +msgstr "源代码" + +msgid "Other instances" +msgstr "其它实例" + +msgid "Privacy policy" +msgstr "隐私策略" + +msgid "Version" +msgstr "版本" + +msgid "Who to follow" +msgstr "推荐关注" + +msgid "Enable who to follow" +msgstr "启用 推荐关注" + +msgid "" +"Halcyon needs to connect to an external server to get a list of users which " +"have similar interests as you. If you want to use this feature, please opt-" +"in." +msgstr "Halcyon需要连接到外部服务器，以获得与您有相似兴趣的用户列表。如果您想使用此功能，请启用。" + +msgid "MORE" +msgstr "更多" + +msgid "FOLLOWERS" +msgstr "关注者" + +msgid "Following" +msgstr "正在关注" + +msgid "You'll no longer receive notifications from this user" +msgstr "您将不再收到来自该用户的通知" + +msgid "Unmuted this user" +msgstr "取消对该用户的静音" + +msgid "This user has been blocked" +msgstr "该用户已被屏蔽" + +msgid "Unblocked this user" +msgstr "取消屏蔽该用户" + +msgid "Your Toot has been deleted" +msgstr "您的嘟文已被删除" + +msgid "Your Toot has been pinned" +msgstr "您的嘟文已被置顶" + +msgid "Your Toot has been unpinned" +msgstr "您的嘟文已被取消置顶" + +msgid "Edit profile" +msgstr "编辑个人资料" + +msgid "FAVOURITES" +msgstr "点赞" + +msgid "Show" +msgstr "显示" + +msgid "Blocking" +msgstr "屏蔽" + +msgid "Muting" +msgstr "静音" + +msgid "Requested" +msgstr "请求" + +msgid "Photos and toots" +msgstr "照片和嘟文" + +msgid "favourited your toot" +msgstr "赞了你的嘟文" + +msgid "boosted your toot" +msgstr "转发了你的嘟文" + +msgid "mentioned you" +msgstr "提到了你" + +msgid "Your Toot was posted!" +msgstr "你的嘟文已发送！" + +msgid "News" +msgstr "新闻" + +msgid "Source" +msgstr "源" + +msgid "Privacy" +msgstr "隐私" + +msgid "Imprint" +msgstr "版本说明" + +msgid "Contact" +msgstr "联系" + +msgid "Login" +msgstr "登录" + +msgid "Login to Halcyon" +msgstr "登录到 Halcyon" + +msgid "create an account" +msgstr "创建帐户" + +msgid "or" +msgstr "或" + +msgid "I agree with the" +msgstr "我同意" + +msgid "What is Halcyon" +msgstr "什么是 Halcyon" + +msgid "" +"which aims to recreate the simple and beautiful user interface of Twitter " +"while keeping all advantages of decentral networks in focus." +msgstr "其目的是重新制作一个类 Twitter 的用户界面，力求简洁美观的同时，注重分布式网络的所有优势。" + +msgid "Halcyon is a webclient for" +msgstr "Halcyon 是一个网页客户端，兼容" + +msgid "Contact / Feedback" +msgstr "联系 / 反馈" + +msgid "Use my contact form" +msgstr "使用我的联系表格" + +msgid "Help us" +msgstr "帮助我们" + +msgid "Halcyon Terms of Use" +msgstr "Halcyon 使用条款" + +msgid "" +"This terms of use agreement is for the users of web service Halcyon for " +"Mastodon and Pleroma (Halcyon for short) hosted at" +msgstr "本使用条款协议适用于托管在以下Web服务Halcyon：Mastodon和Pleroma（简称Halcyon）。" + +msgid "Your Reply was posted!" +msgstr "你的回复已发送！" + +msgid "Toot reported successfully!" +msgstr "成功报告嘟文！" + +msgid "Link successfully copied!" +msgstr "成功复制链接！" + +msgid "Home" +msgstr "首页" + +msgid "Local" +msgstr "本地" + +msgid "Federated" +msgstr "跨站" + +msgid "Notifications" +msgstr "通知" + +msgid "Search Mastodon" +msgstr "搜索 Mastodon" + +msgid "View profile" +msgstr "查看资料" + +msgid "Log out" +msgstr "注销" + +msgid "All" +msgstr "所有" + +msgid "new notitification" +msgstr "新通知" + +msgid "Show all NSFW content" +msgstr "显示所有 工作场所不宜 内容" + +msgid "Show all CW content" +msgstr "显示所有 警告内容" + +msgid "Show replies" +msgstr "显示回复" + +msgid "Desktop notifications" +msgstr "桌面通知" + +msgid "Enable link previews" +msgstr "启用链接预览" + +msgid "Auto update" +msgstr "自动更新" + +msgid "Manual update" +msgstr "手动更新" + +msgid "Appearance settings" +msgstr "外观选项" + +msgid "New posts streaming" +msgstr "瀑布流更新" + +msgid "replies" +msgstr "回复" + +msgid "General settings" +msgstr "常规设置" + +msgid "Default post privacy" +msgstr "默认嘟文可见范围" + +msgid "Mark as NSFW by default" +msgstr "默认标记为 工作场所不宜" + +msgid "Media" +msgstr "媒体" + +msgid "FOLLOWS YOU" +msgstr "关注了你" + +msgid "Local instance" +msgstr "本地实例" + +msgid "Hashtag search filter" +msgstr "标签搜索过滤" + +msgid "All instances" +msgstr "所有实例" + +msgid "Local only" +msgstr "仅本地" + +msgid "Lock account" +msgstr "锁定帐户" + +msgid "Header" +msgstr "横幅" + +msgid "Avatar" +msgstr "头像" + +msgid "About me" +msgstr "关于" + +msgid "Display name" +msgstr "显示名" + +msgid "Profile settings" +msgstr "资料设置" + +msgid "Toots" +msgstr "嘟文" + +msgid "Favourites" +msgstr "点赞" + +msgid "New favourite" +msgstr "新点赞" + +msgid "New boost" +msgstr "新转发" + +msgid "New follower" +msgstr "新关注者" + +msgid "New mention" +msgstr "新提及" + +msgid "Dark theme enabled" +msgstr "暗黑模式 已启用" + +msgid "Dark theme disabled" +msgstr "暗黑模式 已禁用" + +msgid "Only on top" +msgstr "只在最上面" + +msgid "Enable dark theme" +msgstr "开启暗黑模式" + +msgid "Please enter the new name for this list." +msgstr "请输入列表的新名称" + +msgid "The name of your list can't be empty!" +msgstr "列表名称不能为空！" + +msgid "Your list has been renamed" +msgstr "列表名称已修改" + +msgid "Are you sure that you want to delete this list?" +msgstr "确认删除此列表？" + +msgid "Your list has been deleted" +msgstr "已删除列表" + +msgid "Please enter the name of your new list." +msgstr "请输入新列表的名称" + +msgid "Add" +msgstr "添加" + +msgid "Remove" +msgstr "删除" + +msgid "Add to list" +msgstr "添加到列表" + +msgid "Are you sure that you want to mute this user?" +msgstr "确定要静音此用户？" + +msgid "Are you sure that you want to block this user?" +msgstr "确定要屏蔽此用户？" + +msgid "Are you sure that you want to delete this toot?" +msgstr "确定要删除这则嘟文？" + +msgid "Added this account to the list" +msgstr "添加用户到此列表" + +msgid "" +"You need to follow this user to add him/her to the list. Do you want to do " +"that now?" +msgstr "需要关注此用户以将他/她添加到列表中，确定关注？" + +msgid "You successfully followed this user." +msgstr "成功关注此用户" + +msgid "Removed this account from the list" +msgstr "从列表中移除该用户" + +msgid "Joined at" +msgstr "加入" + +msgid "Direct messages" +msgstr "私信" + +msgid "Lists" +msgstr "列表" + +msgid "Open public profile" +msgstr "打开公开个人资料" + +msgid "My Lists" +msgstr "我的列表" + +msgid "Confirmation" +msgstr "确认" + +msgid "Yes" +msgstr "是" + +msgid "Cancel" +msgstr "取消" + +msgid "Prompt" +msgstr "提示" + +msgid "Ok" +msgstr "确认" + +msgid "Autocomplete enabled" +msgstr "自动补全 已启用" + +msgid "Autocomplete disabled" +msgstr "自动补全 已禁用" + +msgid "Changed custom profile field" +msgstr "修改自定义资料区" + +msgid "Notifications when tab is closed enabled" +msgstr "始终开启通知（包括页面关闭后） 已启用" + +msgid "Notifications when tab is closed disabled" +msgstr "始终开启通知（包括页面关闭后） 已禁用" + +msgid "Toots of bots shown" +msgstr "显示机器人嘟文" + +msgid "Toots of bots hidden" +msgstr "隐藏机器人嘟文" + +msgid "Filter created" +msgstr "创建过滤器" + +msgid "Gif animations enabled" +msgstr "GIF 动画 已启用" + +msgid "Gif animations disabled" +msgstr "GIF 动画 已禁用" + +msgid "Video player enabled" +msgstr "视频播放器 已启用" + +msgid "Video player disabled" +msgstr "视频播放器 已禁用" + +msgid "Audio player enabled" +msgstr "音频播放器 已启用" + +msgid "Audio player disabled" +msgstr "音频播放器 已禁用" + +msgid "PeerTube embeds enabled" +msgstr "PeerTube 嵌入 已启用" + +msgid "PeerTube embeds disabled" +msgstr "PeerTube 嵌入 已禁用" + +msgid "YouPlay embeds enabled" +msgstr "YouPlay 嵌入 已启用" + +msgid "YouPlay embeds disabled" +msgstr "YouPlay 嵌入 已禁用" + +msgid "Invidio.us embeds enabled" +msgstr "Invidio.us 嵌入 已启用" + +msgid "Invidio.us embeds disabled" +msgstr "Invidio.us 嵌入 已禁用" + +msgid "Vimeo embeds enabled" +msgstr "Vimeo 嵌入 已启用" + +msgid "Vimeo embeds disabled" +msgstr "Vimeo 嵌入 已禁用" + +msgid "Thread" +msgstr "时间线" + +msgid "Never" +msgstr "从不" + +msgid "Don't change" +msgstr "不更改" + +msgid "Filter updated" +msgstr "过滤器更新" + +msgid "Are you sure that you want to delete this filter?" +msgstr "确实要删除此过滤器吗？" + +msgid "Your filter has been deleted" +msgstr "过滤器已被删除" + +msgid "Toot to" +msgstr "发嘟文至" + +msgid "Administrated by" +msgstr "管理员" + +msgid "Users" +msgstr "用户" + +msgid "Connections" +msgstr "连接" + +msgid "Notifications when tab closed" +msgstr "始终推送通知（包括页面关闭后）" + +msgid "Filter settings" +msgstr "过滤器设置" + +msgid "Show toots of bots" +msgstr "显示机器人的嘟文" + +msgid "Add new filter" +msgstr "添加新的过滤器" + +msgid "Create a filter" +msgstr "创建过滤器" + +msgid "Word or phrase to filter" +msgstr "要过滤的词或短语" + +msgid "Filter in the following timelines" +msgstr "过滤以下时间轴" + +msgid "Expires in" +msgstr "过期时间：" + +msgid "Autocomplete in compose field" +msgstr "在撰写字段中自动完成" + +msgid "Media settings" +msgstr "媒体设置" + +msgid "Play animated GIFs" +msgstr "播放GIF动画" + +msgid "Enable video player" +msgstr "启用视频播放器" + +msgid "Enable audio player" +msgstr "启用音频播放器" + +msgid "Embed PeerTube videos" +msgstr "插入 PeerTube 视频" + +msgid "Embed YouTube using YouPlay" +msgstr "用 YouPlay 插入 YouTube 视频" + +msgid "Embed YouTube using Invidio.us" +msgstr "用 Invidio.us 插入 YouTube 视频" + +msgid "Embed Vimeo using YouPlay" +msgstr "用 YouPlay 插入 Vimeo 视频" + +msgid "Custom profile fields" +msgstr "自定义资料字段" + +msgid "Name" +msgstr "名称" + +msgid "Value" +msgstr "值" + +msgid "" +"To verify that the links in your custom fields really belong to you, you can " +"add the link below to your website. The link text can be changed to whatever " +"you want." +msgstr "要验证自定义字段中链接的真实归属，可以将以下链接添加到您的网站。链接文本可以更改为所需的任何内容。" + +msgid "Message" +msgstr "消息" + +msgid "Filter" +msgstr "过滤器" + +msgid "second" +msgstr "秒" + +msgid "seconds" +msgstr "秒" + +msgid "minute" +msgstr "分" + +msgid "minutes" +msgstr "分" + +msgid "hour" +msgstr "时" + +msgid "hours" +msgstr "时" + +msgid "day" +msgstr "天" + +msgid "days" +msgstr "天" + +msgid "week" +msgstr "周" + +msgid "Filter posts irreversible" +msgstr "过滤不可逆帖子" + +msgid "Whole word" +msgstr "全字匹配" + +msgid "FILTERS" +msgstr "过滤器" + +msgid "MEDIA" +msgstr "媒体" + +msgid "Dark theme reset to standard" +msgstr "暗黑模式重设至标准" + +msgid "Pictures shown in full height" +msgstr "图片以全高显示" + +msgid "Pictures shown in default height" +msgstr "图片以默认高度显示" + +msgid "Threads shown in thread view" +msgstr "时间线视图中显示的时间线" + +msgid "Threads shown in chronological order" +msgstr "按时间顺序显示时间线" + +msgid "Final results" +msgstr "寻找结果" + +msgid "votes" +msgstr "投票" + +msgid "left" +msgstr "居左" + +msgid "Vote" +msgstr "投票" + +msgid "A poll you participated in has ended" +msgstr "参与的一项投票调查已结束" + +msgid "Days" +msgstr "天" + +msgid "Hours" +msgstr "时" + +msgid "Minutes" +msgstr "分" + +msgid "Multiple choice" +msgstr "多项选择" + +msgid "Poll finished" +msgstr "投票完成" + +msgid "" +"If you close the overlay, your text will get deleted! Are you sure you want " +"to close it?" +msgstr "如果离开，编辑的文本将丢失！确定要离开？" + +msgid "Website" +msgstr "网站" + +msgid "Show pictures in full height" +msgstr "以全高显示图片" + +msgid "Show threads in thread view in timeline" +msgstr "以时间轴形式显示时间线" + +msgid "Unblock" +msgstr "取消屏蔽" + +msgid "Unmute" +msgstr "取消静音" + +msgid "Accept" +msgstr "接受" + +msgid "Reject" +msgstr "拒绝" + +msgid "You can only add four pictures to one post!" +msgstr "一则嘟文只能添加四张图片！" + +msgid "You can not add media files to posts with polls!" +msgstr "投票嘟文无法添加媒体文件！" + +msgid "Add a caption to the media file" +msgstr "为媒体文件添加标题" + +msgid "Caption added successfully!" +msgstr "已成功添加标题！" + +msgid "Share a link on Mastodon" +msgstr "在Mastodon上分享链接" + +msgid "Share a link with your followers" +msgstr "与关注者分享链接" + +msgid "Post a Toot on Mastodon" +msgstr "在 Mastodon 上发布嘟文" + +msgid "" +"Toot posted successfully but your browser doesn't allow closing the window" +msgstr "嘟文发布成功，但浏览器不允许关闭窗口" + +msgid "Sign up" +msgstr "注册" + +msgid "Username" +msgstr "用户名" + +msgid "Log in and Toot" +msgstr "登录并发嘟" + +msgid "New to Mastodon?" +msgstr "刚接触 Mastodon ？" + +msgid "" +"Get instant updates from your friends, industry experts, favorite " +"celebrities, and what's happening around the world." +msgstr "从你的朋友，行业专家，喜爱的名人以及世界各地的最新动态中获取信息。" + +msgid "What is Mastodon? Learn more." +msgstr "什么是 Mastodon ？了解更多" + +msgid "Please describe what you can see in the picture." +msgstr "请描述您在图片中看到的内容。" + +msgid "Save" +msgstr "保存" + +msgid "BLOCKS" +msgstr "屏蔽" + +msgid "MUTES" +msgstr "静音" + +msgid "FOLLOW REQUESTS" +msgstr "关注请求" diff --git a/login/assets/css/style.css b/login/assets/css/style.css old mode 100644 new mode 100755 diff --git a/login/assets/images/background.jpg b/login/assets/images/background.jpg old mode 100644 new mode 100755 diff --git a/login/assets/images/halcyon-title.png b/login/assets/images/halcyon-title.png old mode 100644 new mode 100755 diff --git a/login/assets/images/halcyon_logo.png b/login/assets/images/halcyon_logo.png old mode 100644 new mode 100755 diff --git a/login/assets/images/preview0.png b/login/assets/images/preview0.png old mode 100644 new mode 100755 diff --git a/login/assets/images/preview1.png b/login/assets/images/preview1.png old mode 100644 new mode 100755 diff --git a/login/assets/images/preview2.png b/login/assets/images/preview2.png old mode 100644 new mode 100755 diff --git a/login/assets/js/halcyon_login.js b/login/assets/js/halcyon_login.js old mode 100644 new mode 100755 diff --git a/login/auth.php b/login/auth.php old mode 100644 new mode 100755 diff --git a/login/footer.php b/login/footer.php old mode 100644 new mode 100755 diff --git a/login/header.php b/login/header.php old mode 100644 new mode 100755 diff --git a/login/imprint.php b/login/imprint.php old mode 100644 new mode 100755 diff --git a/login/login.php b/login/login.php old mode 100644 new mode 100755 diff --git a/login/logout.php b/login/logout.php old mode 100644 new mode 100755 diff --git a/login/privacy.php b/login/privacy.php old mode 100644 new mode 100755 diff --git a/login/terms.php b/login/terms.php old mode 100644 new mode 100755 diff --git a/media/image.php b/media/image.php old mode 100644 new mode 100755 diff --git a/media/invidious.php b/media/invidious.php old mode 100644 new mode 100755 diff --git a/media/video.php b/media/video.php old mode 100644 new mode 100755 diff --git a/media/vimeo.php b/media/vimeo.php old mode 100644 new mode 100755 diff --git a/media/vimeocaption.php b/media/vimeocaption.php old mode 100644 new mode 100755 diff --git a/media/vimeoclass.php b/media/vimeoclass.php old mode 100644 new mode 100755 diff --git a/media/youplay.php b/media/youplay.php old mode 100644 new mode 100755 diff --git a/media/ytcaption.php b/media/ytcaption.php old mode 100644 new mode 100755 diff --git a/media/ytclass.php b/media/ytclass.php old mode 100644 new mode 100755 diff --git a/media/ytthumbs.php b/media/ytthumbs.php old mode 100644 new mode 100755 diff --git a/nginx.conf b/nginx.conf old mode 100644 new mode 100755 diff --git a/notifications.php b/notifications.php old mode 100644 new mode 100755 diff --git a/search_hash_tag.php b/search_hash_tag.php old mode 100644 new mode 100755 diff --git a/search_user.php b/search_user.php old mode 100644 new mode 100755 diff --git a/settings_accounts.php b/settings_accounts.php old mode 100644 new mode 100755 diff --git a/settings_appearance.php b/settings_appearance.php old mode 100644 new mode 100755 diff --git a/settings_filters.php b/settings_filters.php old mode 100644 new mode 100755 diff --git a/settings_general.php b/settings_general.php old mode 100644 new mode 100755 diff --git a/settings_media.php b/settings_media.php old mode 100644 new mode 100755 diff --git a/settings_profile.php b/settings_profile.php old mode 100644 new mode 100755 diff --git a/share.php b/share.php old mode 100644 new mode 100755 diff --git a/unshorten.php b/unshorten.php old mode 100644 new mode 100755 diff --git a/user.php b/user.php old mode 100644 new mode 100755 diff --git a/user_favorite.php b/user_favorite.php old mode 100644 new mode 100755 diff --git a/user_followers.php b/user_followers.php old mode 100644 new mode 100755 diff --git a/user_following.php b/user_following.php old mode 100644 new mode 100755 diff --git a/user_include_replies.php b/user_include_replies.php old mode 100644 new mode 100755 diff --git a/user_only_media.php b/user_only_media.php old mode 100644 new mode 100755 diff --git a/version.txt b/version.txt old mode 100644 new mode 100755 diff --git a/who_to_follow.php b/who_to_follow.php old mode 100644 new mode 100755 diff --git a/widgets/create_status.php b/widgets/create_status.php old mode 100644 new mode 100755 diff --git a/widgets/lists_header.php b/widgets/lists_header.php old mode 100644 new mode 100755 diff --git a/widgets/overlay_addlist.php b/widgets/overlay_addlist.php old mode 100644 new mode 100755 diff --git a/widgets/overlay_caption.php b/widgets/overlay_caption.php old mode 100644 new mode 100755 diff --git a/widgets/overlay_confirm.php b/widgets/overlay_confirm.php old mode 100644 new mode 100755 diff --git a/widgets/overlay_copy_link.php b/widgets/overlay_copy_link.php old mode 100644 new mode 100755 diff --git a/widgets/overlay_create_status.php b/widgets/overlay_create_status.php old mode 100644 new mode 100755 diff --git a/widgets/overlay_filter.php b/widgets/overlay_filter.php old mode 100644 new mode 100755 diff --git a/widgets/overlay_message.php b/widgets/overlay_message.php old mode 100644 new mode 100755 diff --git a/widgets/overlay_prompt.php b/widgets/overlay_prompt.php old mode 100644 new mode 100755 diff --git a/widgets/overlay_redirect_bibliogram.php b/widgets/overlay_redirect_bibliogram.php old mode 100644 new mode 100755 diff --git a/widgets/overlay_redirect_invidious.php b/widgets/overlay_redirect_invidious.php old mode 100644 new mode 100755 diff --git a/widgets/overlay_redirect_nitter.php b/widgets/overlay_redirect_nitter.php old mode 100644 new mode 100755 diff --git a/widgets/overlay_redirect_nofb.php b/widgets/overlay_redirect_nofb.php old mode 100644 new mode 100755 diff --git a/widgets/overlay_report_status.php b/widgets/overlay_report_status.php old mode 100644 new mode 100755 diff --git a/widgets/overlay_rewrite_bibliogram.php b/widgets/overlay_rewrite_bibliogram.php old mode 100644 new mode 100755 diff --git a/widgets/overlay_rewrite_invidious.php b/widgets/overlay_rewrite_invidious.php old mode 100644 new mode 100755 diff --git a/widgets/overlay_rewrite_nitter.php b/widgets/overlay_rewrite_nitter.php old mode 100644 new mode 100755 diff --git a/widgets/overlay_rewrite_nofb.php b/widgets/overlay_rewrite_nofb.php old mode 100644 new mode 100755 diff --git a/widgets/overlay_single_reply.php b/widgets/overlay_single_reply.php old mode 100644 new mode 100755 diff --git a/widgets/search_header.php b/widgets/search_header.php old mode 100644 new mode 100755 diff --git a/widgets/settings_header.php b/widgets/settings_header.php old mode 100644 new mode 100755 diff --git a/widgets/side_change_local.php b/widgets/side_change_local.php old mode 100644 new mode 100755 diff --git a/widgets/side_current_user.php b/widgets/side_current_user.php old mode 100644 new mode 100755 diff --git a/widgets/side_dev_team.php b/widgets/side_dev_team.php old mode 100644 new mode 100755 diff --git a/widgets/side_firefox_addon.php b/widgets/side_firefox_addon.php old mode 100644 new mode 100755 diff --git a/widgets/side_footer.php b/widgets/side_footer.php old mode 100644 new mode 100755 diff --git a/widgets/side_trending.php b/widgets/side_trending.php old mode 100644 new mode 100755 diff --git a/widgets/side_who_to_follow.php b/widgets/side_who_to_follow.php old mode 100644 new mode 100755 diff --git a/widgets/user_header.php b/widgets/user_header.php old mode 100644 new mode 100755 diff --git a/widgets/user_recent_images.php b/widgets/user_recent_images.php old mode 100644 new mode 100755