3g0st
/
mastodon-docker-playground
forked from treehouse/mastodon
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
8,203 Commits
8 Branches
0 Tags
183 MiB
Commit Graph

8203 Commits (6073195a7d65261bc4092b771a37b53ee1cb09b3)

Author SHA1 Message Date
Thibaut Girka 6073195a7d [Glitch] Display customized mascot in web UI 
Port relevant parts of 9d4541c612 to glitch-soc
 2018-12-20 18:39:05 +01:00
Thibaut Girka fb63941c47 Make drawer markup and styling closer to upstream 
WARNING: This may break some custom skins!

  `.drawer > .contents` has been moved to
  `.drawer > .drawer__pager > .drawer__iner`, and the waves have been moved
  from `.drawer > .contents` to `.drawer__inner__mastodon`!
 2018-12-20 18:39:05 +01:00
Thibaut Girka 5eaf2c9e02 [Glitch] Back to the getting-started when pins the timeline 
Port 5bf100f87b to glitch-soc
 2018-12-20 14:51:28 +01:00
Thibaut Girka bc113927d6 Move hide_followers_count logic to an helper 2018-12-20 14:51:12 +01:00
Thibaut Girka bd23288a52 Add a per-user setting to hide followers count 
This is only available if the instance-wide setting isn't set and allows
people to hide their own followers count. This does not hide others' to
them.
 2018-12-20 14:51:12 +01:00
Thibaut Girka 9e04b2e8a4 Per-user followers count display in profile directory 2018-12-20 14:51:12 +01:00
Thibaut Girka 1b18eb49e3 Hide negative follower counts from glitch flavour 2018-12-20 14:51:12 +01:00
Thibaut Girka a1c56fcef1 Add admin setting to disable followers count 2018-12-20 14:51:12 +01:00
Thibaut Girka 0cd367e295 Refactor followers_accounts_controller 2018-12-20 14:51:12 +01:00
Thibaut Girka c2b1e8bc43 Override current_user when generating static pages 2018-12-19 20:49:58 +01:00
Thibaut Girka e8d5affe06 Restore oops.gif animation for user who have auto_play_gif set 2018-12-19 20:49:58 +01:00
Thibaut Girka 0c2d48b60a Replace animated oops.gif by a non-animated image 
Fixes #6060
 2018-12-19 20:49:58 +01:00
ThibG aae088aaf0
Merge pull request #865 from ThibG/glitch-soc/merge-upstream 
Merge upstream changes
 2018-12-19 16:19:00 +01:00
Thibaut Girka 2228655848 [Glitch] Improved appearance of notification filter on safari 
Port 2e1b5edfea to glitch-soc
 2018-12-19 13:00:08 +01:00
Thibaut Girka add74816a5 Merge branch 'master' into glitch-soc/merge-upstream 2018-12-19 12:58:49 +01:00
ysksn af56efdec5 Add specs for AccountPolicy (#9575) 2018-12-19 08:56:59 +01:00
mayaeh ff472d2cfb Update Japanese translations. (#9574) 2018-12-19 08:51:02 +01:00
ysksn 0a1ade4f02 Add specs for AccountModerationNotePolicy (#9571) 2018-12-19 07:24:03 +01:00
ysksn 102e4cfa32 Add specs for StatusPolicy (#9569) 2018-12-19 05:19:20 +01:00
Hinaloe 2e1b5edfea improved appearance of notification filter on safari (#9564) 2018-12-18 22:28:09 +01:00
ThibG e70e496e29 Clean up dead code in public timeline code (#9565) 2018-12-18 22:00:18 +01:00
Thibaut Girka 655da1be20 Reword confirm_before_clearing_draft description 2018-12-18 21:54:34 +01:00
Thibaut Girka 9a7201f2ee Allow disabling the reply confirmation dialog 2018-12-18 21:54:34 +01:00
Thibaut Girka 056a8a8ee4 Allow disabling media confirmation from the confirmation dialog itself 2018-12-18 21:54:34 +01:00
Thibaut Girka 490d8fff0b Remove dead code 2018-12-18 21:39:35 +01:00
Thibaut Girka 82b01a6c9f [Glitch] Put "Media Only" option in column settings instead of content area headline 
Port 4f42238c29 to glitch-soc
 2018-12-18 21:39:35 +01:00
Thibaut Girka 9fc7ad7b9c [Glitch] Always display tab navigation on local/federated timeline even when empty 
Port 90b64c0069 to glitch-soc
 2018-12-18 21:39:35 +01:00
Thibaut Girka c644e6ea89 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 200a8bdd3a [Glitch] Enable media timeline 
Port 8182b61518 to glitch-soc
 2018-12-18 21:39:35 +01:00
Thibaut Girka a693d6e2f2 [Glitch] Hide section headline for timelines in production 
Port 4eeda67727 to glitch-soc
 2018-12-18 21:39:35 +01:00
Thibaut Girka 593f88acb1 [Glitch] Change column params on pinned timeline 
Port 06252ec71e to glitch-soc
 2018-12-18 21:39:35 +01:00
Thibaut Girka c03cbb9471 [Glitch] Save onlyMedia prop when pinning column 
Port 5ea643b279 to glitch-soc
 2018-12-18 21:39:35 +01:00
Thibaut Girka 1a9e78b9bc [Glitch] Add exact attribute to WrappedRoute for community timeline 
Port 46061dc041 to glitch-soc
 2018-12-18 21:39:35 +01:00
Thibaut Girka 1fb4bf87f7 [Glitch] Add media timeline 
Port 7403e5d306 to glitch-soc
 2018-12-18 21:39:35 +01:00
ThibG 74ee5bdf37
Merge pull request #862 from ThibG/glitch-soc/merge-upstream 
Merge upstream changes
 2018-12-18 19:37:07 +01:00
Thibaut Girka 0ef2c1415a [Glitch] Make notifications quick-filter use consistent style with profile tabs 
Port 12ab15e584 to glitch-soc
 2018-12-18 17:23:04 +01:00
Thibaut Girka 06a7c07eda [Glitch] Add notification quick-filter bar in the frontend app 
Port 13dce12665 to glitch-soc
 2018-12-18 17:22:01 +01:00
Thibaut Girka a18a46ca6e [Glitch] Responsive design for profile directory 
Port SCSS changes from 087e118971 to glitch flavour
 2018-12-18 17:03:53 +01:00
Thibaut Girka 034ffc079e 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 5bf100f87b Back to the getting-started when pins the timeline. (#9561) 2018-12-18 16:43:50 +01:00
ysksn dd85700a3e Add spec for AccountableConcern#log_action (#9559) 2018-12-18 16:43:03 +01:00
dependabot[bot] 071eb0e202 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 2c1a6f746f fix CSP / X-Frame-Options for media embeds (#9558) 2018-12-18 16:40:30 +01:00
Eugen Rochko 857e8eb312
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 36d27e2891 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 30de4e4dfc [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 12ab15e584
Make notifications quick-filter use consistent style with profile tabs (#9554) 2018-12-17 21:08:40 +01:00
ThibG e709b8da0d 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 4ede51743e 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 8266d224ef Split out is_changing_upload from is_submitting 
Fixes #855
 2018-12-17 13:01:07 +01:00