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

8190 Commits (ce7ac8c1d7f5324dfeddc4a66ce9447a3f1b31fa)

Author SHA1 Message Date
Thibaut Girka ce7ac8c1d7 [Glitch] Improved appearance of notification filter on safari 
Port e9ad8044cc to glitch-soc
 2018-12-19 13:00:08 +01:00
Thibaut Girka d53f315824 Merge branch 'master' into glitch-soc/merge-upstream 2018-12-19 12:58:49 +01:00
ysksn d338a2099e Add specs for AccountPolicy (#9575) 2018-12-19 08:56:59 +01:00
mayaeh 26f2c1240e Update Japanese translations. (#9574) 2018-12-19 08:51:02 +01:00
ysksn 48a70180e2 Add specs for AccountModerationNotePolicy (#9571) 2018-12-19 07:24:03 +01:00
ysksn bae098d118 Add specs for StatusPolicy (#9569) 2018-12-19 05:19:20 +01:00
Hinaloe e9ad8044cc improved appearance of notification filter on safari (#9564) 2018-12-18 22:28:09 +01:00
ThibG a8f77d9f91 Clean up dead code in public timeline code (#9565) 2018-12-18 22:00:18 +01:00
Thibaut Girka 4b8cb9696e Reword confirm_before_clearing_draft description 2018-12-18 21:54:34 +01:00
Thibaut Girka ba8d23c7cb Allow disabling the reply confirmation dialog 2018-12-18 21:54:34 +01:00
Thibaut Girka 55e3dae600 Allow disabling media confirmation from the confirmation dialog itself 2018-12-18 21:54:34 +01:00
Thibaut Girka 79b793be2a Remove dead code 2018-12-18 21:39:35 +01:00
Thibaut Girka 2bf78186aa [Glitch] Put "Media Only" option in column settings instead of content area headline 
Port 9c2fc4d684 to glitch-soc
 2018-12-18 21:39:35 +01:00
Thibaut Girka 677f430f23 [Glitch] Always display tab navigation on local/federated timeline even when empty 
Port bc464619f3 to glitch-soc
 2018-12-18 21:39:35 +01:00
Thibaut Girka 7a91431b6f Do not replace history state 
This is both for consistency with account timelines and to not mess with
the logic used to decide whether going back in the browser's history is
going to make us leave the WebUI.
 2018-12-18 21:39:35 +01:00
Thibaut Girka 4073773a9f [Glitch] Enable media timeline 
Port 590ae5ac66 to glitch-soc
 2018-12-18 21:39:35 +01:00
Thibaut Girka adcfdafc26 [Glitch] Hide section headline for timelines in production 
Port ff98de966f to glitch-soc
 2018-12-18 21:39:35 +01:00
Thibaut Girka 0ea5823484 [Glitch] Change column params on pinned timeline 
Port f5421e5309 to glitch-soc
 2018-12-18 21:39:35 +01:00
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