Thibaut Girka
8f4fab65a1
Do not rely on hover for upload form options if touch is used
2018-10-27 19:06:49 +02:00
Thibaut Girka
8f3096b846
Merge branch 'master' into glitch-soc/merge-upstream
2018-10-23 17:15:57 +02:00
Eugen Rochko
39abec4d25
Fix public timelines not instantly updating on compose ( #9050 )
...
Fix #9034
2018-10-23 00:43:18 +02:00
Eugen Rochko
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
2018-10-23 00:08:39 +02:00
Eugen Rochko
81017eaea7
Revert "RTL: remove blank character inside bdi ( #9038 )" ( #9056 )
...
This reverts commit c7e9f9ff1e
.
2018-10-22 23:23:00 +02:00
Thibaut Girka
0c7f710be1
[Glitch] Surround mid-text display names with bdi tags
...
Port 7861c5f108
to glitch-soc
2018-10-22 18:57:20 +02:00
Thibaut Girka
323ae1403a
[Glitch] fix: initial state of PrivacyDropdown is should not be null
...
Port bebe8ec887
to glitch-soc
2018-10-22 18:41:34 +02:00
Thibaut Girka
1bb23d0407
[Glitch] RTL: fix cardbar margins and alignment
...
Port c73864c137
to glitch-soc
2018-10-22 18:39:37 +02:00
Thibaut Girka
c9b19e05e2
[Glitch] RTL: fix admin account avatar margin in about page
...
Port 3a157210c8
to glitch-soc
2018-10-22 18:38:52 +02:00
Thibaut Girka
c14be538a6
[Glitch] RTL: fix column settings toggle label
...
Port bf58461d36
to glitch-soc
2018-10-22 18:38:11 +02:00
Thibaut Girka
a1f512f18b
[Glitch] Fix domain label position and color
...
Port 25f9ead041
to glitch-soc
2018-10-22 18:37:17 +02:00
Thibaut Girka
9950db2e1c
[Glitch] RTL: fix preferences layout
...
Port 029943d59b
to glitch-soc
2018-10-22 18:34:48 +02:00
Thibaut Girka
076f0a0eb6
[Glitch] Fix admin account avatar margin
...
Port 065b39e7a4
to glitch-soc
2018-10-22 18:33:35 +02:00
Thibaut Girka
aa277ab5fb
[Glitch] RTL: fix user stats in about page
...
Port 301cbcc980
to glitch-soc
2018-10-22 18:31:50 +02:00
Thibaut Girka
ef9c11e050
[Glitch] RTL: fix domain append at signup form
...
Port 65b3804a6c
to glitch-soc
2018-10-22 18:31:50 +02:00
Thibaut Girka
e18724363d
[Glitch] Fixes 8987 broken alignment at "Remote interaction dialog"
...
Port d35801aaa2
to glitch-soc
2018-10-22 18:31:50 +02:00
Thibaut Girka
1139b758c5
[Glitch] RTL: fix admin account margins in about page
...
Port f8c1b32541
to glitch-soc
2018-10-22 18:31:50 +02:00
Thibaut Girka
bf9c4b6d98
[Glitch] undo part of PR 8202 to fix RTL
...
Port efd09e2ebb
to glitch-soc
2018-10-22 18:22:01 +02:00
Thibaut Girka
9f1c9b6135
[Glitch] Improve style of notice/alert messages
...
Port b972478812
to glitch-soc
2018-10-22 18:20:43 +02:00
Thibaut Girka
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.
2018-10-22 17:51:38 +02:00
Masoud Abkenar
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>
2018-10-22 01:04:32 +02:00
Masoud Abkenar
c73864c137
RTL: fix cardbar margins and alignment ( #9044 )
2018-10-21 18:37:57 +02:00
Masoud Abkenar
3a157210c8
RTL: fix admin account avatar margin in about page ( #9039 )
...
* RTL: fix admin account avatar margin in about page
* fix code style
2018-10-21 16:45:08 +02:00
Thibaut Girka
04bedd237b
Attempt at fixing inline video player
2018-10-21 16:09:07 +02:00
Thibaut Girka
dfa5b0576f
Update mediaGallery component's width when opening CWs
2018-10-21 16:09:07 +02:00
Masoud Abkenar
bf58461d36
RTL: fix column settings toggle label ( #9037 )
2018-10-21 20:31:40 +09:00
kedama
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
2018-10-21 14:35:25 +09:00
Thibaut Girka
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.
2018-10-20 17:06:21 +02:00
Thibaut Girka
13c3fa8d36
Focus the UI when pressing Escape in the CW field
2018-10-20 15:00:39 +02:00
Eugen Rochko
fd5285658f
Add option to block reports from domain ( #8830 )
2018-10-20 08:02:44 +02:00
Eugen Rochko
eb1b9903a6
Redesign direct messages column ( #9022 )
2018-10-20 02:23:58 +02:00
Masoud Abkenar
029943d59b
RTL: fix preferences layout ( #9021 )
2018-10-20 01:05:17 +02:00
bsky
065b39e7a4
Fix admin account avatar margin ( #9020 )
2018-10-19 20:35:42 +02:00
Masoud Abkenar
301cbcc980
RTL: fix user stats in about page ( #9018 )
2018-10-19 20:16:13 +09:00
Eugen Rochko
a38a452481
Add unread indicator to conversations ( #9009 )
2018-10-19 01:47:29 +02:00
takayamaki
bebe8ec887
fix: initial state of PrivacyDropdown is should not be null ( #9008 )
2018-10-19 00:00:19 +02:00
Masoud Abkenar
65b3804a6c
RTL: fix domain append at signup form ( #9007 )
2018-10-18 21:19:31 +02:00
ThibG
007f7690fa
Fix fav/boosts hotkeys not working on detailed statuses ( #9006 )
2018-10-18 19:52:00 +02:00
Thibaut Girka
b13c34de3a
Fix fav/boosts hotkeys not working on detailed statuses
2018-10-18 19:00:59 +02:00
Masoud Abkenar
f8c1b32541
RTL: fix admin account margins in about page ( #9005 )
2018-10-18 14:35:49 +02:00
ThibG
adb06baef6
Handle global hotkeys even when no element has focus ( #8998 )
...
This fixes hotkeys not working when pressing the column
“back” button, for instance.
2018-10-17 16:56:16 +02:00
Masoud Abkenar
d35801aaa2
Fixes 8987 broken alignment at "Remote interaction dialog" ( #8988 )
2018-10-15 16:09:08 +02:00
Masoud Abkenar
efd09e2ebb
undo part of PR 8202 to fix RTL ( #8979 )
2018-10-15 04:39:20 +02:00
Thibaut Girka
b0527a4ce7
Handle alt+enter in the spoiler input as shortcut for secondary post
...
Fixes #780
2018-10-14 12:00:21 +02:00
Eugen Rochko
b972478812
Improve style of notice/alert messages ( #8973 )
2018-10-13 01:51:30 +02:00
Eugen Rochko
7d182442a7
Weblate translations (2018-10-12) ( #8972 )
...
* Translated using Weblate (Welsh)
Currently translated at 64.4% (448 of 696 strings)
Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/cy/
* Translated using Weblate (Arabic)
Currently translated at 98.0% (682 of 696 strings)
Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/ar/
* Translated using Weblate (French)
Currently translated at 99.9% (695 of 696 strings)
Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/fr/
* Translated using Weblate (Arabic)
Currently translated at 94.3% (82 of 87 strings)
Translation: Mastodon/Preferences
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/ar/
* Translated using Weblate (Welsh)
Currently translated at 88.7% (297 of 335 strings)
Translation: Mastodon/React
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/cy/
* Translated using Weblate (French)
Currently translated at 100.0% (335 of 335 strings)
Translation: Mastodon/React
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/fr/
* Translated using Weblate (French)
Currently translated at 100,0% (87 of 87 strings)
Translation: Mastodon/Preferences
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/fr/
* Translated using Weblate (Czech)
Currently translated at 100.0% (335 of 335 strings)
Translation: Mastodon/React
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/cs/
* Translated using Weblate (Czech)
Currently translated at 100.0% (87 of 87 strings)
Translation: Mastodon/Preferences
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/cs/
* Translated using Weblate (Czech)
Currently translated at 99.9% (695 of 696 strings)
Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/cs/
* Translated using Weblate (Persian)
Currently translated at 100.0% (335 of 335 strings)
Translation: Mastodon/React
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/fa/
* Translated using Weblate (Arabic)
Currently translated at 94.6% (88 of 93 strings)
Translation: Mastodon/Preferences
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/ar/
* Translated using Weblate (Arabic)
Currently translated at 100.0% (335 of 335 strings)
Translation: Mastodon/React
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/ar/
* Translated using Weblate (Czech)
Currently translated at 100.0% (93 of 93 strings)
Translation: Mastodon/Preferences
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/cs/
* Translated using Weblate (Galician)
Currently translated at 100,0% (93 of 93 strings)
Translation: Mastodon/Preferences
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/gl/
* Translated using Weblate (Galician)
Currently translated at 100,0% (696 of 696 strings)
Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/gl/
* Translated using Weblate (Greek)
Currently translated at 100.0% (93 of 93 strings)
Translation: Mastodon/Preferences
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/el/
* Translated using Weblate (Greek)
Currently translated at 98.8% (331 of 335 strings)
Translation: Mastodon/React
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/el/
* Translated using Weblate (Greek)
Currently translated at 99.7% (694 of 696 strings)
Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/el/
* Translated using Weblate (Persian)
Currently translated at 100.0% (93 of 93 strings)
Translation: Mastodon/Preferences
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/fa/
* Translated using Weblate (Czech)
Currently translated at 99.9% (695 of 696 strings)
Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/cs/
* Translated using Weblate (French)
Currently translated at 100,0% (93 of 93 strings)
Translation: Mastodon/Preferences
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/fr/
* Translated using Weblate (French)
Currently translated at 99.9% (695 of 696 strings)
Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/fr/
* Translated using Weblate (Japanese)
Currently translated at 99.4% (692 of 696 strings)
Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/ja/
* Translated using Weblate (Corsican)
Currently translated at 100.0% (93 of 93 strings)
Translation: Mastodon/Preferences
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/co/
* Translated using Weblate (Corsican)
Currently translated at 99.9% (695 of 696 strings)
Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/co/
* Translated using Weblate (German)
Currently translated at 99.6% (693 of 696 strings)
Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/de/
* Translated using Weblate (German)
Currently translated at 100,0% (93 of 93 strings)
Translation: Mastodon/Preferences
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/de/
* Translated using Weblate (Japanese)
Currently translated at 99.4% (692 of 696 strings)
Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/ja/
* Translated using Weblate (Japanese)
Currently translated at 99.9% (695 of 696 strings)
Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/ja/
* Translated using Weblate (Japanese)
Currently translated at 100.0% (335 of 335 strings)
Translation: Mastodon/React
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/ja/
* Translated using Weblate (Japanese)
Currently translated at 94.6% (88 of 93 strings)
Translation: Mastodon/Preferences
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/ja/
* i18n-tasks normalize
* yarn manage:translations
2018-10-13 01:51:14 +02:00
Thibaut Girka
70d346ea95
Fix auto-unfold CWs when no regexp is set
...
Fixes #778
2018-10-12 23:34:26 +02:00
Eugen Rochko
9d4541c612
Display customized mascot in web UI and fix admin form for it ( #8964 )
...
Follow-up to #8766
2018-10-12 04:04:08 +02:00
ThibG
0075964244
Merge pull request #775 from ThibG/glitch-soc/merge-upstream
...
Merge upstream changes
2018-10-11 21:28:03 +02:00
Eugen Rochko
87fdd139b8
Do not push DMs into the home feed ( #8940 )
...
* Do not push DMs into the home feed
* Show DMs column after sending a DM, if DMs column is not already shown
2018-10-11 01:31:03 +02:00