treehouse
/
mastodon
22
8
Fork 5
Code Issues 32 Pull Requests Projects 1 Releases Wiki Activity
10,413 Commits
12 Branches
15 Tags
760 MiB
Commit Graph

10413 Commits (43d6f6d8422ccc7278d533225a15c99e035bd1e7)

Author SHA1 Message Date
ThibG 8dd730a71d [Glitch] Add ActivityPub actor representing the entire server 
Port SCSS changes from c2126e3f98

Signed-off-by: Thibaut Girka <thib@sitedethib.com>
 2019-07-19 18:35:45 +02:00
Eugen Rochko 6c5f339573 Remove Atom feeds and old URLs in the form of `GET /:username/updates/:id` 
Port SCSS changes from fbbcbd940d to glitch-soc

Signed-off-by: Thibaut Girka <thib@sitedethib.com>
 2019-07-19 18:27:26 +02:00
Thibaut Girka eecce7e59b Merge branch 'master' into glitch-soc/merge-upstream 
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-19 18:26:49 +02:00
dependabot-preview[bot] 2fe3965d17 Bump strong_migrations from 0.4.0 to 0.4.1 (#11307) 
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-20 01:08:02 +09:00
Eugen Rochko de4ead8fc6 Change single-column mode to scroll the whole page (#11359) 
Fix #10840
 2019-07-19 09:25:22 +02:00
ThibG 026f3a9d2d Fix avatar animation on hover when not logged in (#11349) 2019-07-19 09:18:23 +02:00
koyu ee3ab5a51d Added logout to dropdown menu (#11353) 
* 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-19 03:58:46 +02:00
ThibG 773130d51a Fix sanitizing lists contents (#11354) 
* Add test

* Fix code for sanitizing nested lists stripping all tags
 2019-07-19 01:44:58 +02:00
ThibG c2126e3f98 Add ActivityPub actor representing the entire server (#11321) 
* 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-19 01:44:42 +02:00
Thibaut Girka 3f7c78d821 Fix timestamp display in boost/fav modals in RTL locales 2019-07-18 20:56:20 +02:00
Thibaut Girka 97643292bb Fixups 2019-07-18 20:56:20 +02:00
Thibaut Girka 307ef1231f Public pages RTL fixes 2019-07-18 20:56:20 +02:00
Thibaut Girka a5bcce0795 Unfiy status__prepend with upstream 2019-07-18 20:56:20 +02:00
Thibaut Girka bb8fa5568c RTL fixes 2019-07-18 20:56:20 +02:00
Thibaut Girka a12190368e Fix some SCSS for RTL behavior 2019-07-18 20:56:20 +02:00
Thibaut Girka e60632a915 Minor fixup 2019-07-18 20:56:20 +02:00
Eugen Rochko 4a32302acd [Glitch] Fix RTL layout of status display names 
Port e29581a150 to glitch-soc
 2019-07-18 20:56:20 +02:00
Masoud Abkenar 15783e6568 [Glitch] RTL: fix settings button margins in column headers 
Port 35b461c0ae to glitch-soc

Signed-off-by: Thibaut Girka <thib@sitedethib.com>
 2019-07-18 20:56:20 +02:00
Thibaut Girka 30ca4a6772 Make width breakpoint for removing margins consistent and match upstream 
Fixes #1136
 2019-07-18 20:55:38 +02:00
Eugen Rochko 02cf7a07ae Change Dockerfile to bind to 0.0.0.0 instead of docker-compose.yml (#11351) 2019-07-18 20:28:05 +02:00
Thibaut Girka 074742e0e2 When cleaning up remote statuses, keep bookmarked ones 2019-07-18 13:34:54 +02:00
Thibaut Girka 1e3372feb9 Fix *another* typo and crash in StatusIcons 2019-07-18 09:54:59 +02:00
Thibaut Girka 0530c8d3b8 Fix typo and crash in StatusIcons 2019-07-18 09:42:22 +02:00
Eugen Rochko 1d560713b6 Fix only one middle dot being recognized in hashtags (#11345) 
Fix #10934
 2019-07-18 03:02:56 +02:00
Eugen Rochko 01cff5ee60 Add aac, m4a, 3gp to allowed audio formats (#11342) 
Fix #11186
 2019-07-18 03:02:30 +02:00
Eugen Rochko c27fb14e9f Change language detection to include hashtags as words (#11341) 2019-07-18 03:02:15 +02:00
dependabot-preview[bot] 020daac19f Bump rack-attack from 6.0.0 to 6.1.0 (#11313) 
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-18 01:07:02 +02:00
dependabot-preview[bot] b856854767 Bump rubocop-rails from 2.2.0 to 2.2.1 (#11308) 
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-18 01:06:39 +02:00
dependabot-preview[bot] f4ecf3c821 Bump puma from 3.12.1 to 4.0.1 (#11306) 
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-18 01:06:14 +02:00
ThibG 9bea975f52 Fix typo in StatusPolicy (#11344) 2019-07-18 00:48:26 +02:00
Thibaut Girka 5eca68102a Shorten status icon tooltip text 2019-07-17 21:35:34 +02:00
Thibaut Girka 0b139b1df4 Add status icon for local-only toots 2019-07-17 21:35:34 +02:00
Thibaut Girka 85654916b7 Add tooltips to status icons 2019-07-17 21:35:34 +02:00
ThibG 9015b19e09 Add setting to disable the anti-spam (#11296) 
* Add environment variable to disable the anti-spam

* Move antispam setting to admin settings

* Fix typo

* antispam → spam_check
 2019-07-17 21:09:15 +02:00
Eugen Rochko 50caff4dc0 Change terms and privacy policy pages to always be accessible (#11334) 
Fix #11328
 2019-07-17 19:29:37 +02:00
ThibG 978792a112 Fix custom CSS controller (#11336) 2019-07-17 17:14:25 +02:00
ThibG 8e43fc0395 Merge pull request #1164 from ThibG/glitch-soc/cherry-pick-upstream 
Cherry-pick changes from upstream
 2019-07-17 16:56:10 +02:00
ThibG ac154ccc95 Extend AUTHORIZED_FETCH mode to user blocks as well (#11332) 
* Extend AUTHORIZED_FETCH mode to user blocks as well

* Move decision to deny access to StatusPolicy
 2019-07-17 01:53:37 +02:00
ThibG a4b1083795 Fix caching headers in ActivityPub endpoints (#11331) 
* Fix reverse-proxy caching in public fetch mode

* Fix caching in ActivityPub-specific controllers
 2019-07-17 00:00:39 +02:00
Eugen Rochko f1de5093fb [Glitch] Add option to disable real-time updates in web UI 
Port c56e6fd7a1 to glitch-soc

Signed-off-by: Thibaut Girka <thib@sitedethib.com>
 2019-07-16 16:51:08 +02:00
Daigo 3 Dango 4b91fb0ea7 Make puma bind address configurable with BIND env var (#11326) 2019-07-16 16:12:01 +02:00
Eugen Rochko c56e6fd7a1 Add option to disable real-time updates in web UI (#9984) 
Fix #9031
Fix #7913
 2019-07-16 16:11:50 +02:00
dependabot-preview[bot] ff6867d8d2 Bump eslint-plugin-jsx-a11y from 6.2.1 to 6.2.3 (#11314) 
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-16 16:10:20 +02:00
dependabot-preview[bot] aac041d81d Bump webpack from 4.34.0 to 4.35.3 (#11309) 
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-16 16:10:20 +02:00
dependabot-preview[bot] 84a02403e2 Bump lodash from 4.17.13 to 4.17.14 (#11312) 
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-16 16:10:20 +02:00
dependabot-preview[bot] 69cb82bd20 Bump @babel/runtime from 7.4.5 to 7.5.4 (#11315) 
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-16 16:10:19 +02:00
dependabot-preview[bot] 403902c860 Bump eslint-plugin-import from 2.17.3 to 2.18.0 (#11310) 
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-16 16:10:19 +02:00
Eugen Rochko 31d4878fbb Change default interface of web and streaming from 0.0.0.0 to 127.0.0.1 (#11302) 2019-07-16 16:10:19 +02:00
ThibG ab6af77728 Remove unused Account#magic_key (#11327) 2019-07-16 14:25:56 +02:00
Daigo 3 Dango 6354a48308 Make puma bind address configurable with BIND env var (#11326) 2019-07-16 06:51:36 +02:00