about summary refs log tree commit diff
AgeCommit message (Collapse)Author
2020-10-09Merge "filter boosts from unfollowed" behavior directly into feed manager ↵Fire Demon
but keep local
2020-09-30Update Status modelFire Demon
2020-09-30Merge remote-tracking branch 'upstream/master' into merge-glitchFire Demon
2020-09-29Fix boost icon not being displayed in boost notificationsThibaut Girka
2020-09-29Merge pull request #1430 from ThibG/glitch-soc/merge-upstreamThibG
Merge upstream changes
2020-09-28Make explicit in glitch-soc's WebUI when an account is suspendedThibaut Girka
2020-09-28Do not filter out temporarily-suspended accounts from relationships APIThibaut Girka
2020-09-28Bump puma to 5.0.1Thibaut Girka
Fixes LoadError on some OSes/architectures
2020-09-28Fix glitch-soc specific testThibaut Girka
2020-09-28[Glitch] Fix unreadable placeholder text color in high contrast theme in web ↵Eugen Rochko
UI (#14803) Port bbcbf12215a5ec69362a769c1bae9c630eda0ed4 to glitch-soc Signed-off-by: Thibaut Girka <thib@sitedethib.com>
2020-09-28Fix actions being performed before the redux state is set upThibaut Girka
2020-09-28[Glitch] Add paragraph about browser add-ons when encountering some errorsThibG
Port b67caf9be48294bef290eea69e90d98223fcf3eb to glitch-soc Signed-off-by: Thibaut Girka <thib@sitedethib.com>
2020-09-28[Glitch] Add option to be notified when a followed user postsEugen Rochko
Port 974b1b79ce58e6799e5e5bb576e630ca783150de to glitch-soc Signed-off-by: Thibaut Girka <thib@sitedethib.com>
2020-09-28[Glitch] Optimize the process of following someoneEugen Rochko
Port front-end changes from 6d59dfa15d873da75c731b79367ab6b3d1b2f5a5 to glitch-soc Signed-off-by: Thibaut Girka <thib@sitedethib.com>
2020-09-28[Glitch] Change web UI to show empty profile for suspended accountsEugen Rochko
Port fcb9350ff8cdc83388f75de6b031410df8aa8a56 to glitch-soc Signed-off-by: Thibaut Girka <thib@sitedethib.com>
2020-09-28[Glitch] Fix home TL marker code mishandling gapsThibG
Port eaea2311aaaf030e4a2f5d03be6131d0716fdaf7 to glitch-soc Signed-off-by: Thibaut Girka <thib@sitedethib.com>
2020-09-28[Glitch] Fix notification filter bar incorrectly filtering gapsThibG
Port aab867b0e8119ecee78dabe8007f3c033e734b6d to glitch-soc Signed-off-by: Thibaut Girka <thib@sitedethib.com>
2020-09-28[Glitch] Add border around 🕺 emojiThibG
Port 91eecd1b3c95807be00535b58ebfd85e549d77e0 to glitch-soc Signed-off-by: Thibaut Girka <thib@sitedethib.com>
2020-09-28Merge branch 'master' into glitch-soc/merge-upstreamThibaut Girka
Conflicts: - `Gemfile.lock`: Not a real conflict, upstream updated dependencies that were too close to glitch-soc-only ones in the file. - `app/controllers/oauth/authorized_applications_controller.rb`: Upstream changed the logic surrounding suspended accounts. Minor conflict due to glitch-soc's theming system. Ported upstream changes. - `app/controllers/settings/base_controller.rb`: Upstream refactored and changed the logic surrounding suspended accounts. Minor conflict due to glitch-soc's theming system. Ported upstream changes. - `app/controllers/settings/sessions_controller.rb`: Upstream refactored and changed the logic surrounding suspended accounts. Minor conflict due to glitch-soc's theming system. Ported upstream changes. - `app/models/user.rb`: Upstream refactored and changed the logic surrounding suspended accounts. Minor conflict due to glitch-soc not preventing moved accounts from logging in. Ported upstream changes while keeping the ability for moved accounts to log in. - `app/policies/status_policy.rb`: Upstream refactored and changed the logic surrounding suspended accounts. Minor conflict due to glitch-soc's local-only toots. Ported upstream changes. - `app/serializers/rest/account_serializer.rb`: Upstream refactored and changed the logic surrounding suspended accounts. Minor conflict due to glitch-soc's ability to hide followers count. Ported upstream changes. - `app/services/process_mentions_service.rb`: Upstream refactored and changed the logic surrounding suspended accounts. Minor conflict due to glitch-soc's local-only toots. Ported upstream changes. - `package.json`: Not a real conflict, upstream updated dependencies that were too close to glitch-soc-only ones in the file.
2020-09-28Add pop-out player for audio/video in web UI (#14870)Eugen Rochko
Fix #11160
2020-09-27Fix downloading remote media files when server returns empty filename (#14867)ThibG
Fixes #14817
2020-09-27Limit visibility of replies to silenced and suspended accounts to "unlisted" ↵Fire Demon
and "limited", respectively
2020-09-26Drop Monsterfork conversations.public column in preparation for ACLsFire Demon
2020-09-26Limit incoming posts with unreachable participantsFire Demon
2020-09-26Add environment variable to allow requests to some private addresses (#14722)ThibG
2020-09-26Add unread notification markers (#14818)ThibG
* Add unread notification markers Fixes #14804 * Allow IntersectionObserverArticle's children to be updated
2020-09-24add og:published_time to opengraph meta tags (#14865)Jeremy Rose
2020-09-24Make consideration window of community digest configurable and limit to two ↵Fire Demon
weeks by default
2020-09-23Fix a slow query for TagFeed (#14861)Takeshi Umeda
* Fix a slow query for TagFeed * rename tags to tag_ids
2020-09-22Bump default community digest boost cooldown to 30 minutesFire Demon
2020-09-22Make community digest boost threshold configurable with AMBASSADOR_THRESHOLDFire Demon
2020-09-22Rewrite keysmash template as a template transformerFire Demon
2020-09-22Add support for command tag template transformersFire Demon
2020-09-22Add #!keysmash command tag and "keysmash" template variableFire Demon
2020-09-22Change command tag template arguments to: VARIABLE_NAME INDEX ↵Fire Demon
SUBSTRING_START SUBSTRING_END
2020-09-22Explicitly-invited users do not have to pass the Kobold HashFire Demon
2020-09-22Fix crash streaming process when receive invalid json (#14859)fuyu
2020-09-22Bump puma from 4.3.6 to 5.0.0 (#14830)dependabot[bot]
Bumps [puma](https://github.com/puma/puma) from 4.3.6 to 5.0.0. - [Release notes](https://github.com/puma/puma/releases) - [Changelog](https://github.com/puma/puma/blob/master/History.md) - [Commits](https://github.com/puma/puma/compare/v4.3.6...v5.0.0) Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2020-09-22Bump terser-webpack-plugin from 3.0.6 to 4.2.2 (#14850)dependabot[bot]
Bumps [terser-webpack-plugin](https://github.com/webpack-contrib/terser-webpack-plugin) from 3.0.6 to 4.2.2. - [Release notes](https://github.com/webpack-contrib/terser-webpack-plugin/releases) - [Changelog](https://github.com/webpack-contrib/terser-webpack-plugin/blob/master/CHANGELOG.md) - [Commits](https://github.com/webpack-contrib/terser-webpack-plugin/compare/v3.0.6...v4.2.2) Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2020-09-22Bump parallel_tests from 3.2.0 to 3.3.0 (#14843)dependabot[bot]
Bumps [parallel_tests](https://github.com/grosser/parallel_tests) from 3.2.0 to 3.3.0. - [Release notes](https://github.com/grosser/parallel_tests/releases) - [Changelog](https://github.com/grosser/parallel_tests/blob/master/CHANGELOG.md) - [Commits](https://github.com/grosser/parallel_tests/compare/v3.2.0...v3.3.0) Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2020-09-22Bump premailer from 1.13.1 to 1.14.2 (#14857)dependabot[bot]
Bumps [premailer](https://github.com/premailer/premailer) from 1.13.1 to 1.14.2. - [Release notes](https://github.com/premailer/premailer/releases) - [Changelog](https://github.com/premailer/premailer/blob/master/CHANGELOG.md) - [Commits](https://github.com/premailer/premailer/compare/v1.13.1...v1.14.2) Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2020-09-22Bump browserslist from 4.14.1 to 4.14.3 (#14853)dependabot[bot]
Bumps [browserslist](https://github.com/browserslist/browserslist) from 4.14.1 to 4.14.3. - [Release notes](https://github.com/browserslist/browserslist/releases) - [Changelog](https://github.com/browserslist/browserslist/blob/master/CHANGELOG.md) - [Commits](https://github.com/browserslist/browserslist/compare/4.14.1...4.14.3) Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2020-09-22Bump rubocop from 0.90.0 to 0.91.0 (#14835)dependabot[bot]
Bumps [rubocop](https://github.com/rubocop-hq/rubocop) from 0.90.0 to 0.91.0. - [Release notes](https://github.com/rubocop-hq/rubocop/releases) - [Changelog](https://github.com/rubocop-hq/rubocop/blob/master/CHANGELOG.md) - [Commits](https://github.com/rubocop-hq/rubocop/compare/v0.90.0...v0.91.0) Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2020-09-22Bump nio4r from 2.5.3 to 2.5.4 (#14837)dependabot[bot]
Bumps [nio4r](https://github.com/socketry/nio4r) from 2.5.3 to 2.5.4. - [Release notes](https://github.com/socketry/nio4r/releases) - [Changelog](https://github.com/socketry/nio4r/blob/master/CHANGES.md) - [Commits](https://github.com/socketry/nio4r/compare/v2.5.3...v2.5.4) Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2020-09-22Bump pkg-config from 1.4.2 to 1.4.3 (#14838)dependabot[bot]
Bumps [pkg-config](https://github.com/ruby-gnome/pkg-config) from 1.4.2 to 1.4.3. - [Release notes](https://github.com/ruby-gnome/pkg-config/releases) - [Changelog](https://github.com/ruby-gnome/pkg-config/blob/master/NEWS) - [Commits](https://github.com/ruby-gnome/pkg-config/compare/1.4.2...1.4.3) Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2020-09-22Bump devise from 4.7.2 to 4.7.3 (#14845)dependabot[bot]
Bumps [devise](https://github.com/plataformatec/devise) from 4.7.2 to 4.7.3. - [Release notes](https://github.com/plataformatec/devise/releases) - [Changelog](https://github.com/heartcombo/devise/blob/master/CHANGELOG.md) - [Commits](https://github.com/plataformatec/devise/compare/v4.7.2...v4.7.3) Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2020-09-22Bump crack from 0.4.3 to 0.4.4 (#14833)dependabot[bot]
Bumps [crack](https://github.com/jnunemaker/crack) from 0.4.3 to 0.4.4. - [Release notes](https://github.com/jnunemaker/crack/releases) - [Changelog](https://github.com/jnunemaker/crack/blob/master/History) - [Commits](https://github.com/jnunemaker/crack/compare/v0.4.3...v0.4.4) Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2020-09-22Bump rubocop-rails from 2.8.0 to 2.8.1 (#14832)dependabot[bot]
Bumps [rubocop-rails](https://github.com/rubocop-hq/rubocop-rails) from 2.8.0 to 2.8.1. - [Release notes](https://github.com/rubocop-hq/rubocop-rails/releases) - [Changelog](https://github.com/rubocop-hq/rubocop-rails/blob/master/CHANGELOG.md) - [Commits](https://github.com/rubocop-hq/rubocop-rails/compare/v2.8.0...v2.8.1) Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2020-09-22Bump fugit from 1.3.8 to 1.3.9 (#14829)dependabot[bot]
Bumps [fugit](https://github.com/floraison/fugit) from 1.3.8 to 1.3.9. - [Release notes](https://github.com/floraison/fugit/releases) - [Changelog](https://github.com/floraison/fugit/blob/master/CHANGELOG.md) - [Commits](https://github.com/floraison/fugit/compare/v1.3.8...v1.3.9) Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2020-09-21Sort boosts list to top of listsFire Demon