about summary refs log tree commit diff
AgeCommit message (Collapse)Author
2019-07-19Merge branch 'master' into glitch-soc/merge-upstreamThibaut Girka
Conflicts: - Gemfile.lock - app/controllers/accounts_controller.rb - app/controllers/admin/dashboard_controller.rb - app/controllers/follower_accounts_controller.rb - app/controllers/following_accounts_controller.rb - app/controllers/remote_follow_controller.rb - app/controllers/stream_entries_controller.rb - app/controllers/tags_controller.rb - app/javascript/packs/public.js - app/lib/sanitize_config.rb - app/models/account.rb - app/models/form/admin_settings.rb - app/models/media_attachment.rb - app/models/stream_entry.rb - app/models/user.rb - app/serializers/initial_state_serializer.rb - app/services/batched_remove_status_service.rb - app/services/post_status_service.rb - app/services/process_mentions_service.rb - app/services/reblog_service.rb - app/services/remove_status_service.rb - app/views/admin/settings/edit.html.haml - config/locales/simple_form.pl.yml - config/settings.yml - docker-compose.yml
2019-07-20Bump strong_migrations from 0.4.0 to 0.4.1 (#11307)dependabot-preview[bot]
Bumps [strong_migrations](https://github.com/ankane/strong_migrations) from 0.4.0 to 0.4.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.4.0...v0.4.1) Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2019-07-19Change single-column mode to scroll the whole page (#11359)Eugen Rochko
Fix #10840
2019-07-19Fix avatar animation on hover when not logged in (#11349)ThibG
2019-07-19Added logout to dropdown menu (#11353)koyu
* Added logout to dropdown menu * Triggering build-and-test with empty commit as it seems it failed due to some internal failure * Looks fine, ready to review * Added changes from review * method can be null without any problems * Also target can be null
2019-07-19Fix sanitizing lists contents (#11354)ThibG
* Add test * Fix code for sanitizing nested lists stripping all tags
2019-07-19Add ActivityPub actor representing the entire server (#11321)ThibG
* Add support for an instance actor * Skip username validation for local Application accounts * Add migration script to create instance actor * Make Codeclimate happy * Switch to id -99 for instance actor * Remove unused `icon` and `image` attributes from instance actor * Use if/elsif/else instead of return + ternary operator * Add instance actor to fresh installs * Use instance actor as instance representative Use instance actor for forwarding reports, relay operations, and spam auto-reporting. * Seed database in test environment * Fix single-user mode * Fix tests * Fix specs to accomodate for an extra `Account` * Auto-reject follows on instance actor Following an instance actor might make sense, but we are not handling that right now, so auto-reject. * Fix webfinger lookup and serialization for instance actor * Rename instance actor * Make it clear in the HTML view that the instance actor should not be blocked * Raise cache time for instance actor as there's no dynamic content * Re-use /about/more with a flash message for instance actor profile
2019-07-18Fix timestamp display in boost/fav modals in RTL localesThibaut Girka
2019-07-18FixupsThibaut Girka
2019-07-18Public pages RTL fixesThibaut Girka
2019-07-18Unfiy status__prepend with upstreamThibaut Girka
2019-07-18RTL fixesThibaut Girka
2019-07-18Fix some SCSS for RTL behaviorThibaut Girka
2019-07-18Minor fixupThibaut Girka
2019-07-18[Glitch] Fix RTL layout of status display namesEugen Rochko
Port d723f2a0a88d4ac106638733b7ba17f8d205850a to glitch-soc
2019-07-18[Glitch] RTL: fix settings button margins in column headersMasoud Abkenar
Port ef1134728145c6dcf094e7a0a16a8d63f70aed6c to glitch-soc Signed-off-by: Thibaut Girka <thib@sitedethib.com>
2019-07-18Make width breakpoint for removing margins consistent and match upstreamThibaut Girka
Fixes #1136
2019-07-18Change Dockerfile to bind to 0.0.0.0 instead of docker-compose.yml (#11351)Eugen Rochko
2019-07-18When cleaning up remote statuses, keep bookmarked onesThibaut Girka
2019-07-18Fix *another* typo and crash in StatusIconsThibaut Girka
2019-07-18Fix typo and crash in StatusIconsThibaut Girka
2019-07-18Fix only one middle dot being recognized in hashtags (#11345)Eugen Rochko
Fix #10934
2019-07-18Add aac, m4a, 3gp to allowed audio formats (#11342)Eugen Rochko
Fix #11186
2019-07-18Change language detection to include hashtags as words (#11341)Eugen Rochko
2019-07-18Bump rack-attack from 6.0.0 to 6.1.0 (#11313)dependabot-preview[bot]
Bumps [rack-attack](https://github.com/kickstarter/rack-attack) from 6.0.0 to 6.1.0. - [Release notes](https://github.com/kickstarter/rack-attack/releases) - [Changelog](https://github.com/kickstarter/rack-attack/blob/master/CHANGELOG.md) - [Commits](https://github.com/kickstarter/rack-attack/compare/v6.0.0...v6.1.0) Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2019-07-18Bump rubocop-rails from 2.2.0 to 2.2.1 (#11308)dependabot-preview[bot]
Bumps [rubocop-rails](https://github.com/rubocop-hq/rubocop-rails) from 2.2.0 to 2.2.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.2.0...v2.2.1) Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2019-07-18Bump puma from 3.12.1 to 4.0.1 (#11306)dependabot-preview[bot]
Bumps [puma](https://github.com/puma/puma) from 3.12.1 to 4.0.1. - [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/v3.12.1...v4.0.1) Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2019-07-18Fix typo in StatusPolicy (#11344)ThibG
2019-07-17Shorten status icon tooltip textThibaut Girka
2019-07-17Add status icon for local-only tootsThibaut Girka
2019-07-17Add tooltips to status iconsThibaut Girka
2019-07-17Add setting to disable the anti-spam (#11296)ThibG
* Add environment variable to disable the anti-spam * Move antispam setting to admin settings * Fix typo * antispam → spam_check
2019-07-17Change terms and privacy policy pages to always be accessible (#11334)Eugen Rochko
Fix #11328
2019-07-17Fix custom CSS controller (#11336)ThibG
2019-07-17Merge pull request #1164 from ThibG/glitch-soc/cherry-pick-upstreamThibG
Cherry-pick changes from upstream
2019-07-17Extend AUTHORIZED_FETCH mode to user blocks as well (#11332)ThibG
* Extend AUTHORIZED_FETCH mode to user blocks as well * Move decision to deny access to StatusPolicy
2019-07-17Fix caching headers in ActivityPub endpoints (#11331)ThibG
* Fix reverse-proxy caching in public fetch mode * Fix caching in ActivityPub-specific controllers
2019-07-16[Glitch] Add option to disable real-time updates in web UIEugen Rochko
Port 729723f857d11434c0f78d63fe16537d77f1c77c to glitch-soc Signed-off-by: Thibaut Girka <thib@sitedethib.com>
2019-07-16Make puma bind address configurable with BIND env var (#11326)Daigo 3 Dango
2019-07-16Add option to disable real-time updates in web UI (#9984)Eugen Rochko
Fix #9031 Fix #7913
2019-07-16Bump eslint-plugin-jsx-a11y from 6.2.1 to 6.2.3 (#11314)dependabot-preview[bot]
Bumps [eslint-plugin-jsx-a11y](https://github.com/evcohen/eslint-plugin-jsx-a11y) from 6.2.1 to 6.2.3. - [Release notes](https://github.com/evcohen/eslint-plugin-jsx-a11y/releases) - [Changelog](https://github.com/evcohen/eslint-plugin-jsx-a11y/blob/master/CHANGELOG.md) - [Commits](https://github.com/evcohen/eslint-plugin-jsx-a11y/compare/v6.2.1...v6.2.3) Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2019-07-16Bump webpack from 4.34.0 to 4.35.3 (#11309)dependabot-preview[bot]
Bumps [webpack](https://github.com/webpack/webpack) from 4.34.0 to 4.35.3. - [Release notes](https://github.com/webpack/webpack/releases) - [Commits](https://github.com/webpack/webpack/compare/v4.34.0...v4.35.3) Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2019-07-16Bump lodash from 4.17.13 to 4.17.14 (#11312)dependabot-preview[bot]
Bumps [lodash](https://github.com/lodash/lodash) from 4.17.13 to 4.17.14. - [Release notes](https://github.com/lodash/lodash/releases) - [Commits](https://github.com/lodash/lodash/compare/4.17.13...4.17.14) Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2019-07-16Bump @babel/runtime from 7.4.5 to 7.5.4 (#11315)dependabot-preview[bot]
Bumps [@babel/runtime](https://github.com/babel/babel) from 7.4.5 to 7.5.4. - [Release notes](https://github.com/babel/babel/releases) - [Changelog](https://github.com/babel/babel/blob/master/CHANGELOG.md) - [Commits](https://github.com/babel/babel/compare/v7.4.5...v7.5.4) Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2019-07-16Bump eslint-plugin-import from 2.17.3 to 2.18.0 (#11310)dependabot-preview[bot]
Bumps [eslint-plugin-import](https://github.com/benmosher/eslint-plugin-import) from 2.17.3 to 2.18.0. - [Release notes](https://github.com/benmosher/eslint-plugin-import/releases) - [Changelog](https://github.com/benmosher/eslint-plugin-import/blob/master/CHANGELOG.md) - [Commits](https://github.com/benmosher/eslint-plugin-import/compare/v2.17.3...v2.18.0) Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2019-07-16Change default interface of web and streaming from 0.0.0.0 to 127.0.0.1 (#11302)Eugen Rochko
2019-07-16Remove unused Account#magic_key (#11327)ThibG
2019-07-16Make puma bind address configurable with BIND env var (#11326)Daigo 3 Dango
2019-07-16Add option to disable real-time updates in web UI (#9984)Eugen Rochko
Fix #9031 Fix #7913
2019-07-16Bump eslint-plugin-jsx-a11y from 6.2.1 to 6.2.3 (#11314)dependabot-preview[bot]
Bumps [eslint-plugin-jsx-a11y](https://github.com/evcohen/eslint-plugin-jsx-a11y) from 6.2.1 to 6.2.3. - [Release notes](https://github.com/evcohen/eslint-plugin-jsx-a11y/releases) - [Changelog](https://github.com/evcohen/eslint-plugin-jsx-a11y/blob/master/CHANGELOG.md) - [Commits](https://github.com/evcohen/eslint-plugin-jsx-a11y/compare/v6.2.1...v6.2.3) Signed-off-by: dependabot-preview[bot] <support@dependabot.com>