about summary refs log tree commit diff
AgeCommit message (Collapse)Author
2018-12-30Fix crash when clearing uninitialized timelineThibaut Girka
Fixes #875
2018-12-30Immediately go back in browser history upon successfully sending tootThibaut Girka
2018-12-28Rename hide_followers_count helper to hide_followers_count?Thibaut Girka
2018-12-28Do not leak followers count on public pagesThibaut Girka
Fixes #873
2018-12-26Fix account unsilencing and unsuspensionThibaut Girka
Fix regression from 3c033c4352f8b156887cd7157b4a89c23a545838
2018-12-23Merge pull request #871 from ThibG/glitch-soc/merge-upstreamThibG
Merge upstream changes
2018-12-23[Glitch] Add moderation warningsThibaut Girka
Port SCSS changes from 3c033c4352f8b156887cd7157b4a89c23a545838 to glitch-soc
2018-12-23Change instance_presenter_spec to point to glitch-soc instead of tootsuiteThibaut Girka
2018-12-23[Glitch] Remove links to bridge.joinmastodon.org (non-functional)Thibaut Girka
Port bb62827c16dbf35c70da2dc801f602df3c76fcca to glitch-soc
2018-12-23Remove file added by errorThibaut Girka
2018-12-23[Glitch] Fix unnecessary loadMore calls when the end of a timeline has been ↵Thibaut Girka
reached Port 8389b496ba9f8b5fa04a34ccc14c8e4195e03ea3 to glitch flavour
2018-12-23Merge branch 'master' into glitch-soc/merge-upstreamThibaut Girka
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-23Sanitize and sandbox toot embeds (#9552)ThibG
2018-12-22Remove links to bridge.joinmastodon.org (non-functional) (#9608)Eugen Rochko
Add link to profile directory
2018-12-22Show 40 profiles per directory page instead of 30 (#9609)Eugen Rochko
To better align with the list of hashtags
2018-12-22Add moderation warnings (#9519)Eugen Rochko
* 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[i18n] Occitan update (#9607)Quentí
* Update for new On Board messages * Update oc.json
2018-12-22Remove MailerHelper does nothing (#9604)ysksn
2018-12-21Fix composer not getting focus after reply confirmation dialogThibaut Girka
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-21Fix incorrect and duplicate onConfirm callbackThibaut Girka
2018-12-21[Glitch] Fix that translation is not applied to "joining hashtags"Thibaut Girka
Port bfec030a4e3be37e4986d7ec5cb1bda968ba549a to glitch-soc
2018-12-21[Glitch] Deep compare tags for hashtag column reloadThibaut Girka
Port 4fdefffb9906ffc3e5fde7af652674bebffd6e15 to glitch-soc
2018-12-21[Glitch] Allow joining several hashtags in a single columnThibaut Girka
Port 4c03e05a4e1a237f8a414a0861c03abe3269dbc8 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-21i18n: Update Polish translation (#9594)Marcin Mikołajczak
Signed-off-by: Marcin Mikołajczak <me@m4sk.in>
2018-12-21Add specs for CustomEmojiFilter (#9599)ysksn
2018-12-21Fix composer not getting focus after reply confirmation dialog (#9602)ThibG
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-21Add specs for AdminMailer (#9597)ysksn
2018-12-21Add specs for InstancePresenter (#9596)ysksn
2018-12-21Skip mailer job retries when a record no longer exists (#9590)Eugen Rochko
Fix #8666
2018-12-20[Glitch] Display customized mascot in web UIThibaut Girka
Port relevant parts of 9d4541c612b506889675c4c19ced5cd17ad3710f to glitch-soc
2018-12-20Make drawer markup and styling closer to upstreamThibaut Girka
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-20Add specs for ReportNotePolicy (#9592)ysksn
2018-12-20Add specs for policies (#9591)ysksn
* Add spec for RelayPolicy * Add specs for SubscriptionPolicy * Add specs for SettingsPolicy * Add specs for TagPolicy * Add specs for ReportPolicy
2018-12-20Add specs for UserPolicy (#9593)ysksn
2018-12-20[Glitch] Back to the getting-started when pins the timelineThibaut Girka
Port 5bf100f87be571e86305f3ab244183fc46f1ede2 to glitch-soc
2018-12-20Move hide_followers_count logic to an helperThibaut Girka
2018-12-20Add a per-user setting to hide followers countThibaut Girka
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-20Per-user followers count display in profile directoryThibaut Girka
2018-12-20Hide negative follower counts from glitch flavourThibaut Girka
2018-12-20Add admin setting to disable followers countThibaut Girka
2018-12-20Refactor followers_accounts_controllerThibaut Girka
2018-12-20Add specs for InvitePolicy (#9589)ysksn
2018-12-20Add specs for EmailDomainBlockPolicy (#9586)ysksn
2018-12-20Add specs for InstancePolicy (#9587)ysksn
2018-12-20Add specs for DomainBlockPolicy (#9585)ysksn
2018-12-20Add specs for CustomEmojiPolicy (#9584)ysksn
2018-12-20Allow unauthenticated REST API access to GET /api/v1/accounts/:id/statuses ↵Eugen Rochko
(#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-19Fix unnecessary loadMore calls when the end of a timeline has been reached ↵ThibG
(#9581) Fixes #9568
2018-12-19Override current_user when generating static pagesThibaut Girka
2018-12-19Restore oops.gif animation for user who have auto_play_gif setThibaut Girka