e8845f0cb2
Fix incorrect and duplicate onConfirm callback
6 years ago
89db203110
[Glitch] Fix that translation is not applied to "joining hashtags"
...
Port 88e40d03d9
6 years ago
0cac543474
[Glitch] Deep compare tags for hashtag column reload
...
Port 98c9ad366b
6 years ago
423c953518
[Glitch] Allow joining several hashtags in a single column
...
Port d2a9ea58da
6 years ago
85dc4507e7
[Glitch] Display customized mascot in web UI
...
Port relevant parts of 2a36092328
6 years ago
bbba494092
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`!
6 years ago
7d437f7fc9
[Glitch] Back to the getting-started when pins the timeline
...
Port f579f1b10e
6 years ago
ae7d5ee768
Move hide_followers_count logic to an helper
6 years ago
cabf2772ea
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.
6 years ago
80f956bc3e
Per-user followers count display in profile directory
6 years ago
3ba1aa8d2b
Hide negative follower counts from glitch flavour
6 years ago
20418dc7a7
Add admin setting to disable followers count
6 years ago
a52a0e021b
Refactor followers_accounts_controller
6 years ago
450b428536
Override current_user when generating static pages
6 years ago
2e964346ce
Restore oops.gif animation for user who have auto_play_gif set
6 years ago
2059bbd0ed
Replace animated oops.gif by a non-animated image
...
Fixes #6060
6 years ago
bdb82dd64a
Merge pull request #865 from ThibG/glitch-soc/merge-upstream
...
Merge upstream changes
6 years ago
ce7ac8c1d7
[Glitch] Improved appearance of notification filter on safari
...
Port e9ad8044cc
6 years ago
d53f315824
Merge branch 'master' into glitch-soc/merge-upstream
6 years ago
d338a2099e
Add specs for AccountPolicy ( #9575 )
6 years ago
26f2c1240e
Update Japanese translations. ( #9574 )
6 years ago
48a70180e2
Add specs for AccountModerationNotePolicy ( #9571 )
6 years ago
bae098d118
Add specs for StatusPolicy ( #9569 )
6 years ago
e9ad8044cc
improved appearance of notification filter on safari ( #9564 )
6 years ago
a8f77d9f91
Clean up dead code in public timeline code ( #9565 )
6 years ago
4b8cb9696e
Reword confirm_before_clearing_draft description
6 years ago
ba8d23c7cb
Allow disabling the reply confirmation dialog
6 years ago
55e3dae600
Allow disabling media confirmation from the confirmation dialog itself
6 years ago
79b793be2a
Remove dead code
6 years ago
2bf78186aa
[Glitch] Put "Media Only" option in column settings instead of content area headline
...
Port 9c2fc4d684
6 years ago
677f430f23
[Glitch] Always display tab navigation on local/federated timeline even when empty
...
Port bc464619f3
6 years ago
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.
6 years ago
4073773a9f
[Glitch] Enable media timeline
...
Port 590ae5ac66
6 years ago
adcfdafc26
[Glitch] Hide section headline for timelines in production
...
Port ff98de966f
6 years ago
0ea5823484
[Glitch] Change column params on pinned timeline
...
Port f5421e5309
6 years ago
f39c452cab
[Glitch] Save onlyMedia prop when pinning column
...
Port 20c650b644
6 years ago
498ff2b52e
[Glitch] Add exact attribute to WrappedRoute for community timeline
...
Port 4a0207e3ea
6 years ago
0a87d07f97
[Glitch] Add media timeline
...
Port ccc240b59c
6 years ago
a0a32a68c4
Merge pull request #862 from ThibG/glitch-soc/merge-upstream
...
Merge upstream changes
6 years ago
e1f8359ea4
[Glitch] Make notifications quick-filter use consistent style with profile tabs
...
Port 84385d876f
6 years ago
cdc9dca649
[Glitch] Add notification quick-filter bar in the frontend app
...
Port df7186e93a
6 years ago
c678e1906a
[Glitch] Responsive design for profile directory
...
Port SCSS changes from 32bd452b56
6 years ago
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.
6 years ago
f579f1b10e
Back to the getting-started when pins the timeline. ( #9561 )
6 years ago
66b994aa7a
Add spec for AccountableConcern#log_action ( #9559 )
6 years ago
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>
6 years ago
dc9f3d2cf2
fix CSP / X-Frame-Options for media embeds ( #9558 )
6 years ago
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
6 years ago
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.
6 years ago
d16638a116
[Glitch] Minor scrollable list fixes
...
* Make sure loading indicator has enough vertical space
* Respect reduce_motion setting for loading indicator
Port 4ede51743e
6 years ago
Thibaut Girka
ysksn
mayaeh
Hinaloe
kedama
dependabot[bot]
jomo
Eugen Rochko