about summary refs log tree commit diff
AgeCommit message (Collapse)Author
2018-07-17Merge pull request #578 from ThibG/glitch-soc/merge-upstreamThibG
Merge upstream changes
2018-07-17Hide "A look inside" in mobile layout on frontpage (#8044)Eugen Rochko
2018-07-17Ensure container of React components has full width (#8043)Eugen Rochko
Fix #8018
2018-07-17Update supported Node.js version (#8041)abcang
2018-07-17Add missing translation for admin dashboard trends section (#8040)Eugen Rochko
2018-07-16Fix number of results returned from TrendingTags.getEugen Rochko
2018-07-16Fix tag usage display on admin dashboardEugen Rochko
2018-07-16Display trending hashtags on admin dashboard (#8038)Eugen Rochko
2018-07-16Fix ActivityPub::UpdateDistributionWorker regression (#8039)Eugen Rochko
Regression from #7998 let to profile updates not sending
2018-07-16Fix activity:interactions counter to count all interactions (#8037)Eugen Rochko
2018-07-16Avoid loading rails-ujs twice on vanilla flavourThibaut Girka
2018-07-16Whitelist dat/ipfs/gopher links in sanitizer (#8034)Eugen Rochko
Fix #7994
2018-07-16Merge branch 'master' into glitch-soc/merge-upstreamThibaut Girka
Conflicts: Dockerfile app/javascript/packs/common.js config/webpack/loaders/sass.js config/webpack/shared.js db/schema.rb package.json yarn.lock A lot of the conflicts come from updating webpack. Even though upstream deleted app/javascript/packs/common.js, I kept glitch-soc's version as it unifies JS/CSS packs behavior across flavours. Ported glitch changes to webpack 4.x
2018-07-16i18n: Update Polish translation (#8032)Marcin Mikołajczak
Signed-off-by: Marcin Mikołajczak <me@m4sk.in>
2018-07-16Fix typo in Admin::DashboardController#indexEugen Rochko
2018-07-16Add admin dashboard (#8029)Eugen Rochko
2018-07-15Fix index detection a migration to revert index change (#8026)Akihiko Odaki
2018-07-15Upgrade Node.js to v8.x on nvmrc (#8023)THE BOSS ♨
2018-07-15Dockerfile: run asset precompilation as a build step (#7780)Kevin Liu
* Dockerfile: run asset precompilation as a build step * Replace OTP_SECRET and SECRET_KEY_BASE with placeholders
2018-07-15Use LoadingBar instead of blur to indicate that an image is loading (fixes ↵ThibG
#4060) (#7562)
2018-07-15Downgrade react-swipeable-views to v0.12.13 from v0.12.14 (#8022)Yamagishi Kazutoshi
2018-07-14Do not cause an error if domain_lists.blocks.next is undefined (#8021)ThibG
A valid URL is always truthy, so we can simplify this check
2018-07-14Upgrade Node.js to v8.x on Docker image (#8019)Yamagishi Kazutoshi
2018-07-14Add missing Korean translations (#8017)Jeong Arm
2018-07-14Display full acct on public status pages, always (#8011)Eugen Rochko
2018-07-14Disable language detection for texts shorter than 140 characters (#8010)Eugen Rochko
If the input text is blank after preparation (only mention, or only URL, or empty as in a media post), then use nil as language, since it's OK to show to everyone. Otherwise, always fall back to the server's default locale
2018-07-14Fix streaming API still using filtered instead of chosen languages (#8009)Eugen Rochko
2018-07-14Fix static GIFs being saved as empty files when using local storage (#8012)Eugen Rochko
Fix #7997 Fix #6237
2018-07-14Upgrade webpack to version v4.x (#6655)Yamagishi Kazutoshi
2018-07-14Display Mastodon version in footer of web UI (#8013)Eugen Rochko
Fix #7846
2018-07-14Weblate translations (2018-07-14) (#8016)Eugen Rochko
* Translated using Weblate (Slovak) Currently translated at 97.7% (622 of 636 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/sk/ * Translated using Weblate (Dutch) Currently translated at 100.0% (636 of 636 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/nl/ * Translated using Weblate (Czech) Currently translated at 100.0% (306 of 306 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/cs/ * Translated using Weblate (Japanese) Currently translated at 99.8% (635 of 636 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/ja/ * Translated using Weblate (Japanese) Currently translated at 93.5% (73 of 78 strings) Translation: Mastodon/Preferences Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/ja/ * Translated using Weblate (Portuguese (Brazil)) Currently translated at 100.0% (98 of 98 strings) Translation: Mastodon/Doorkeeper Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/doorkeeper/pt_BR/ * Translated using Weblate (Greek) Currently translated at 100.0% (306 of 306 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/el/ * Translated using Weblate (Occitan) Currently translated at 100.0% (306 of 306 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/oc/ * Translated using Weblate (Slovak) Currently translated at 100.0% (306 of 306 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/sk/ * Translated using Weblate (German) Currently translated at 100.0% (78 of 78 strings) Translation: Mastodon/Preferences Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/de/ Eine Option ist "nie", also muss es das Ablaufdatum sein, nicht das Datum bis wann es gültig ist * Translated using Weblate (Japanese) Currently translated at 99.6% (305 of 306 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/ja/ * Translated using Weblate (Japanese) Currently translated at 100.0% (98 of 98 strings) Translation: Mastodon/Doorkeeper Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/doorkeeper/ja/ * Translated using Weblate (Portuguese (Brazil)) Currently translated at 100.0% (306 of 306 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/pt_BR/ * Translated using Weblate (Greek) Currently translated at 100.0% (80 of 80 strings) Translation: Mastodon/Preferences Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/el/ * Translated using Weblate (Slovak) Currently translated at 98.7% (79 of 80 strings) Translation: Mastodon/Preferences Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/sk/ * Translated using Weblate (Slovak) Currently translated at 97.7% (622 of 636 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/sk/ * Translated using Weblate (Danish) Currently translated at 100.0% (80 of 80 strings) Translation: Mastodon/Preferences Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/da/ * Translated using Weblate (Galician) Currently translated at 100.0% (643 of 643 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/gl/ * Translated using Weblate (Galician) Currently translated at 100.0% (82 of 82 strings) Translation: Mastodon/Preferences Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/gl/ * Translated using Weblate (Persian) Currently translated at 100.0% (306 of 306 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/fa/ * Translated using Weblate (Persian) Currently translated at 100.0% (82 of 82 strings) Translation: Mastodon/Preferences Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/fa/ * Translated using Weblate (Japanese) Currently translated at 93.9% (77 of 82 strings) Translation: Mastodon/Preferences Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/ja/ * Translated using Weblate (Japanese) Currently translated at 99.2% (638 of 643 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/ja/ * Translated using Weblate (Japanese) Currently translated at 99.3% (639 of 643 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/ja/ * Translated using Weblate (Danish) Currently translated at 77.2% (497 of 643 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/da/ * Translated using Weblate (Greek) Currently translated at 100.0% (82 of 82 strings) Translation: Mastodon/Preferences Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/el/ * Translated using Weblate (Greek) Currently translated at 99.8% (642 of 643 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/el/ * Translated using Weblate (Dutch) Currently translated at 100.0% (82 of 82 strings) Translation: Mastodon/Preferences Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/nl/ * Translated using Weblate (Dutch) Currently translated at 100.0% (306 of 306 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/nl/ * Translated using Weblate (Dutch) Currently translated at 100.0% (643 of 643 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/nl/ * Translated using Weblate (Slovak) Currently translated at 98.7% (81 of 82 strings) Translation: Mastodon/Preferences Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/sk/ * Translated using Weblate (Slovak) Currently translated at 97.0% (624 of 643 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/sk/ * Translated using Weblate (Czech) Currently translated at 5.2% (34 of 643 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/cs/ * i18n-tasks normalize && yarn manage:translations
2018-07-14Do not count self in potential friendships (#8014)Eugen Rochko
2018-07-14Add dependencies for uWebSockets (#7466)Jeong Arm
UWS needs openssl and zlib https://github.com/uNetworking/uWebSockets/wiki/Misc.-details#dependencies
2018-07-14Update uws dependency to 10.148.0 (#7448)Petko Bordjukov
This release fixes issues with open events, adds Node 10 support and drops Node 4, 5, 6 and 7. Changes: https://github.com/elementengineering/uWebSockets-bindings/compare/6152fb6787704a61584f920eb27ff5441d3c8c8f...689c15c59e5065b22415266f398ed29118dbe562
2018-07-13Add federation relay support (#7998)Eugen Rochko
* Add federation relay support * Add admin UI for managing relays * Include actor on relay-related activities * Fix i18n
2018-07-12Merge pull request #575 from ThibG/glitch-soc/merge-upstreamThibG
Merge upstream changes
2018-07-12Merge branch 'master' into glitch-soc/merge-upstreamThibaut Girka
2018-07-12Add an option restricting secondary toot privacy to that of the toot being ↵Thibaut Girka
replied to
2018-07-12Fix whole-word selection and i18n: Add Japanese translation for Whole-word ↵mayaeh
(#8004) * Add Japanese translation for "Whole word" and add it's description. * Fix to enable "Whole-word" selection.
2018-07-12Move privacyPreference to utilsThibaut Girka
2018-07-12[Glitch] Refactor privacyPrefence() to use priority listThibaut Girka
Port f2d9a3c239bcab5fcbede22549b67bfd841a3880 to glitch-soc
2018-07-12Use options rather than a booleanThibaut Girka
This prepares for a third option that would restrict privacy to privacyPreference(replyPrivacy, sideArmBasePrivacy)
2018-07-12Do not store duplicate reply_privacyThibaut Girka
2018-07-12add option to enable auto visibility on secondary toot buttonAsh Levy
2018-07-11[Glitch] Make whole-word filter regex consistent between Ruby and JSThibaut Girka
Port front-end part of 20fefdb7145b48449e9d6a824a9846dadfd6ac2f to glitch-soc
2018-07-11[Glitch] Add follow button to detailed status, add gradient to mask bio ↵Thibaut Girka
cut-off (fixes #566) Port 30e1da7668c6c42aa5f15bdc9caab1929235f78f to glitch-soc
2018-07-11Merge pull request #567 from ThibG/glitch-soc/merge-upstreamThibG
Merge upstream changes
2018-07-11Merge branch 'master' into glitch-soc/merge-upstreamThibaut Girka
2018-07-11Bump version to 2.4.3Eugen Rochko
2018-07-11Add missing Korean translation (#7993)Jeong Arm
* Add missing Korean translation * Remove deleted strings
generated by cgit-pink (git 2.37.1) at 2024-11-04 06:26:54 +0000