c9b19e05e2
[Glitch] RTL: fix admin account avatar margin in about page
...
Port 3a157210c8
6 years ago
c14be538a6
[Glitch] RTL: fix column settings toggle label
...
Port bf58461d36
6 years ago
a1f512f18b
[Glitch] Fix domain label position and color
...
Port 25f9ead041
6 years ago
9950db2e1c
[Glitch] RTL: fix preferences layout
...
Port 029943d59b
6 years ago
076f0a0eb6
[Glitch] Fix admin account avatar margin
...
Port 065b39e7a4
6 years ago
aa277ab5fb
[Glitch] RTL: fix user stats in about page
...
Port 301cbcc980
6 years ago
ef9c11e050
[Glitch] RTL: fix domain append at signup form
...
Port 65b3804a6c
6 years ago
e18724363d
[Glitch] Fixes 8987 broken alignment at "Remote interaction dialog"
...
Port d35801aaa2
6 years ago
1139b758c5
[Glitch] RTL: fix admin account margins in about page
...
Port f8c1b32541
6 years ago
bf9c4b6d98
[Glitch] undo part of PR 8202 to fix RTL
...
Port efd09e2ebb
6 years ago
9f1c9b6135
[Glitch] Improve style of notice/alert messages
...
Port b972478812
6 years ago
e45a6edd65
Keep new DMs in home feeds and in the old DM timeline
...
Revert server-side part of 87fdd139b8
6 years ago
dcded13a99
Merge branch 'master' into glitch-soc/merge-upstream
...
Conflicts:
- .github/ISSUE_TEMPLATE/bug_report.md
Took our version.
- CONTRIBUTING.md
Updated the embedded copy of upstream's version.
- README.md
Took our version.
- app/policies/status_policy.rb
Not a real conflict, took code from both.
- app/views/layouts/embedded.html.haml
Added upstream's changes (dns-prefetch) and fixed
`%body.embed`
- app/views/settings/preferences/show.html.haml
Reverted some of upstream changes, as we have a
page dedicated for flavours and skins.
- config/initializers/content_security_policy.rb
Kept our version of the CSP.
- config/initializers/doorkeeper.rb
Not a real conflict, took code from both.
6 years ago
4f0bdbaaaf
Downgrade fog-openstack to 0.3.7 and fog-core to 2.1.0 ( #9049 )
...
Fix #8889
6 years ago
f5b8bd4392
Fix cull tripping on nil in last_webfingered_at ( #9051 )
...
Fix #8741
6 years ago
c7e9f9ff1e
RTL: remove blank character inside bdi ( #9038 )
...
* RTL: remove blank character inside bdi
* Update app/javascript/mastodon/components/display_name.js
Co-Authored-By: mabkenar <ampbox@gmail.com>
6 years ago
2e18ad74dc
Fix tootctl cull on dead servers ( #9041 )
...
* Delete first 9 accounts on dead servers
* Clean up code by moving dead server culling to the end
6 years ago
84cf78da8a
Fix og:url on toots' public view ( #9047 )
...
Fixes #9045
6 years ago
c73864c137
RTL: fix cardbar margins and alignment ( #9044 )
6 years ago
3a157210c8
RTL: fix admin account avatar margin in about page ( #9039 )
...
* RTL: fix admin account avatar margin in about page
* fix code style
6 years ago
68f0e4d54e
Handle if username is not found on tootctl feeds build ( #9040 )
6 years ago
8d70d3de38
Fix crash when using UNIX socket ( #9036 )
6 years ago
4739e0f090
Put a video camera emoji or a picture frame emoji instead of “.”
...
This uses the same logic as the status icons in the glitch flavor.
6 years ago
8729f5e466
Do not move CWs to toot body when toot body is empty
...
Fixes #395
Instead of leaving the toot body blank, it replaces it with a single “.” in
order for the fold/unfold CW behavior to not look *too* weird on upstream
Mastodon. Note that this does not fix upstream's CW-dropping behavior, as
that is decided at the time the toot is posted, not received.
6 years ago
04bedd237b
Attempt at fixing inline video player
6 years ago
dfa5b0576f
Update mediaGallery component's width when opening CWs
6 years ago
bf58461d36
RTL: fix column settings toggle label ( #9037 )
6 years ago
25f9ead041
Fix domain label position and color ( #9033 )
...
* Fix position of the domain label
* Fix position of the domain label for RTL
- Fix color mismatch of linear gradient which assigned to "::after" pseudo class
6 years ago
f468bfb830
Bump version to 2.6.0rc1 ( #9025 )
...
* Bump version to 2.6.0rc1
* Update AUTHORS.md
* Update CHANGELOG.md
6 years ago
33976c8ecc
fix: Execute PAM authentication tests on CircleCI ( #9029 )
...
and use 'if' option of context block
6 years ago
e4c3ea1809
Force sensitive content flag when posting a toot with a CW
...
Indeed, when the “Always enable the Content Warning field” setting is enabled,
sending a content-less toot with a CW would move the CW to the toot's content
and leave the toot not marked as sensitive.
6 years ago
13c3fa8d36
Focus the UI when pressing Escape in the CW field
6 years ago
fd5285658f
Add option to block reports from domain ( #8830 )
6 years ago
d5bfba3262
Do not test PAM authentication by default ( #9027 )
...
* Do not test PAM authentication by default
* Disable PAM tests if PAM is not enabled
6 years ago
9486f0ca77
Add "disable" button to report screen ( #9024 )
...
* Add "disable" button to report screen
* i18n-tasks remove-unused
6 years ago
369cc5f555
Check if port/socket is available before forking in Streaming API ( #9023 )
...
Previously, the server would attempt taking port/socket in worker
process, and if it was taken, fail, which made the master process
create a new worker. This led to really high CPU usage if the
streaming API was started when the port or socket were not
available.
Now, before clustering (forking) into worker processes, a test
server is created and then removed to check if it can be done.
6 years ago
eb1b9903a6
Redesign direct messages column ( #9022 )
6 years ago
029943d59b
RTL: fix preferences layout ( #9021 )
6 years ago
065b39e7a4
Fix admin account avatar margin ( #9020 )
6 years ago
6c91f1a5b3
Bump strong_migrations from 0.3.0 to 0.3.1 ( #9015 )
...
Bumps [strong_migrations](https://github.com/ankane/strong_migrations ) from 0.3.0 to 0.3.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.3.0...v0.3.1 )
Signed-off-by: dependabot[bot] <support@dependabot.com>
6 years ago
3abab56650
Improve README ( #9012 )
...
* Improve README
* Update README.md
* Update README.md
* Update README.md
* Update README.md
6 years ago
890968603b
Update CONTRIBUTING.md ( #9014 )
...
* Update CONTRIBUTING.md
* Update CONTRIBUTING.md
* Update CONTRIBUTING.md
* Update CONTRIBUTING.md
6 years ago
c7b9e6f479
Bump tzinfo-data from 1.2018.5 to 1.2018.6 ( #9016 )
...
Bumps [tzinfo-data](https://github.com/tzinfo/tzinfo-data ) from 1.2018.5 to 1.2018.6.
- [Release notes](https://github.com/tzinfo/tzinfo-data/releases )
- [Commits](https://github.com/tzinfo/tzinfo-data/compare/v1.2018.5...v1.2018.6 )
Signed-off-by: dependabot[bot] <support@dependabot.com>
6 years ago
301cbcc980
RTL: fix user stats in about page ( #9018 )
6 years ago
a38a452481
Add unread indicator to conversations ( #9009 )
6 years ago
bebe8ec887
fix: initial state of PrivacyDropdown is should not be null ( #9008 )
6 years ago
e5762875a4
Use Ruby ==2.5.2== 2.5.3 ( #9003 )
...
* Use Ruby 2.5.2
* Specify 2.5.2p104 as RUBY VERSION
Heorku refers to RUBY VERSION in Gemfile.lock
* Use ruby-2.5.3
6 years ago
65b3804a6c
RTL: fix domain append at signup form ( #9007 )
6 years ago
007f7690fa
Fix fav/boosts hotkeys not working on detailed statuses ( #9006 )
6 years ago
b13c34de3a
Fix fav/boosts hotkeys not working on detailed statuses
6 years ago
Thibaut Girka