about summary refs log tree commit diff
path: root/app
AgeCommit message (Collapse)Author
2019-06-03Handle blank poll options more gracefully (#10946)ThibG
Pleroma currently allows (erroneously imho) empty poll options, that is, options with an empty (but existing) `name`.
2019-06-03Merge remote-tracking branch 'upstream/master' into glitch-soc/merge-upstreamThibaut Girka
Conflicts: - Gemfile.lock - config/webpack/rules/css.js - package.json - yarn.lock
2019-06-02Fix profile picture preview (#10931)Jeong Arm
2019-06-02Added env variables for max image and video size.Lady Lumb
I changed the IMAGE_LIMIT and VIDEO_LIMIT variables to read from the env, or use default if not set in the env, to make it easier to change this on an instance by instance basis and make it persistent across updates.
2019-06-02Fix expanding status from menu modal in glitch-socThibaut Girka
Fixes #1085
2019-06-02Improvement variable height in single column layout (#10917)Takeshi Umeda
* Improvement variable height of compose and navigation panel in single column layout * Fix wrong quotes and missing commas
2019-06-01Merge branch 'glitch' into productionReverite
2019-06-01Center 2-columns layout without side effect (#10915)Hanage999
2019-05-30Merge branch 'master' into glitch-soc/merge-upstreamThibaut Girka
2019-05-30Raise exception when attempting to serialize local-only statusesThibaut Girka
2019-05-30Fix incorrect PropType in Glitch AutosuggestInputslice
2019-05-30Remove isRequired from Glitch ReplyIndicator statusslice
This can be null under normal circumstances, which isRequired doesn't like.
2019-05-29Change links in right panel to open in the same tab (#10848)Eugen Rochko
For Rambox compatibility
2019-05-29Fix React warning about legacy lifecycle calls and sensitive status ↵ThibG
resetting (#10872)
2019-05-29Fix safari post field display issue in single column layout (#10883)Takeshi Umeda
2019-05-29i18n: Update Corsican front-end translation (#10884)Alix Rossi
2019-05-29Update Japanese translations. (#10875)mayaeh
run yarn manage:translations ja && i18n-tasks add-missing ja
2019-05-29I18n: Update Czech translation (#10874)Aditoo17
2019-05-28Truncate long URLs while providing alt text for inline imagesThibaut Girka
2019-05-28Translate incoming remote img tags by a linkThibaut Girka
2019-05-28[Glitch] Use `<use />` to render transparent SVG logo instead of inserting itEugen Rochko
Port SCSS changes from 8d5dcc9301c422f131167574da550f8cdaedb73f to glitch-soc Signed-off-by: Thibaut Girka <thib@sitedethib.com>
2019-05-28Merge branch 'master' into glitch-soc/merge-upstreamThibaut Girka
2019-05-28Fix web push notifications for polls (#10864)ThibG
Fixes #10861
2019-05-27Refactor footers in web UI into a single component (#10846)Eugen Rochko
2019-05-27Display notifications count on a new single column (#10859)abcang
2019-05-27Fix video player regressions introduced by blurhash mergeThibaut Girka
2019-05-27[Glitch] Add keyboard shortcut to hide/show mediaThibaut Girka
Port a472190729782f31731674c626c07af483fe9c7f and 988342a56cb58da9ac660eec3e55c3bcbbd6269b to glitch-soc
2019-05-27Use `<use />` to render transparent SVG logo instead of inserting it (#10845)Eugen Rochko
2019-05-26Fix poll visibility on public pages (#10817)Takeshi Umeda
* Fix poll visibility on public pages * Revert "Fix poll visibility on public pages" This reverts commit 54a9608add6f855bc6337fe3c65eaee7ba13db49. * Revert "Change poll options to alphabetic letters when status text is hidden" This reverts commit c53d67326201b2061990b1874a3547c3647f50d2.
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-24Merge branch 'glitch' into productionReverite
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 branch 'glitch' into productionReverite
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`.
generated by cgit-pink (git 2.37.1) at 2024-12-26 01:14:24 +0000