about summary refs log tree commit diff
path: root/app/helpers
AgeCommit message (Collapse)Author
2018-03-27Merge remote-tracking branch 'origin/master' into gs-masterDavid Yip
Conflicts: app/javascript/styles/mastodon/components.scss app/models/media_attachment.rb
2018-03-26Validate HTTP response length while receiving (#6891)Akihiko Odaki
to_s method of HTTP::Response keeps blocking while it receives the whole content, no matter how it is big. This means it may waste time to receive unacceptably large files. It may also consume memory and disk in the process. This solves the inefficency by checking response length while receiving.
2018-03-25Merge remote-tracking branch 'tootsuite/master' into glitchsoc/masterJenkins
2018-03-24Close http connection in perform method of Request class (#6889)Akihiko Odaki
HTTP connections must be explicitly closed in many cases, and letting perform method close connections makes its callers less redundant and prevent them from forgetting to close connections.
2018-03-18Merge remote-tracking branch 'origin/master' into gs-masterDavid Yip
Conflicts: config/i18n-tasks.yml
2018-03-18Revert #6479, hide sensitive text/images from OpenGraph previews (#6818)Eugen Rochko
Display summary of attachments in description, and mark up content warning if present, e.g.: Attached: 3 images · Content warning: Dota 2 When text is not supposed to be hidden, it looks more like: Attached: 3 images Here is the text of the toot With #6817, multilinguagility should be assured...
2018-03-09Merge remote-tracking branch 'tootsuite/master' into glitchsoc/masterJenkins
2018-03-09Add missing meta description to profiles, some other SEO stuff (#6706)Eugen Rochko
- Add missing meta description to profiles - Add canonical rel link to landing page - Remove linebreaks from title tags - Add username to profile title - Add toots/following/followers to profile description tags - Add next/prev rel links to profiles - Do not index follower/following variants of profiles
2018-03-04Do not default site_title with site_hostname in InstanceHelper (#6624)Akihiko Odaki
site_title is "Mastodon" by default configuration, and there is no need to default site_title with site_hostname in InstanceHelper.
2018-01-28Merge remote-tracking branch 'origin/master' into merge-upstreamDavid Yip
Conflicts: app/views/layouts/mailer.html.haml config/locales/ko.yml
2018-01-29Add direction tags to HTML e-mails for RTL languages (#6373)Eugen Rochko
2018-01-21Merge remote-tracking branch 'origin/master' into merge-upstream-20180121David Yip
2018-01-22armenian translations initial commit (#6320)Norayr Chilingarian
* adding armenian translations * updating config files for armenian translations * armenian translation fix * fixing spaces
2018-01-20Merge remote-tracking branch 'origin/master' into merge-upstreamDavid Yip
Conflicts: app/javascript/styles/mastodon/components.scss
2018-01-20Fix #6269 - Render LOCAL_DOMAIN as unicode in presentational views (#6305)Eugen Rochko
2018-01-15Merge remote-tracking branch 'origin/master' into gs-masterDavid Yip
Conflicts: Gemfile.lock
2018-01-16HTML e-mails for UserMailer (#6256)Eugen Rochko
- premailer gem to turn CSS into inline styles automatically - rework UserMailer templates - reword UserMailer templates
2018-01-08Merge remote-tracking branch 'tootsuite/master' into glitchsoc/masterJenkins
2018-01-08Fix bad URL schemes being accepted (#6219)Eugen Rochko
* Fix actors accepting invalid URI schemes or different host between URI and URL * Fix statuses accepting invalid URI scheme or different host to actor * Adjust tests to new requirements * Improve readability of mismatching_origin?/invalid_origin? methods
2018-01-04Merge remote-tracking branch 'tootsuite/master' into glitchsoc/masterJenkins
2018-01-04Fallback default thumbnail in instance status API (#6177)Yamagishi Kazutoshi
2018-01-04Fix nil error in log_target_from_history helper (#6173)Eugen Rochko
2018-01-03Merge remote-tracking branch 'tootsuite/master' into glitchsoc/masterJenkins
2018-01-02Adding Serbian latin translations (#6146)Branko Kokanovic
Serbian latin (sr-Latn) is generated automatically from Serbian (sr) translation. Also changed some wording in original (Serbian) translation.
2017-12-31Merge remote-tracking branch 'tootsuite/master' into glitchsoc/masterJenkins
2017-12-31Adding Serbian translation (#6133)Branko Kokanovic
* Adding Serbian translation * i18n-tasks normalize
2017-12-17Merge remote-tracking branch 'tootsuite/master' into glitchsoc/masterJenkins
2017-12-17Add Slovak translation (#6052)Peter
* Add Slovak translation * Slovak translation: i18n-normalize
2017-12-13Merge remote-tracking branch 'tootsuite/master' into glitchsoc/masterJenkins
2017-12-13Add filters to admin UI for custom emojis (#6003)Eugen Rochko
2017-12-13Clean up admin UI for accounts (#6004)Eugen Rochko
* Add staff filter to admin UI for accounts, remove obsolete columns * Only display OStatus section in admin UI for accounts when OStatus data
2017-12-12Merge remote-tracking branch 'tootsuite/master' into merge-upstreamDavid Yip
2017-12-10Add Galician language support (#5955)Yamagishi Kazutoshi
2017-12-06Merge remote-tracking branch 'tootsuite/master' into glitchsoc/masterJenkins
2017-12-06Using double splat operator (#5859)Yamagishi Kazutoshi
2017-12-02Merge remote-tracking branch 'tootsuite/master' into glitchsoc/masterJenkins
2017-12-01Add invite filter (#5862)Yamagishi Kazutoshi
2017-11-30Merge remote-tracking branch 'tootsuite/master' into glitchsoc/masterJenkins
2017-11-30Add semi-support for Video/Image objects in ActivityPub (#5848)Eugen Rochko
* Add semi-support for Video/Image objects in ActivityPub Video and Image objects will create corresponding status records with manually crafted text contents (title + URL) * Extract html-url-finding logic into JsonLdHelper * Fallback to id when url missing, extract supported object types
2017-11-24Merge remote-tracking branch 'tootsuite/master' into glitchsoc/masterJenkins
2017-11-24Add logging of admin actions (#5757)Eugen Rochko
* Add logging of admin actions * Update brakeman whitelist * Log creates, updates and destroys with history of changes * i18n: Update Polish translation (#5782) Signed-off-by: Marcin Mikołajczak <me@m4sk.in> * Split admin navigation into moderation and administration * Redesign audit log page * 🇵🇱 (#5795) * Add color coding to audit log * Change dismiss->resolve, log all outcomes of report as resolve * Update terminology (e-mail blacklist) (#5796) * Update terminology (e-mail blacklist) imho looks better * Update en.yml * Fix code style issues * i18n-tasks normalize
2017-11-16Merge remote-tracking branch 'origin/master' into gs-masterDavid Yip
2017-11-17Fix some rubocop style issues (#5730)Eugen Rochko
2017-11-16Merge tootsuite/master at 30237259367a0ef2b20908518b86bbeb358999b5Surinna Curtis
2017-11-11Add moderator role and add pundit policies for admin actions (#5635)Eugen Rochko
* Add moderator role and add pundit policies for admin actions * Add rake task for turning user into mod and revoking it again * Fix handling of unauthorized exception * Deliver new report e-mails to staff, not just admins * Add promote/demote to admin UI, hide some actions conditionally * Fix unused i18n
2017-11-07 Show the local couterpart of emoji when it exists in /admin/custom_emojis ↵nullkal
(#5467) * Show the local couterpart of emoji when it exists in admin/custom_emojis * Fix indentation * Fix error * Add class table-action-link to Overwrite link * Make it enable to overwrite emojis * Make Code Climate happy
2017-10-27Merge branch 'master' into gs-masterDavid Yip
2017-10-27Allow ActivityPub Note's tag and attachment to be single objects (#5534)puckipedia
2017-10-21Set up /settings/keyword_mutes. #164.David Yip
This should eventually be accessible via the API and the web frontend, but I find it easier to set up an editing interface using Rails templates and the like. We can always take it out if it turns out we don't need it.
2017-10-17Swedish translation (#5406)Håkan Eriksson
* Swedish file added * Swedish file added * Swedish file updated * Swedish languagefile added * Add Swedish translation * Add Swedish translation * Started the Swedish translation * Added Swedish lang settings * Updating Swedish language * Updating Swedish language * Updating Swedish language * Updating Swedish language * Updating Swedish language * Updating Swedish language * Swedish language completed and added * Swedish language Simple_form added * Swedish language Divise added * Swedish language doorkeeper added * Swedish language - now all file complete
generated by cgit-pink (git 2.37.1) at 2024-11-18 15:30:53 +0000