3g0st
/
mastodon-docker-playground
forked from treehouse/mastodon
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
8,243 Commits
8 Branches
0 Tags
183 MiB
Commit Graph

8243 Commits (d126240129681c64063f7f339eba55c105a94082)

Author SHA1 Message Date
Thibaut Girka d126240129 Immediately go back in browser history upon successfully sending toot 2018-12-30 14:07:57 +01:00
Thibaut Girka 115b1abb6e Rename hide_followers_count helper to hide_followers_count? 2018-12-28 20:05:47 +01:00
Thibaut Girka 374bae0abe Do not leak followers count on public pages 
Fixes #873
 2018-12-28 20:05:47 +01:00
Thibaut Girka f349fe2159 Fix account unsilencing and unsuspension 
Fix regression from 3c033c4352
 2018-12-26 19:13:54 +01:00
ThibG 8a3e4a4883
Merge pull request #871 from ThibG/glitch-soc/merge-upstream 
Merge upstream changes
 2018-12-23 15:23:12 +01:00
Thibaut Girka cb98e7dbd3 [Glitch] Add moderation warnings 
Port SCSS changes from 3c033c4352 to glitch-soc
 2018-12-23 12:54:09 +01:00
Thibaut Girka 71d683b410 Change instance_presenter_spec to point to glitch-soc instead of tootsuite 2018-12-23 11:45:26 +01:00
Thibaut Girka 82088f0d7d [Glitch] Remove links to bridge.joinmastodon.org (non-functional) 
Port bb62827c16 to glitch-soc
 2018-12-23 11:43:47 +01:00
Thibaut Girka c5c4450fdd Remove file added by error 2018-12-23 11:43:25 +01:00
Thibaut Girka 22dedb676b [Glitch] Fix unnecessary loadMore calls when the end of a timeline has been reached 
Port 8389b496ba to glitch flavour
 2018-12-23 11:40:52 +01:00
Thibaut Girka 3e686beaea Merge branch 'master' into glitch-soc/merge-upstream 
Conflicts:
- config/routes.rb
  Upstream changed some admin routes, conflict was because of an added :show
  action for statuses on our side. Kept it.
 2018-12-23 11:28:28 +01:00
ThibG e25947db4a Sanitize and sandbox toot embeds (#9552) 2018-12-23 02:16:35 +01:00
Eugen Rochko bb62827c16
Remove links to bridge.joinmastodon.org (non-functional) (#9608) 
Add link to profile directory
 2018-12-22 23:32:00 +01:00
Eugen Rochko 59e333385b
Show 40 profiles per directory page instead of 30 (#9609) 
To better align with the list of hashtags
 2018-12-22 23:31:23 +01:00
Eugen Rochko 3c033c4352
Add moderation warnings (#9519) 
* Add moderation warnings

Replace individual routes for disabling, silencing, and suspending
a user, as well as the report update route, with a unified account
action controller that allows you to select an action (none,
disable, silence, suspend) as well as whether it should generate an
e-mail notification with optional custom text. That notification,
with the optional custom text, is saved as a warning.

Additionally, there are warning presets you can configure to save
time when performing the above.

* Use Account#local_username_and_domain
 2018-12-22 20:02:09 +01:00
Quentí 00862dcaff [i18n] Occitan update (#9607) 
* Update for new On Board messages

* Update oc.json
 2018-12-22 18:27:03 +01:00
ysksn bd4ee732c2 Remove MailerHelper does nothing (#9604) 2018-12-22 02:35:55 +01:00
Thibaut Girka 1a3088364f Fix composer not getting focus after reply confirmation dialog 
The modal-handling code gives back focus to the element focused when the
modal opened. However, in the case of reply confirmation, it would do so
*after* the composer code itself requested focus.
 2018-12-21 20:00:49 +01:00
Thibaut Girka 0605c004a5 Fix incorrect and duplicate onConfirm callback 2018-12-21 20:00:49 +01:00
Thibaut Girka 6166751f9e [Glitch] Fix that translation is not applied to "joining hashtags" 
Port bfec030a4e to glitch-soc
 2018-12-21 19:54:54 +01:00
Thibaut Girka 3611ea02e2 [Glitch] Deep compare tags for hashtag column reload 
Port 4fdefffb99 to glitch-soc
 2018-12-21 19:54:54 +01:00
Thibaut Girka 4be7313298 [Glitch] Allow joining several hashtags in a single column 
Port 4c03e05a4e to glitch-soc

This introduces new requirements in the API:

  `/api/v1/timelines/tag/:tag` now accepts new params: `any`, `all` and `none`
  It now returns status matching tag :tag or any of the :any, provided that
  they also include all tags in `all` and none of `none`.
 2018-12-21 19:54:54 +01:00
Marcin Mikołajczak aa0e1ff286 i18n: Update Polish translation (#9594) 
Signed-off-by: Marcin Mikołajczak <me@m4sk.in>
 2018-12-21 18:56:24 +01:00
ysksn eee2b05ea2 Add specs for CustomEmojiFilter (#9599) 2018-12-21 18:52:57 +01:00
ThibG a6079a42b6 Fix composer not getting focus after reply confirmation dialog (#9602) 
The modal-handling code gives back focus to the element focused when the
modal opened. However, in the case of reply confirmation, it would do so
*after* the composer code itself requested focus.
 2018-12-21 18:52:41 +01:00
ysksn de3cecf37a Add specs for AdminMailer (#9597) 2018-12-21 09:34:34 +01:00
ysksn 1bc78ec50e Add specs for InstancePresenter (#9596) 2018-12-21 08:59:56 +01:00
Eugen Rochko 240c122767
Skip mailer job retries when a record no longer exists (#9590) 
Fix #8666
 2018-12-21 06:16:17 +01:00
Thibaut Girka 6073195a7d [Glitch] Display customized mascot in web UI 
Port relevant parts of 9d4541c612 to glitch-soc
 2018-12-20 18:39:05 +01:00
Thibaut Girka fb63941c47 Make drawer markup and styling closer to upstream 
WARNING: This may break some custom skins!

  `.drawer > .contents` has been moved to
  `.drawer > .drawer__pager > .drawer__iner`, and the waves have been moved
  from `.drawer > .contents` to `.drawer__inner__mastodon`!
 2018-12-20 18:39:05 +01:00
ysksn 6a2d030c2f Add specs for ReportNotePolicy (#9592) 2018-12-20 17:52:18 +01:00
ysksn b93e317886 Add specs for policies (#9591) 
* Add spec for RelayPolicy

* Add specs for SubscriptionPolicy

* Add specs for SettingsPolicy

* Add specs for TagPolicy

* Add specs for ReportPolicy
 2018-12-20 17:52:07 +01:00
ysksn be9640bfc2 Add specs for UserPolicy (#9593) 2018-12-20 17:51:55 +01:00
Thibaut Girka 5eaf2c9e02 [Glitch] Back to the getting-started when pins the timeline 
Port 5bf100f87b to glitch-soc
 2018-12-20 14:51:28 +01:00
Thibaut Girka bc113927d6 Move hide_followers_count logic to an helper 2018-12-20 14:51:12 +01:00
Thibaut Girka bd23288a52 Add a per-user setting to hide followers count 
This is only available if the instance-wide setting isn't set and allows
people to hide their own followers count. This does not hide others' to
them.
 2018-12-20 14:51:12 +01:00
Thibaut Girka 9e04b2e8a4 Per-user followers count display in profile directory 2018-12-20 14:51:12 +01:00
Thibaut Girka 1b18eb49e3 Hide negative follower counts from glitch flavour 2018-12-20 14:51:12 +01:00
Thibaut Girka a1c56fcef1 Add admin setting to disable followers count 2018-12-20 14:51:12 +01:00
Thibaut Girka 0cd367e295 Refactor followers_accounts_controller 2018-12-20 14:51:12 +01:00
ysksn d649d84594 Add specs for InvitePolicy (#9589) 2018-12-20 04:23:09 +01:00
ysksn 44189c33d1 Add specs for EmailDomainBlockPolicy (#9586) 2018-12-20 03:51:41 +01:00
ysksn 08cb8a1ff3 Add specs for InstancePolicy (#9587) 2018-12-20 03:51:31 +01:00
ysksn e181f99739 Add specs for DomainBlockPolicy (#9585) 2018-12-20 03:47:51 +01:00
ysksn 5088213f5e Add specs for CustomEmojiPolicy (#9584) 2018-12-20 03:24:28 +01:00
Eugen Rochko 108b2139cd
Allow unauthenticated REST API access to GET /api/v1/accounts/:id/statuses (#9573) 
Fix #7087

The same data is available over the ActivityPub outbox, RSS, and Atom, so
there is little benefit to keeping it limited in this method.
 2018-12-20 01:30:43 +01:00
ThibG 8389b496ba Fix unnecessary loadMore calls when the end of a timeline has been reached (#9581) 
Fixes #9568
 2018-12-19 22:23:16 +01:00
Thibaut Girka c2b1e8bc43 Override current_user when generating static pages 2018-12-19 20:49:58 +01:00
Thibaut Girka e8d5affe06 Restore oops.gif animation for user who have auto_play_gif set 2018-12-19 20:49:58 +01:00
Thibaut Girka 0c2d48b60a Replace animated oops.gif by a non-animated image 
Fixes #6060
 2018-12-19 20:49:58 +01:00