mirrors
/
donphan
mirror of https://github.com/Siphonay/mastodon
1
0
Fork 0
Code Releases Activity
7,827 Commits 2 Branches 16 Tags 298 MiB
Commit Graph

7827 Commits

Author SHA1 Message Date
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 e45a6edd65 Keep new DMs in home feeds and in the old DM timeline 
Revert server-side part of 87fdd139b8
 2018-10-22 18:15:51 +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
Eugen Rochko 4f0bdbaaaf
Downgrade fog-openstack to 0.3.7 and fog-core to 2.1.0 (#9049) 
Fix #8889
 2018-10-22 16:58:36 +02:00
Eugen Rochko f5b8bd4392
Fix cull tripping on nil in last_webfingered_at (#9051) 
Fix #8741
 2018-10-22 16:58:08 +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
Jeong Arm 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
 2018-10-21 22:52:27 +02:00
ThibG 84cf78da8a Fix og:url on toots' public view (#9047) 
Fixes #9045
 2018-10-21 22:52:10 +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
Jeong Arm 68f0e4d54e Handle if username is not found on tootctl feeds build (#9040) 2018-10-21 16:42:22 +02:00
Gomasy 8d70d3de38 Fix crash when using UNIX socket (#9036) 2018-10-21 16:41:33 +02:00
Thibaut Girka 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.
 2018-10-21 16:09:18 +02:00
Thibaut Girka 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.
 2018-10-21 16:09:18 +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
Eugen Rochko f468bfb830
Bump version to 2.6.0rc1 (#9025) 
* Bump version to 2.6.0rc1

* Update AUTHORS.md

* Update CHANGELOG.md
 2018-10-21 00:49:36 +02:00
takayamaki 33976c8ecc fix: Execute PAM authentication tests on CircleCI (#9029) 
and use 'if' option of context block
 2018-10-20 17:28:04 +02: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 d5bfba3262
Do not test PAM authentication by default (#9027) 
* Do not test PAM authentication by default

* Disable PAM tests if PAM is not enabled
 2018-10-20 07:32:26 +02:00
Eugen Rochko 9486f0ca77
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 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.
 2018-10-20 02:25:25 +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
dependabot[bot] 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>
 2018-10-19 18:51:40 +02:00
Eugen Rochko 3abab56650
Improve README (#9012) 
* Improve README

* Update README.md

* Update README.md

* Update README.md

* Update README.md
 2018-10-19 18:49:35 +02:00
Eugen Rochko 890968603b
Update CONTRIBUTING.md (#9014) 
* Update CONTRIBUTING.md

* Update CONTRIBUTING.md

* Update CONTRIBUTING.md

* Update CONTRIBUTING.md
 2018-10-19 16:41:25 +02:00
dependabot[bot] 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>
 2018-10-19 20:20:07 +09: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
Daigo 3 Dango 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
 2018-10-18 22:32:47 +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
Eugen Rochko 72d7d3003b
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 ddd30f331c
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
dependabot[bot] 00387be289 Bump oj from 3.6.11 to 3.6.12 (#8996) 
Bumps [oj](https://github.com/ohler55/oj) from 3.6.11 to 3.6.12.
- [Release notes](https://github.com/ohler55/oj/releases)
- [Changelog](https://github.com/ohler55/oj/blob/master/CHANGELOG.md)
- [Commits](https://github.com/ohler55/oj/compare/v3.6.11...v3.6.12)

Signed-off-by: dependabot[bot] <support@dependabot.com>
 2018-10-17 16:56:26 +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
Gomasy 7085b21f70 Add destroy_custom_emoji translation (#8997) 
Includes Japanese and English
 2018-10-17 16:54:59 +02:00
Quint Guvernator 926451152e Fix some bad localization strings (#8994) 
* fix finnish locale variable issue

* fix broken welsh localized string
 2018-10-16 23:42:55 +02:00