treehouse
/
mastodon
21
8
Fork 5
Code Issues 32 Pull Requests Projects 1 Releases Wiki Activity
8,241 Commits
12 Branches
15 Tags
760 MiB
Commit Graph

8241 Commits (6b0ee170462e7d63ed1901b2c661f7bf058caad7)

Author SHA1 Message Date
Thibaut Girka 6b0ee17046 Do not leak followers count on public pages 
Fixes #873
 2018-12-28 20:05:47 +01:00
Thibaut Girka 9bc763840f Fix account unsilencing and unsuspension 
Fix regression from 2e0d617b8b
 2018-12-26 19:13:54 +01:00
ThibG f532d5e93d Merge pull request #871 from ThibG/glitch-soc/merge-upstream 
Merge upstream changes
 2018-12-23 15:23:12 +01:00
Thibaut Girka 9e2ceac0ba [Glitch] Add moderation warnings 
Port SCSS changes from 2e0d617b8b to glitch-soc
 2018-12-23 12:54:09 +01:00
Thibaut Girka 56d4c731f1 Change instance_presenter_spec to point to glitch-soc instead of tootsuite 2018-12-23 11:45:26 +01:00
Thibaut Girka df5e49696f [Glitch] Remove links to bridge.joinmastodon.org (non-functional) 
Port eb2994d454 to glitch-soc
 2018-12-23 11:43:47 +01:00
Thibaut Girka 89e7274a7f Remove file added by error 2018-12-23 11:43:25 +01:00
Thibaut Girka e5a25656e8 [Glitch] Fix unnecessary loadMore calls when the end of a timeline has been reached 
Port 240d41b3ca to glitch flavour
 2018-12-23 11:40:52 +01:00
Thibaut Girka 48e6b2360d 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 4bf67e9cd0 Sanitize and sandbox toot embeds (#9552) 2018-12-23 02:16:35 +01:00
Eugen Rochko eb2994d454 Remove links to bridge.joinmastodon.org (non-functional) (#9608) 
Add link to profile directory
 2018-12-22 23:32:00 +01:00
Eugen Rochko 5fdfe0c4cf 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 2e0d617b8b 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í fb34dafd3c [i18n] Occitan update (#9607) 
* Update for new On Board messages

* Update oc.json
 2018-12-22 18:27:03 +01:00
ysksn c2efe52de7 Remove MailerHelper does nothing (#9604) 2018-12-22 02:35:55 +01:00
Thibaut Girka d9a6c27f3b 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 e8845f0cb2 Fix incorrect and duplicate onConfirm callback 2018-12-21 20:00:49 +01:00
Thibaut Girka 89db203110 [Glitch] Fix that translation is not applied to "joining hashtags" 
Port 88e40d03d9 to glitch-soc
 2018-12-21 19:54:54 +01:00
Thibaut Girka 0cac543474 [Glitch] Deep compare tags for hashtag column reload 
Port 98c9ad366b to glitch-soc
 2018-12-21 19:54:54 +01:00
Thibaut Girka 423c953518 [Glitch] Allow joining several hashtags in a single column 
Port d2a9ea58da 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 7fbf9eb817 i18n: Update Polish translation (#9594) 
Signed-off-by: Marcin Mikołajczak <me@m4sk.in>
 2018-12-21 18:56:24 +01:00
ysksn 3beb22f65f Add specs for CustomEmojiFilter (#9599) 2018-12-21 18:52:57 +01:00
ThibG 39e4cbe2dc 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 0ef0de1099 Add specs for AdminMailer (#9597) 2018-12-21 09:34:34 +01:00
ysksn 25fffd5fcb Add specs for InstancePresenter (#9596) 2018-12-21 08:59:56 +01:00
Eugen Rochko ab443aaba8 Skip mailer job retries when a record no longer exists (#9590) 
Fix #8666
 2018-12-21 06:16:17 +01:00
Thibaut Girka 85dc4507e7 [Glitch] Display customized mascot in web UI 
Port relevant parts of 2a36092328 to glitch-soc
 2018-12-20 18:39:05 +01:00
Thibaut Girka bbba494092 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 76cad0240a Add specs for ReportNotePolicy (#9592) 2018-12-20 17:52:18 +01:00
ysksn 6aeb34dc4c 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 8cf484e5a7 Add specs for UserPolicy (#9593) 2018-12-20 17:51:55 +01:00
Thibaut Girka 7d437f7fc9 [Glitch] Back to the getting-started when pins the timeline 
Port f579f1b10e to glitch-soc
 2018-12-20 14:51:28 +01:00
Thibaut Girka ae7d5ee768 Move hide_followers_count logic to an helper 2018-12-20 14:51:12 +01:00
Thibaut Girka cabf2772ea 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 80f956bc3e Per-user followers count display in profile directory 2018-12-20 14:51:12 +01:00
Thibaut Girka 3ba1aa8d2b Hide negative follower counts from glitch flavour 2018-12-20 14:51:12 +01:00
Thibaut Girka 20418dc7a7 Add admin setting to disable followers count 2018-12-20 14:51:12 +01:00
Thibaut Girka a52a0e021b Refactor followers_accounts_controller 2018-12-20 14:51:12 +01:00
ysksn e756191722 Add specs for InvitePolicy (#9589) 2018-12-20 04:23:09 +01:00
ysksn d4b4e87153 Add specs for EmailDomainBlockPolicy (#9586) 2018-12-20 03:51:41 +01:00
ysksn fcb045060e Add specs for InstancePolicy (#9587) 2018-12-20 03:51:31 +01:00
ysksn ce51a08674 Add specs for DomainBlockPolicy (#9585) 2018-12-20 03:47:51 +01:00
ysksn 31f7af3cad Add specs for CustomEmojiPolicy (#9584) 2018-12-20 03:24:28 +01:00
Eugen Rochko ae8c6b892f 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 240d41b3ca 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 450b428536 Override current_user when generating static pages 2018-12-19 20:49:58 +01:00
Thibaut Girka 2e964346ce Restore oops.gif animation for user who have auto_play_gif set 2018-12-19 20:49:58 +01:00
Thibaut Girka 2059bbd0ed Replace animated oops.gif by a non-animated image 
Fixes #6060
 2018-12-19 20:49:58 +01:00
ysksn dcab109a1c Add specs for BackupPolicy (#9576) 2018-12-19 18:24:15 +01:00
ThibG bdb82dd64a Merge pull request #865 from ThibG/glitch-soc/merge-upstream 
Merge upstream changes
 2018-12-19 16:19:00 +01:00