e8ffecbd36
Set @body_classes to admin layout ( #9081 )
6 years ago
df3a7e724d
Fix missing plural keys ( #9084 )
...
* Update i18n-tasks to feature-missing-plural-keys
* Fix pluralizations with missing keys in Arabic
Fix #8554
* Add i18n-tasks missing-plural-keys to CircleCI
6 years ago
d723f2a0a8
Fix RTL layout of status display names ( #9075 )
...
Fix #2350
6 years ago
288e435fe5
Show upload options on click as well as hover ( #9074 )
...
Fix #8918
6 years ago
9f3283086f
Bump capybara from 3.9.0 to 3.10.0 ( #9077 )
...
Bumps [capybara](https://github.com/teamcapybara/capybara ) from 3.9.0 to 3.10.0.
- [Release notes](https://github.com/teamcapybara/capybara/releases )
- [Changelog](https://github.com/teamcapybara/capybara/blob/master/History.md )
- [Commits](https://github.com/teamcapybara/capybara/compare/3.9.0...3.10.0 )
Signed-off-by: dependabot[bot] <support@dependabot.com>
6 years ago
0e8de56a22
Merge pull request #792 from ThibG/glitch-soc/merge-upstream
...
Merge upstream changes
6 years ago
c64234c31f
Bump rspec-rails from 3.8.0 to 3.8.1 ( #9078 )
...
Bumps [rspec-rails](https://github.com/rspec/rspec-rails ) from 3.8.0 to 3.8.1.
- [Release notes](https://github.com/rspec/rspec-rails/releases )
- [Changelog](https://github.com/rspec/rspec-rails/blob/master/Changelog.md )
- [Commits](https://github.com/rspec/rspec-rails/compare/v3.8.0...v3.8.1 )
Signed-off-by: dependabot[bot] <support@dependabot.com>
6 years ago
c61af83de0
Bump i18n-tasks from 0.9.26 to 0.9.27 ( #9079 )
...
Bumps [i18n-tasks](https://github.com/glebm/i18n-tasks ) from 0.9.26 to 0.9.27.
- [Release notes](https://github.com/glebm/i18n-tasks/releases )
- [Changelog](https://github.com/glebm/i18n-tasks/blob/master/CHANGES.md )
- [Commits](https://github.com/glebm/i18n-tasks/compare/v0.9.26...v0.9.27 )
Signed-off-by: dependabot[bot] <support@dependabot.com>
6 years ago
01c169e796
Fix JS error when posting from page without router context ( #9073 )
...
Fix #9057
6 years ago
e3a1955276
Bump i18n-tasks from 0.9.25 to 0.9.26 ( #9071 )
...
Bumps [i18n-tasks](https://github.com/glebm/i18n-tasks ) from 0.9.25 to 0.9.26.
- [Release notes](https://github.com/glebm/i18n-tasks/releases )
- [Changelog](https://github.com/glebm/i18n-tasks/blob/master/CHANGES.md )
- [Commits](https://github.com/glebm/i18n-tasks/compare/v0.9.25...v0.9.26 )
Signed-off-by: dependabot[bot] <support@dependabot.com>
6 years ago
ed8d06212f
Keep back own DMs in Home timeline
...
Follow-up to e45a6edd65
6 years ago
8f3096b846
Merge branch 'master' into glitch-soc/merge-upstream
6 years ago
65867b6e61
Bump parallel_tests from 2.23.0 to 2.24.0 ( #9064 )
...
Bumps [parallel_tests](https://github.com/grosser/parallel_tests ) from 2.23.0 to 2.24.0.
- [Release notes](https://github.com/grosser/parallel_tests/releases )
- [Commits](https://github.com/grosser/parallel_tests/compare/v2.23.0...v2.24.0 )
Signed-off-by: dependabot[bot] <support@dependabot.com>
6 years ago
51677ff070
Update Dockerfile ( #9026 )
6 years ago
39abec4d25
Fix public timelines not instantly updating on compose ( #9050 )
...
Fix #9034
6 years ago
ad510db3a1
Show suggested follows on search screen in mobile layout ( #9010 )
...
Reminder: Suggestions were added in #7918 and are based on who you
interact with who you do not follow. E.g. if you boost someone a lot
from seeing other people's boosts of that person, it makes sense you
might be interested in following the original source; or if you reply
to someone a lot, maybe you'd want to follow them
Each suggestion can be dismissed
6 years ago
969a10a5d1
Persist volumes by default in docker-compose ( #9055 )
...
Too many databases were lost to this
6 years ago
81017eaea7
Revert "RTL: remove blank character inside bdi ( #9038 )" ( #9056 )
...
This reverts commit c7e9f9ff1e
6 years ago
0c7f710be1
[Glitch] Surround mid-text display names with bdi tags
...
Port 7861c5f108
6 years ago
323ae1403a
[Glitch] fix: initial state of PrivacyDropdown is should not be null
...
Port bebe8ec887
6 years ago
1bb23d0407
[Glitch] RTL: fix cardbar margins and alignment
...
Port c73864c137
6 years ago
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
Yamagishi Kazutoshi