Commit Graph

5498 Commits (036196b1adeedbe2ec913f1603c4d2f8a16824d8)

Author SHA1 Message Date
Thibaut Girka 9d02774407 Keep back own DMs in Home timeline
Follow-up to 415822a849, fixes inconsistencies
in glitch-soc behavior.
2018-10-23 20:03:35 +02:00
Thibaut Girka 2b7b807df0 Merge branch 'master' into glitch-soc/merge-upstream 2018-10-23 17:15:57 +02:00
Eugen Rochko b49f2eef89 Fix public timelines not instantly updating on compose (#9050)
Fix #9034
2018-10-23 00:43:18 +02:00
Eugen Rochko 541fda5fc8 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 a984d5a1c4 Revert "RTL: remove blank character inside bdi (#9038)" (#9056)
This reverts commit 4bfec4b32d.
2018-10-22 23:23:00 +02:00
Thibaut Girka 1a63a8f74e [Glitch] Surround mid-text display names with bdi tags
Port 19aaf0e99f to glitch-soc
2018-10-22 18:57:20 +02:00
Thibaut Girka 6651d4fa7c [Glitch] fix: initial state of PrivacyDropdown is should not be null
Port 8f0c64baf1 to glitch-soc
2018-10-22 18:41:34 +02:00
Thibaut Girka 2159add1d6 [Glitch] RTL: fix cardbar margins and alignment
Port eb62f72990 to glitch-soc
2018-10-22 18:39:37 +02:00
Thibaut Girka f48cff1a95 [Glitch] RTL: fix admin account avatar margin in about page
Port a105bf8516 to glitch-soc
2018-10-22 18:38:52 +02:00
Thibaut Girka 15e3b0f070 [Glitch] RTL: fix column settings toggle label
Port 26c662792c to glitch-soc
2018-10-22 18:38:11 +02:00
Thibaut Girka c47e40cd6e [Glitch] Fix domain label position and color
Port 45b8a91983 to glitch-soc
2018-10-22 18:37:17 +02:00
Thibaut Girka 69d348ed98 [Glitch] RTL: fix preferences layout
Port 6b1f1c32c5 to glitch-soc
2018-10-22 18:34:48 +02:00
Thibaut Girka 7dc82e1eb2 [Glitch] Fix admin account avatar margin
Port 064b26f03c to glitch-soc
2018-10-22 18:33:35 +02:00
Thibaut Girka acd870ccba [Glitch] RTL: fix user stats in about page
Port 4a95304331 to glitch-soc
2018-10-22 18:31:50 +02:00
Thibaut Girka 81c0cbaa9e [Glitch] RTL: fix domain append at signup form
Port ec15808edd to glitch-soc
2018-10-22 18:31:50 +02:00
Thibaut Girka 0631c9ed7c [Glitch] Fixes 8987 broken alignment at "Remote interaction dialog"
Port 024326e6e6 to glitch-soc
2018-10-22 18:31:50 +02:00
Thibaut Girka d779b09ed7 [Glitch] RTL: fix admin account margins in about page
Port 3d51268c4c to glitch-soc
2018-10-22 18:31:50 +02:00
Thibaut Girka d804ed1dd4 [Glitch] undo part of PR 8202 to fix RTL
Port 96696a40ff to glitch-soc
2018-10-22 18:22:01 +02:00
Thibaut Girka 2ecd3d97ba [Glitch] Improve style of notice/alert messages
Port ce6772690f to glitch-soc
2018-10-22 18:20:43 +02:00
Thibaut Girka 415822a849 Keep new DMs in home feeds and in the old DM timeline
Revert server-side part of 8efdf1a898
2018-10-22 18:15:51 +02:00
Thibaut Girka 46259a36d0 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 4bfec4b32d 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
ThibG f14067368f Fix og:url on toots' public view (#9047)
Fixes #9045
2018-10-21 22:52:10 +02:00
Masoud Abkenar eb62f72990 RTL: fix cardbar margins and alignment (#9044) 2018-10-21 18:37:57 +02:00
Masoud Abkenar a105bf8516 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 085c41ebf2 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.
2018-10-21 16:09:18 +02:00
Thibaut Girka 88cd14802d 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.
2018-10-21 16:09:18 +02:00
Thibaut Girka 3d8c1f6104 Attempt at fixing inline video player 2018-10-21 16:09:07 +02:00
Thibaut Girka 9614abc713 Update mediaGallery component's width when opening CWs 2018-10-21 16:09:07 +02:00
Masoud Abkenar 26c662792c RTL: fix column settings toggle label (#9037) 2018-10-21 20:31:40 +09:00
kedama 45b8a91983 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 8c2027ebe2 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 1cb7fe932d Focus the UI when pressing Escape in the CW field 2018-10-20 15:00:39 +02:00
Eugen Rochko 40d23fc4d1 Add option to block reports from domain (#8830) 2018-10-20 08:02:44 +02:00
Eugen Rochko 9ccae7feff Add "disable" button to report screen (#9024)
* Add "disable" button to report screen

* i18n-tasks remove-unused
2018-10-20 02:39:39 +02:00
Eugen Rochko 9309e5981d Redesign direct messages column (#9022) 2018-10-20 02:23:58 +02:00
Masoud Abkenar 6b1f1c32c5 RTL: fix preferences layout (#9021) 2018-10-20 01:05:17 +02:00
bsky 064b26f03c Fix admin account avatar margin (#9020) 2018-10-19 20:35:42 +02:00
Masoud Abkenar 4a95304331 RTL: fix user stats in about page (#9018) 2018-10-19 20:16:13 +09:00
Eugen Rochko e3b2234382 Add unread indicator to conversations (#9009) 2018-10-19 01:47:29 +02:00
takayamaki 8f0c64baf1 fix: initial state of PrivacyDropdown is should not be null (#9008) 2018-10-19 00:00:19 +02:00
Masoud Abkenar ec15808edd RTL: fix domain append at signup form (#9007) 2018-10-18 21:19:31 +02:00
ThibG b420d15a9b Fix fav/boosts hotkeys not working on detailed statuses (#9006) 2018-10-18 19:52:00 +02:00
Thibaut Girka a8e896af12 Fix fav/boosts hotkeys not working on detailed statuses 2018-10-18 19:00:59 +02:00
Masoud Abkenar 3d51268c4c RTL: fix admin account margins in about page (#9005) 2018-10-18 14:35:49 +02:00
Eugen Rochko 92b93a12cb Do not show "limited" visibility in default visibility preference (#8999)
* Do not show "limited" visibility in default visibility preference

Fix regression from #8950

* Fix code style issue
2018-10-17 22:04:40 +02:00
Eugen Rochko 654520ec8c Improve support for aspects/circles (#8950)
* Add silent column to mentions

* Save silent mentions in ActivityPub Create handler and optimize it

Move networking calls out of the database transaction

* Add "limited" visibility level masked as "private" in the API

Unlike DMs, limited statuses are pushed into home feeds. The access
control rules between direct and limited statuses is almost the same,
except for counter and conversation logic

* Ensure silent column is non-null, add spec

* Ensure filters don't check silent mentions for blocks/mutes

As those are "this person is also allowed to see" rather than "this
person is involved", therefore does not warrant filtering

* Clean up code

* Use Status#active_mentions to limit returned mentions

* Fix code style issues

* Use Status#active_mentions in Notification

And remove stream_entry eager-loading from Notification
2018-10-17 17:13:04 +02:00
ThibG 6e5f9ee743 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
Quint Guvernator 96388bae5f always allow DMs from staff (#8993) 2018-10-16 19:55:05 +02:00
Eugen Rochko 2a43a09ec0 Improve form for selecting media display preference (#8965)
Regression from #8569
2018-10-16 14:07:54 +02:00