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

8172 Commits (f39c452cab11d67ea4c5added13cc03aa9c414a1)

Author SHA1 Message Date
Thibaut Girka f39c452cab [Glitch] Save onlyMedia prop when pinning column 
Port 20c650b644 to glitch-soc
 2018-12-18 21:39:35 +01:00
Thibaut Girka 498ff2b52e [Glitch] Add exact attribute to WrappedRoute for community timeline 
Port 4a0207e3ea to glitch-soc
 2018-12-18 21:39:35 +01:00
Thibaut Girka 0a87d07f97 [Glitch] Add media timeline 
Port ccc240b59c to glitch-soc
 2018-12-18 21:39:35 +01:00
ThibG a0a32a68c4 Merge pull request #862 from ThibG/glitch-soc/merge-upstream 
Merge upstream changes
 2018-12-18 19:37:07 +01:00
Thibaut Girka e1f8359ea4 [Glitch] Make notifications quick-filter use consistent style with profile tabs 
Port 84385d876f to glitch-soc
 2018-12-18 17:23:04 +01:00
Thibaut Girka cdc9dca649 [Glitch] Add notification quick-filter bar in the frontend app 
Port df7186e93a to glitch-soc
 2018-12-18 17:22:01 +01:00
Thibaut Girka c678e1906a [Glitch] Responsive design for profile directory 
Port SCSS changes from 32bd452b56 to glitch flavour
 2018-12-18 17:03:53 +01:00
Thibaut Girka 720cb01715 Merge branch 'master' into glitch-soc/merge-upstream 
Conflicts:
- app/controllers/admin/base_controller.rb
  Some refactoring made upstream, no real conflict.
- app/javascript/mastodon/features/compose/components/compose_form.js
  Updated using upstream's code but using maxChars instead of the
  hardcoded length of 500 characters per toot.
- app/javascript/styles/mastodon/components.scss
  Upstream redesigned the onboarding modal. Not sure why we had a
  conflict there.
 2018-12-18 16:55:15 +01:00
kedama f579f1b10e Back to the getting-started when pins the timeline. (#9561) 2018-12-18 16:43:50 +01:00
ysksn 66b994aa7a Add spec for AccountableConcern#log_action (#9559) 2018-12-18 16:43:03 +01:00
dependabot[bot] 6602350f85 Bump nokogiri from 1.8.5 to 1.9.1 (#9557) 
Bumps [nokogiri](https://github.com/sparklemotion/nokogiri) from 1.8.5 to 1.9.1.
- [Release notes](https://github.com/sparklemotion/nokogiri/releases)
- [Changelog](https://github.com/sparklemotion/nokogiri/blob/master/CHANGELOG.md)
- [Commits](https://github.com/sparklemotion/nokogiri/compare/v1.8.5...v1.9.1)

Signed-off-by: dependabot[bot] <support@dependabot.com>
 2018-12-18 16:41:41 +01:00
jomo dc9f3d2cf2 fix CSP / X-Frame-Options for media embeds (#9558) 2018-12-18 16:40:30 +01:00
Eugen Rochko 652595d802 Fix tootctl accounts rotate not updating public keys (#9556) 
This allowed you to brick your system when running that command, because the accounts would continue to advertise the old public key, but sign things with the new one
 2018-12-18 01:22:29 +01:00
Thibaut Girka e4b9a8da07 Sandbox toot embeds in the embed modal 
It should not be necessary thanks to our Content Security Policy, but best
be sure in case a server's CSP is incorrect. Also, avoids a CSP warning about
loading remote scripts.
 2018-12-17 22:22:29 +01:00
Thibaut Girka d16638a116 [Glitch] Minor scrollable list fixes 
* Make sure loading indicator has enough vertical space
* Respect reduce_motion setting for loading indicator

Port 4ede51743e to glitch-soc
 2018-12-17 22:14:06 +01:00
Eugen Rochko 84385d876f Make notifications quick-filter use consistent style with profile tabs (#9554) 2018-12-17 21:08:40 +01:00
ThibG f76665a276 Ignore low-confidence CharlockHolmes guesses when parsing link cards (#9510) 
* Add failing test for windows-1251 link cards

* Ignore low-confidence CharlockHolmes guesses

Fixes #9466

* Fix no method error when charlock holmes cannot detect charset
 2018-12-17 19:19:45 +01:00
ThibG ca2c7ed8d7 Minor scrollable list fixes (#9551) 
* Make sure loading indicator has enough vertical space

* Respect reduce_motion setting for loading indicator
 2018-12-17 17:02:59 +01:00
Thibaut Girka b19e5cf48d Split out is_changing_upload from is_submitting 
Fixes #855
 2018-12-17 13:01:07 +01:00
ysksn 7df45c6e11 Move #set_user to Admin::BaseController (#9470) 
* Move #set_user to Admin::BaseController

* Rename Admin::TwoFactorAuthenticationsController

from `#set_user` to `#set_target_user` .
 2018-12-17 11:40:51 +01:00
ysksn 977e743d7a Add spec for Api::V1::Timelines::DirectController (#9547) 2018-12-17 11:36:20 +01:00
ysksn 9414dea099 Add specs for Api::V1::Instances::PeersController (#9546) 2018-12-17 11:35:55 +01:00
ysksn 07c0f6dcab Add spec for Api::V1::EndorsementsController (#9543) 2018-12-17 11:32:44 +01:00
ysksn 4b972f332e Add spec for Api::V1::Instances::ActivityController (#9545) 2018-12-17 11:32:24 +01:00
Eugen Rochko 75eb2ac3b3 Add new first-time tutorial (#9531) 
* Prepare to load onboarding as a full page

* Update the first-time introduction

* Improve responsive design

* Replace speech bubble with logo

* Increase text size and reword first paragraph
 2018-12-17 11:07:17 +01:00
dependabot[bot] a51ca11444 Bump omniauth from 1.8.1 to 1.9.0 (#9544) 
Bumps [omniauth](https://github.com/omniauth/omniauth) from 1.8.1 to 1.9.0.
- [Release notes](https://github.com/omniauth/omniauth/releases)
- [Commits](https://github.com/omniauth/omniauth/compare/v1.8.1...v1.9.0)

Signed-off-by: dependabot[bot] <support@dependabot.com>
 2018-12-17 10:15:14 +01:00
ysksn 18469c65e8 Add specs for Accounts::PinsController (#9542) 2018-12-17 06:03:51 +01:00
Eugen Rochko 5573216d67 Fix regression in #9539 (#9541) 2018-12-17 04:32:36 +01:00
Eugen Rochko 32bd452b56 Remove "most popular" tab from profile directory, add responsive design (#9539) 
* Remove "most popular" tab from profile directory, add responsive design

* Remove unused translations
 2018-12-17 03:14:28 +01:00
Eugen Rochko 26140838c4 Do no retry web push workers if the server returns a 4xx response (#9434) 
Add timeout of 10s to web push requests
 2018-12-17 03:14:13 +01:00
ThibG 967079defa Split out is_changing_upload from is_submitting (#9536) 
There is no reason to disable the composer textarea when some media metadata
is being modified, nor is there any reason to focus the textarea when some
media metadata has been modified (prevents clicking one image's description
field right after having modified another).
 2018-12-16 21:17:56 +01:00
Eugen Rochko 5397866326 Remove PostgreSQL statement timeout (#9537) 
Revert #9382
 2018-12-16 21:17:15 +01:00
ThibG 8ea7102dba Merge pull request #856 from ThibG/glitch-soc/merge-upstream 
Merge upstream changes
 2018-12-16 15:26:50 +01:00
Thibaut Girka 2a9c9fcedb [Glitch] Fix padding on select elements in preferences 
Port 708714b01c to glitch-soc
 2018-12-16 14:48:15 +01:00
Thibaut Girka 4671179f5f [Glitch] Make animated header resoect `auto_play_gif` 
Port part of 70da16b375 to glitch-soc
 2018-12-16 14:48:15 +01:00
Paweł Ngei df7186e93a Add notification quick-filter bar in the frontend app (#9399) 
* create FilterBar componer and its container, unstyled

* introduce basic styling for FilterBar

* add selection css

* allow FilterBar to display active CSS with js

* connect the FilterBar to the Redux state

* change getNotifications to use filter

* remove temporary comments

* add an option to turn the FilterBar off in settings

* fix showFilterBar data type to boolean

* fix eslint errors

* add English and Polish translations

* allowed filter bar overflow to accomodate for longer languages

* fix mispelled translation key

* add unified CSS look

* replace text in FilterBar with icons

* add tooltips

* replace text @ with an icon

* introduce simple and advanced filtering view

* add ability to toggle the advanced view

* add Polish translations

* change Advanced View description to be more clear

* make each filter flush notifications and load new ones, fixing pagination

* simplify getNotifications once frontend filtering is not needed for FilterBar

* add a semicolon

* Revert "simplify getNotifications once frontend filtering is not needed for FilterBar"

This reverts commit 9f4be7857135b0327814bd22a3e8a4e7b546f7cc.

* reset filter to 'all' when turning off FilterBar
 2018-12-16 05:56:41 +01:00
Isatis 638cac58b6 Dockerfile: Nodejs 8.12 -> 8.14 (#9532) 2018-12-16 05:50:09 +01:00
Thibaut Girka 04204427d0 Merge branch 'master' into glitch-soc/merge-upstream 
Conflicts:
- app/controllers/directories_controller.rb
- app/controllers/settings/applications_controller.rb
- app/controllers/settings/base_controller.rb
- app/controllers/settings/deletes_controller.rb
- app/controllers/settings/exports_controller.rb
- app/controllers/settings/follower_domains_controller.rb
- app/controllers/settings/imports_controller.rb
- app/controllers/settings/migrations_controller.rb
- app/controllers/settings/notifications_controller.rb
- app/controllers/settings/preferences_controller.rb
- app/controllers/settings/sessions_controller.rb
- app/controllers/settings/two_factor_authentication/confirmations_controller.rb
- app/controllers/settings/two_factor_authentication/recovery_codes_controller.rb
- app/controllers/settings/two_factor_authentications_controller.rb

Conflicts were due to some refactoring already made in glitch-soc
when introducing flavours.
 2018-12-15 10:45:53 +01:00
Aditoo17 f14d8630b2 I18n: Correct pluralization of Czech (#9527) 
* I18n: Correct pluralization of Czech

* I18n: Correct pluralization of Czech
 2018-12-15 17:08:54 +09:00
Thibaut Girka 4760c6e767 On mobile, go back in browser history upon posting, unless threaded mode is enabled 2018-12-14 23:56:53 +01:00
dependabot[bot] ceca88c28c Bump aws-sdk-s3 from 1.27.0 to 1.30.0 (#9429) 
Bumps [aws-sdk-s3](https://github.com/aws/aws-sdk-ruby) from 1.27.0 to 1.30.0.
- [Release notes](https://github.com/aws/aws-sdk-ruby/releases)
- [Changelog](https://github.com/aws/aws-sdk-ruby/blob/master/gems/aws-sdk-s3/CHANGELOG.md)
- [Commits](https://github.com/aws/aws-sdk-ruby/commits)

Signed-off-by: dependabot[bot] <support@dependabot.com>
 2018-12-14 20:37:29 +01:00
ysksn f96bf30b4a Add spec for Admin::ActionLogsController#index (#9522) 2018-12-14 20:37:01 +01:00
ysksn d5c95283ef Add specs for RemoteInteractionController (#9524) 2018-12-14 20:36:40 +01:00
ysksn bd7183fab9 Add spec for Admin::DashboardController#index (#9523) 2018-12-14 20:36:18 +01:00
ThibG dc1dfcf7e4 When posting in mobile mode, go back to previous history location (#9502) 
Fixes #7112
 2018-12-14 20:35:26 +01:00
ThibG 70da16b375 Make avatar and headers respect `auto_play_gif` (#9515) 
* Do not animate account header art if user's GIF autoplay setting is off

Fixes #9472

* Honour currently logged-in user's GIF autoplay setting for account avatars

Fixes #9467

* Fix avatar display on some public pages when data is stored on a different host

* Use ternary operator instead of if/else for avatar/header URL
 2018-12-14 20:34:18 +01:00
Rey Tucker 56890834ab Remove form_action from CSP 
This trips an issue when trying to authenticate through to
third-party sites, e.g. bridge.joinmastodon.org:

    Refused to send form data to 'https://bridge.joinmastodon.org/'
    because it violates the following Content Security Policy
    directive: "form-action 'self'".

Thread: https://vulpine.club/@digifox/101230933751352042
 2018-12-14 08:02:06 +01:00
dependabot[bot] 5340e1c144 Bump redis from 4.0.3 to 4.1.0 (#9520) 
Bumps [redis](https://github.com/redis/redis-rb) from 4.0.3 to 4.1.0.
- [Release notes](https://github.com/redis/redis-rb/releases)
- [Changelog](https://github.com/redis/redis-rb/blob/master/CHANGELOG.md)
- [Commits](https://github.com/redis/redis-rb/compare/v4.0.3...v4.1.0)

Signed-off-by: dependabot[bot] <support@dependabot.com>
 2018-12-14 06:52:06 +01:00
Sumit Khanna b1b6e5911d Error message for avatar image that's too large. #9204 (#9518) 
* Error message for avatar image that's too large. #9204

* Code climate/formatting

* Removed avatar error message

* Moved valid image dimentions check to update service

* removed unnescessary begin block

* code climate formatting

* code climate indent fix
 2018-12-14 05:07:21 +01:00
ThibG 9a8d7b0865 Restore profile links in /admin/accounts (#9494) 
Fixes #9431
 2018-12-14 01:47:50 +01:00