about summary refs log tree commit diff
path: root/app
AgeCommit message (Collapse)Author
2019-05-26Merge branch 'master' into glitch-soc/merge-upstreamThibaut Girka
Conflicts: - app/controllers/settings/preferences_controller.rb - app/lib/user_settings_decorator.rb - app/models/user.rb Conflicts due to the addition of a new preference upstream, “advanced layout”.
2019-05-26[Glitch] Fix composer route opening when not neededりんすき
Port c1e77b56a92fc075f000af9c263c72ba6bdbe5f7 to glitch-soc Signed-off-by: Thibaut Girka <thib@sitedethib.com>
2019-05-26Create new click handler for status__expand area in status (#10837)Neil Moore
This click handler only activates on left-click, resolving #10798. This matches behavior in status_content.js, as added in #536
2019-05-26Fix null error in status component when determining showMedia state (#10838)Eugen Rochko
* Fix null error in status component when determining showMedia state Also update the showMedia value if the status passed to the component changes * Refactor media visibility computation into a defaultMediaVisibility function * Fix default media visibility with reblogs
2019-05-26Fix wrong redirect from getting started to home in advanced Web UI (#10839)Hanage999
* update Ruby to 2.5.3 * Link to Getting Started will not redirect to Home in multi-column UI (https://github.com/tootsuite/mastodon/pull/10835)
2019-05-26Improvements to the single column layout (#10835)Eugen Rochko
* Improvements to the single column layout - Add follows and followers link to the right panel - Increase margins around separators in right panel - Add follow requests link with counter when account is locked to right panel * Redirect from getting started to home when navigation panel is visible
2019-05-25Add a keyboard shortcut to hide/show media (#10647)ThibG
* Move control of media visibility to parent component * Add keyboard shortcut to toggle media visibility
2019-05-25Avoid cutting bottom of letters of last paragraph of statuses (#10821)Mélanie Chauvel (ariasuni)
2019-05-25Add responsive panels to the single-column layout (#10820)Eugen Rochko
* Add responsive panels to the single-column layout * Fixes * Fix not being able to save the preference * Fix code style issues * Set max-height on the compose textarea and add a link to relationship manager
2019-05-24Use Sec-WebSocket-Protocol instead of query string to pass WebSocket tokenThibaut Girka
Inspired by https://github.com/kubevirt/kubevirt/issues/1242
2019-05-24Merge branch 'master' into glitch-soc/merge-upstreamThibaut Girka
Conflicts: - streaming/index.js
2019-05-24Improve streaming server security (#10818)ThibG
* Check OAuth token scopes in the streaming API * Use Sec-WebSocket-Protocol instead of query string to pass WebSocket token Inspired by https://github.com/kubevirt/kubevirt/issues/1242
2019-05-23Merge pull request #1067 from ThibG/glitch-soc/merge-upstreamThibG
Merge upstream changes
2019-05-23Do not share a single Redcarpet::Markdown object across threadsThibaut Girka
There are apparently thread-safety issues: https://github.com/vmg/redcarpet/pull/672
2019-05-23Merge branch 'master' into glitch-soc/merge-upstreamThibaut Girka
2019-05-23Various improvements to single column layout (#10809)Eugen Rochko
- Add potential side panels to single column layout - Hide FAB on large screens
2019-05-23Fix possible race condition when processing statuses (#10815)ThibG
2019-05-23[Glitch] Fix stacking order of emoji pickernzws
Port 8a378d4c3d8bd74f3070af0b70725da4a6d10375 to glitch-soc Signed-off-by: Thibaut Girka <thib@sitedethib.com>
2019-05-23Merge branch 'master' into glitch-soc/merge-upstreamThibaut Girka
Conflicts: - app/models/account.rb - app/views/settings/profiles/show.html.haml - spec/controllers/api/v1/accounts/credentials_controller_spec.rb Conflicts were due to an increase in account bio length upstream, which is already covered in glitch-soc through `MAX_BIO_CHARS`.
2019-05-23Move signature verification stoplight to the requests themselves (#10813)ThibG
* Move signature verification stoplight to the requests themselves This avoids blocking messages from known keys for 5 minutes when only one fails… * Put the stoplight on the actual client IP, not a potential reverse proxy
2019-05-23Retry ActivityPub inbox delivery on HTTP 401 and 408 errors (#10812)ThibG
HTTP 401 responses returned by Mastodon's inbox controller may be temporary if, for instance, the requesting user's actor/key json could not be retrieved in a timely fashion. This changes allow retries instead of dropping the message entirely. Also added HTTP 408 as that error is by nature temporary.
2019-05-23Make headers font size proportionalThibaut Girka
2019-05-23Allow rel=tag in status textThibaut Girka
Fixes tag links in local Markdown or HTML-authored statuses
2019-05-23Add `forceSingleColumn` prop to `<UI />` (#10807)Eugen Rochko
* Move TabsBar rendering logic from CSS to the ColumnsArea component * Add forceSingleColumn mode * Add unread notifications counter to tabs bar * Add toggle to control `forceSingleColumn` * Increase paddings in mobile layout responsively at large sizes
2019-05-22Fix stacking order of emoji picker (#10801)nzws
2019-05-22i18n: Complete frontend Bengali translation (#10800)dxwc
* i18n: Complete frontend Bengali translation * run yarn manage:translations
2019-05-21Fix local text/html toots not being sanitizedThibaut Girka
2019-05-21Add `account_id` param to `GET /api/v1/notifications` (#10796)Paul Woolcock
* Add `from_account` to notifications API this adds the ability to filter notifications by the account they originated from * passing a non-existent user should cause none to be returned * Fix codeclimate warnings * fix more codeclimate warnings * make requested changes: * use account id instead of user@domain * name the param `account_id` instead of `from_account` * Don't use `return` in a lambda
2019-05-20Refactor contentType selection in glitch composerThibaut Girka
2019-05-19Use glitch-soc's poll component instead of upstream'sThibaut Girka
2019-05-19Change bio limit from 160 to 500 (#10790)trwnh
* Change note_length validator from 160 to 500 * Change input maxlength from 160 to 500 * update bio test from 160 to 500 * Multiply a string 30 times instead of 10
2019-05-19Merge branch 'master' into glitch-soc/merge-upstreamThibaut Girka
2019-05-19Fix “invited by” not showing up for invited accounts in admin interface ↵ThibG
(#10791)
2019-05-19fix `isSubmitting` prop case (#10785)Hinaloe
2019-05-19Merge branch 'master' into glitch-soc/merge-upstreamThibaut Girka
2019-05-18add og:image:alt for media attachments in embeds (#10779)Ben Lubar
2019-05-18Change poll options to alphabetic letters when status text is hidden (#10685)Eugen Rochko
Fix #10569
2019-05-18Merge branch 'master' into glitch-soc/merge-upstreamThibaut Girka
2019-05-18Prevent from publicly boosting one's own private toots (#10775)ThibG
2019-05-17Minor optimizationThibaut Girka
2019-05-17Export fallback content type and use it as default in WebUIThibaut Girka
2019-05-17Properly escape HTML in code blocksThibaut Girka
2019-05-17Add option for default toot content-typeThibaut Girka
2019-05-17Fix autolinking, and newlines in code blocksThibaut Girka
Autolinking is now performed *after* the Markdown pass, by replacing HTML tags with zero-width spaces and running the twitter-text extractor as usual, except it does not auto-link URLs to avoid links in links…
2019-05-17Hide content-type dropdown by defaultThibaut Girka
2019-05-17Content-Type Dropdown: use the selected option icon for the menuHaelwenn (lanodan) Monnier
Signed-off-by: Thibaut Girka <thib@sitedethib.com>
2019-05-17Support proper content-type in Delete & RedraftThibaut Girka
2019-05-17Add status content type dropdown to compose box.KokaKiwi
Signed-off-by: Thibaut Girka <thib@sitedethib.com>
2019-05-17Add API support for setting status content-typeThibaut Girka
2019-05-17Serialize content-type on Delete & RedraftThibaut Girka
generated by cgit-pink (git 2.37.1) at 2024-12-03 21:29:08 +0000