about summary refs log tree commit diff
AgeCommit message (Collapse)Author
2018-10-22[Glitch] RTL: fix domain append at signup formThibaut Girka
Port 65b3804a6ccd40d359616b6157682ff88f85462f to glitch-soc
2018-10-22[Glitch] Fixes 8987 broken alignment at "Remote interaction dialog"Thibaut Girka
Port d35801aaa2ad9d06345efa45cf524113469fdd02 to glitch-soc
2018-10-22[Glitch] RTL: fix admin account margins in about pageThibaut Girka
Port f8c1b325410369806eb77a5c8d259971a87a6852 to glitch-soc
2018-10-22[Glitch] undo part of PR 8202 to fix RTLThibaut Girka
Port efd09e2ebba7e9f0135bd47c44a77e2fc421aa67 to glitch-soc
2018-10-22[Glitch] Improve style of notice/alert messagesThibaut Girka
Port b972478812316da2f5c0d24c60386d408e027424 to glitch-soc
2018-10-22Keep new DMs in home feeds and in the old DM timelineThibaut Girka
Revert server-side part of 87fdd139b890e60f752bf71e3b09d79eaefcf7b5
2018-10-22Merge branch 'master' into glitch-soc/merge-upstreamThibaut Girka
Conflicts: - .github/ISSUE_TEMPLATE/bug_report.md Took our version. - CONTRIBUTING.md Updated the embedded copy of upstream's version. - README.md Took our version. - app/policies/status_policy.rb Not a real conflict, took code from both. - app/views/layouts/embedded.html.haml Added upstream's changes (dns-prefetch) and fixed `%body.embed` - app/views/settings/preferences/show.html.haml Reverted some of upstream changes, as we have a page dedicated for flavours and skins. - config/initializers/content_security_policy.rb Kept our version of the CSP. - config/initializers/doorkeeper.rb Not a real conflict, took code from both.
2018-10-22Downgrade fog-openstack to 0.3.7 and fog-core to 2.1.0 (#9049)Eugen Rochko
Fix #8889
2018-10-22Fix cull tripping on nil in last_webfingered_at (#9051)Eugen Rochko
Fix #8741
2018-10-22RTL: remove blank character inside bdi (#9038)Masoud Abkenar
* RTL: remove blank character inside bdi * Update app/javascript/mastodon/components/display_name.js Co-Authored-By: mabkenar <ampbox@gmail.com>
2018-10-21Fix tootctl cull on dead servers (#9041)Jeong Arm
* Delete first 9 accounts on dead servers * Clean up code by moving dead server culling to the end
2018-10-21Fix og:url on toots' public view (#9047)ThibG
Fixes #9045
2018-10-21RTL: fix cardbar margins and alignment (#9044)Masoud Abkenar
2018-10-21RTL: fix admin account avatar margin in about page (#9039)Masoud Abkenar
* RTL: fix admin account avatar margin in about page * fix code style
2018-10-21Handle if username is not found on tootctl feeds build (#9040)Jeong Arm
2018-10-21Fix crash when using UNIX socket (#9036)Gomasy
2018-10-21Put a video camera emoji or a picture frame emoji instead of “.”Thibaut Girka
This uses the same logic as the status icons in the glitch flavor.
2018-10-21Do not move CWs to toot body when toot body is emptyThibaut Girka
Fixes #395 Instead of leaving the toot body blank, it replaces it with a single “.” in order for the fold/unfold CW behavior to not look *too* weird on upstream Mastodon. Note that this does not fix upstream's CW-dropping behavior, as that is decided at the time the toot is posted, not received.
2018-10-21Attempt at fixing inline video playerThibaut Girka
2018-10-21Update mediaGallery component's width when opening CWsThibaut Girka
2018-10-21RTL: fix column settings toggle label (#9037)Masoud Abkenar
2018-10-21Fix domain label position and color (#9033)kedama
* Fix position of the domain label * Fix position of the domain label for RTL - Fix color mismatch of linear gradient which assigned to "::after" pseudo class
2018-10-21Bump version to 2.6.0rc1 (#9025)Eugen Rochko
* Bump version to 2.6.0rc1 * Update AUTHORS.md * Update CHANGELOG.md
2018-10-20fix: Execute PAM authentication tests on CircleCI (#9029)takayamaki
and use 'if' option of context block
2018-10-20Force sensitive content flag when posting a toot with a CWThibaut Girka
Indeed, when the “Always enable the Content Warning field” setting is enabled, sending a content-less toot with a CW would move the CW to the toot's content and leave the toot not marked as sensitive.
2018-10-20Focus the UI when pressing Escape in the CW fieldThibaut Girka
2018-10-20Add option to block reports from domain (#8830)Eugen Rochko
2018-10-20Do not test PAM authentication by default (#9027)Eugen Rochko
* Do not test PAM authentication by default * Disable PAM tests if PAM is not enabled
2018-10-20Add "disable" button to report screen (#9024)Eugen Rochko
* Add "disable" button to report screen * i18n-tasks remove-unused
2018-10-20Check if port/socket is available before forking in Streaming API (#9023)Eugen Rochko
Previously, the server would attempt taking port/socket in worker process, and if it was taken, fail, which made the master process create a new worker. This led to really high CPU usage if the streaming API was started when the port or socket were not available. Now, before clustering (forking) into worker processes, a test server is created and then removed to check if it can be done.
2018-10-20Redesign direct messages column (#9022)Eugen Rochko
2018-10-20RTL: fix preferences layout (#9021)Masoud Abkenar
2018-10-19Fix admin account avatar margin (#9020)bsky
2018-10-19Bump strong_migrations from 0.3.0 to 0.3.1 (#9015)dependabot[bot]
Bumps [strong_migrations](https://github.com/ankane/strong_migrations) from 0.3.0 to 0.3.1. - [Release notes](https://github.com/ankane/strong_migrations/releases) - [Changelog](https://github.com/ankane/strong_migrations/blob/master/CHANGELOG.md) - [Commits](https://github.com/ankane/strong_migrations/compare/v0.3.0...v0.3.1) Signed-off-by: dependabot[bot] <support@dependabot.com>
2018-10-19Improve README (#9012)Eugen Rochko
* Improve README * Update README.md * Update README.md * Update README.md * Update README.md
2018-10-19Update CONTRIBUTING.md (#9014)Eugen Rochko
* Update CONTRIBUTING.md * Update CONTRIBUTING.md * Update CONTRIBUTING.md * Update CONTRIBUTING.md
2018-10-19Bump tzinfo-data from 1.2018.5 to 1.2018.6 (#9016)dependabot[bot]
Bumps [tzinfo-data](https://github.com/tzinfo/tzinfo-data) from 1.2018.5 to 1.2018.6. - [Release notes](https://github.com/tzinfo/tzinfo-data/releases) - [Commits](https://github.com/tzinfo/tzinfo-data/compare/v1.2018.5...v1.2018.6) Signed-off-by: dependabot[bot] <support@dependabot.com>
2018-10-19RTL: fix user stats in about page (#9018)Masoud Abkenar
2018-10-19Add unread indicator to conversations (#9009)Eugen Rochko
2018-10-19fix: initial state of PrivacyDropdown is should not be null (#9008)takayamaki
2018-10-18Use Ruby ==2.5.2== 2.5.3 (#9003)Daigo 3 Dango
* Use Ruby 2.5.2 * Specify 2.5.2p104 as RUBY VERSION Heorku refers to RUBY VERSION in Gemfile.lock * Use ruby-2.5.3
2018-10-18RTL: fix domain append at signup form (#9007)Masoud Abkenar
2018-10-18Fix fav/boosts hotkeys not working on detailed statuses (#9006)ThibG
2018-10-18Fix fav/boosts hotkeys not working on detailed statusesThibaut Girka
2018-10-18RTL: fix admin account margins in about page (#9005)Masoud Abkenar
2018-10-17Do not show "limited" visibility in default visibility preference (#8999)Eugen Rochko
* Do not show "limited" visibility in default visibility preference Fix regression from #8950 * Fix code style issue
2018-10-17Improve support for aspects/circles (#8950)Eugen Rochko
* Add silent column to mentions * Save silent mentions in ActivityPub Create handler and optimize it Move networking calls out of the database transaction * Add "limited" visibility level masked as "private" in the API Unlike DMs, limited statuses are pushed into home feeds. The access control rules between direct and limited statuses is almost the same, except for counter and conversation logic * Ensure silent column is non-null, add spec * Ensure filters don't check silent mentions for blocks/mutes As those are "this person is also allowed to see" rather than "this person is involved", therefore does not warrant filtering * Clean up code * Use Status#active_mentions to limit returned mentions * Fix code style issues * Use Status#active_mentions in Notification And remove stream_entry eager-loading from Notification
2018-10-17Bump oj from 3.6.11 to 3.6.12 (#8996)dependabot[bot]
Bumps [oj](https://github.com/ohler55/oj) from 3.6.11 to 3.6.12. - [Release notes](https://github.com/ohler55/oj/releases) - [Changelog](https://github.com/ohler55/oj/blob/master/CHANGELOG.md) - [Commits](https://github.com/ohler55/oj/compare/v3.6.11...v3.6.12) Signed-off-by: dependabot[bot] <support@dependabot.com>
2018-10-17Handle global hotkeys even when no element has focus (#8998)ThibG
This fixes hotkeys not working when pressing the column “back” button, for instance.
2018-10-17Add destroy_custom_emoji translation (#8997)Gomasy
Includes Japanese and English
generated by cgit-pink (git 2.37.1) at 2024-11-06 01:33:54 +0000