about summary refs log tree commit diff
path: root/app/javascript/flavours
AgeCommit message (Collapse)Author
2020-05-10Merge branch 'glitch'Starfall
2020-05-03[Glitch] Fix admin-facing uses of inline CSSThibG
Port b8ba977497a53740e66d8db9938382b724283b3a to glitch-soc Signed-off-by: Thibaut Girka <thib@sitedethib.com>
2020-05-03[Glitch] Fix page incorrectly scrolling when bringing up dropdown menusThibG
Port 77ec0875ea998072f4bb709bfb9b15e80669eeef to glitch-soc Signed-off-by: Thibaut Girka <thib@sitedethib.com>
2020-05-03[Glitch] Fix end-user-facing uses of inline CSSThibG
Port 0e362b7678e75cb71ce207fd45dd4dc0d955fdca to glitch-soc Signed-off-by: Thibaut Girka <thib@sitedethib.com>
2020-05-03[Glitch] Refactor/cleanup TIMELINE_DELETE-related codeThibG
Port ad9c7aefe6618a70c69991b7daf100573a7e27b9 to glitch-soc Signed-off-by: Thibaut Girka <thib@sitedethib.com>
2020-05-03[Glitch] Fix messed up z-index when NoScript blocks media/previewsThibG
Port 04eb59986461bc802d4432fe4131e09eadd070c0 to glitch-soc Signed-off-by: Thibaut Girka <thib@sitedethib.com>
2020-05-03Merge branch 'master' into glitch-soc/merge-upstreamThibaut Girka
Conflicts: - `app/controllers/statuses_controller.rb`: Upstream disabled the embed controller for reblogs. Not a real conflict, but glitch-soc has an extra line to deal with its theming system. Ported upstream changes. - `app/javascript/packs/public.js`: Upstream made changes to get rid of most inline CSS, this changes javascript for public pages, which in glitch are split between different files. Ported those changes. - `app/models/status.rb`: Upstream changed the block check in `Status#permitted_for` to include domain-block checks. Not a real conflict with glitch-soc, but our scope is slightly different, as our scope for unauthenticated access do not include instance-local toots. Ported upstream changes. - `app/serializers/rest/instance_serializer.rb`: Not a real conflict, upstream added a new field to the instance serializer, the conflict is one line above since we added more of that. Ported upstream changes. - `app/views/settings/profiles/show.html.haml`: Upstream got rid of most inline CSS and moved hidden elements to data attributes in the process, in fields were we have different values. Ported upstream changes while keeping our glitch-specific values. - `app/views/statuses/_simple_status.html.haml`: Upstream got rid of inline CSS on an HAML line we treat differently, stripping empty text nodes. Ported upstream changes to the style attribute, keeping the empty text node stripping behavior.
2020-04-25[Glitch] Fix uninformative error message when uploading unsupported image filesThibG
Port be637146f310d7ec3a49d01e850959514e9e4964 to glitch-soc Signed-off-by: Thibaut Girka <thib@sitedethib.com>
2020-04-25[Glitch] Fix expanded video player issuesThibG
Port c955f98d36868e85b0f1939a3a1c58c00babd4e8 to glitch-soc Signed-off-by: Thibaut Girka <thib@sitedethib.com>
2020-04-25[Glitch] Set max-width and max-height to gif videoIrie Aoi
Port c5c8f680317a182c4794505007ef227a4294a18e to glitch-soc Signed-off-by: Thibaut Girka <thib@sitedethib.com>
2020-04-25[Glitch] Fix and refactor keyboard navigation in dropdown menusThibG
Port 80182eda622e1317bffb6729259b8a81d84251a2 to glitch-soc Signed-off-by: Thibaut Girka <thib@sitedethib.com>
2020-04-20[Glitch] Update Twemoji to 12.1.5D Anzorge
Port emoji_map.json changes from 29f5353f8b7af331d6dddea4ee1888913361a545 to glitch-soc Signed-off-by: Thibaut Girka <thib@sitedethib.com>
2020-04-20[Glitch] Add local only to hashtag timelineTakeshi Umeda
Port front-end changes from 2c7128c7f0ee3073acb9897cda88255982368193 to glitch-soc Signed-off-by: Thibaut Girka <thib@sitedethib.com>
2020-04-18[Glitch] Fix uploaded image orientation in some browsersThibG
Port a1ce9cbb67facf705379355b9c8ec19c521b419c to glitch-soc Signed-off-by: Thibaut Girka <thib@sitedethib.com>
2020-04-17[Glitch] Fix not being able to voteThibG
Port e12a5635da7de5a1c3b08b2ce420ee8a56ae4aff to glitch-soc Signed-off-by: Thibaut Girka <thib@sitedethib.com>
2020-04-17[Glitch] Fix Poll fetchPoll action not being debounced.Gurgen Hayrapetyan
Port ab8d7c0680d7f75826277be4c8eea1ebd396be8a to glitch-soc Signed-off-by: Thibaut Girka <thib@sitedethib.com>
2020-04-12[Glitch] Fix WebUI pagination of following, followers, follow requests, ↵ThibG
blocks and mutes lists Port ec31b1b75244c030bb4fb0ccabac7ff8b626db92 to glitch-soc Signed-off-by: Thibaut Girka <thib@sitedethib.com>
2020-04-11Merge branch 'glitch'Starfall
2020-04-11Revert "Revert "Merge branch 'glitch'""Starfall
This reverts commit 12d35783db1bb302d7540d8d3690ab6eed3dac3b.
2020-04-10Clean up some dead codeThibaut Girka
2020-04-09Fix deprecated use of createBrowserHistoryThibaut Girka
2020-04-05Merge branch 'master' into glitch-soc/merge-upstreamThibaut Girka
Conflicts: - `app/javascript/packs/public.js`: Upstream modified code that we split between multiple files due to glitch-soc's theming system. Ported those changes.
2020-04-04[Glitch] Add explanation as to why unlocked accounts may have follow requestsThibG
Port d3ff06a3205130fa10ffc5d736e8206a9725b5df to glitch-soc Signed-off-by: Thibaut Girka <thib@sitedethib.com>
2020-04-04[Glitch] Add ability to filter audit log in admin UIEugen Rochko
Port f65568f1d400be2e101bd8b533a1b53807f5c757 to glitch-soc Signed-off-by: Thibaut Girka <thib@sitedethib.com>
2020-04-02[Glitch] Improve polls: option lengths & redesignSasha Sorokin
Port 37b3985bfac5ffdc8e452f92869dcdefb5c92594 to glitch-soc Signed-off-by: Thibaut Girka <thib@sitedethib.com>
2020-04-02[Glitch] Improve toot clicking areasMélanie Chauvel (ariasuni)
Port part of 1fb92037e432913902a5e5c8a5b673b036d84cb8 to glitch-soc Signed-off-by: Thibaut Girka <thib@sitedethib.com>
2020-04-02[Glitch] Fix content warning being unnecessarily cleared when ↵ThibG
enabling/disabling CW Port cf1fa73347c9ca2b1c4f14521e990feba7509e2e to glitch-soc Signed-off-by: Thibaut Girka <thib@sitedethib.com>
2020-04-02[Glitch] Fix wrong color for ellipsis in boost confirmation dialog in Web UIMélanie Chauvel (ariasuni)
Port be2f1597cf6b010a7ea0ffdc45550f87a7ae9dad to glitch-soc Signed-off-by: Thibaut Girka <thib@sitedethib.com>
2020-04-02[Glitch] Fix 404 and 410 API errors being silently discarded in WebUIThibG
Port front-end changes from 0d117c106aa72f78dd5cdd371849dd8ce3120198 to glitch-soc Signed-off-by: Thibaut Girka <thib@sitedethib.com>
2020-03-27[Glitch] Fix frontend crash when deleting announcementsThibG
Port 858d0dd168b737a77506d6aa00f6ed582d0e33c6 to glitch-soc Signed-off-by: Thibaut Girka <thib@sitedethib.com>
2020-03-27[Glitch] Change poll option hover/active styling to be less confusingThibG
Port beb80adb5150e50717852b39db7b534bc0da9534 to glitch-soc Signed-off-by: Thibaut Girka <thib@sitedethib.com>
2020-03-22[Glitch] Fix frontend crash when deleting announcementsDaniel Sockwell
Port 8758221e7344645bc1357578ec1789aa7d46da08 to glitch-soc Signed-off-by: Thibaut Girka <thib@sitedethib.com>
2020-03-22[Glitch] Fix regression in “Edit media” modal in web UIThibG
Port 90f3a0006243250ced6e7e192f81513d6b731b33 to glitch-soc Signed-off-by: Thibaut Girka <thib@sitedethib.com>
2020-03-22[Glitch] Change the string "hidden" to "blocked" in WebUImayaeh
Port 310d729745ad34b1b039f2ec611b9bda5b73f252 to glitch-soc Signed-off-by: Thibaut Girka <thib@sitedethib.com>
2020-03-22[Glitch] Change local media attachments to perform heavy processing ↵Eugen Rochko
asynchronously Port front-end part of 9660aa4543deff41c60d131e081137f84e771499 to glitch-soc [API] This makes use of a new media posting API (/api/v2/media), supporting background processing of uploaded files. For Pleroma's purposes, this could be handled the same as /api/v1/media since afaik Pleroma doesn't do any transcoding. Signed-off-by: Thibaut Girka <thib@sitedethib.com>
2020-03-22Merge branch 'master' into glitch-soc/merge-upstreamThibaut Girka
Conflicts: - `README.md`: Our README.md files are completely different. Discarded upstream changes. - `app/javascript/core/admin.js`: Updating rails-ujs, no real conflict, but a comment to close to changed code. Various glitch-soc-only files have been updated to match those changes, though. - `package.json`: No real conflict, just an additional dependency in glitch-soc that was too close to something updated upstream. Took upstream's changes.
2020-03-14Fix missing media description dialog when sending toots with keyboard shortcutsThibaut Girka
2020-03-14Fix posting privacy on secondary button with missing description ↵Thibaut Girka
confirmation dialog
2020-03-11Fix privacy icon being displayed twice in glitch-soc Web UIThibaut Girka
Fixes #1298
2020-03-08[Glitch] Add support for links to statuses in announcements to be opened in ↵ThibG
web UI Port aa67036b41d37935210c8b5094ac20c153a62011 to glitch-soc Signed-off-by: Thibaut Girka <thib@sitedethib.com>
2020-03-08[Glitch] Change the tooltip "Toggle visibility" to "Hide media" in web UIMélanie Chauvel (ariasuni)
Port 5e4b6496557b5ef167518dbc6015307158e30ccf to glitch-soc Signed-off-by: Thibaut Girka <thib@sitedethib.com>
2020-03-08[Glitch] Code style improvements in JavaScriptBèr Kessels
Port fd76955f3942bbd7ec830ab535bc31621cac14a4 to glitch-soc * JS-linter: fix trailing comma's * Configure eslinter to ignore this onchange error. Signed-off-by: Thibaut Girka <thib@sitedethib.com>
2020-03-08[Glitch] Change description of privacy levels to be more intuitive in web UIMélanie Chauvel (ariasuni)
Port 4063f9f27805de0a12904071e521094122b9f725 to glitch-soc Co-authored-by: Thibaut Girka <thib@sitedethib.com> Signed-off-by: Thibaut Girka <thib@sitedethib.com>
2020-03-08[Glitch] Fix text area above/right of emoji picker being accidentally ↵Mélanie Chauvel (ariasuni)
clickable in web UI Port 2e18b1a2a2976f04f84e92d187b0620223a64fa6 to glitch-soc Signed-off-by: Thibaut Girka <thib@sitedethib.com>
2020-03-08[Glitch] Fix too large announcements not being scrollable in web UIThibG
Port 503eab1c1f101e92f163ed4f8457cac9a6193ffc to glitch-soc Signed-off-by: Thibaut Girka <thib@sitedethib.com>
2020-03-08[Glitch] Change GIF label to be displayed even when autoplay is enabled in ↵koyu
web UI Port e69a3f54a10e58d32d7e46c494d98be948dde4b3 to glitch-soc Signed-off-by: Thibaut Girka <thib@sitedethib.com>
2020-03-08[Glitch] Change the string "Hide everything from …" to "Block domain …" ↵ThibG
in web UI Port 39453de232e068f58a711b2c052fe74fdd0c40b6 to glitch-soc Signed-off-by: Thibaut Girka <thib@sitedethib.com>
2020-03-08[Glitch] Add tooltips to audio/video player buttonsMélanie Chauvel (ariasuni)
Port 036ba3f51065a96cb9203a9ac5aa71d7d6edeebe to glitch-soc Signed-off-by: Thibaut Girka <thib@sitedethib.com>
2020-03-01Revert "Merge branch 'glitch'"Starfall
Login is broken This reverts commit 22a55edc158352003a3953964c9d332a60c86428, reversing changes made to 5902299384d15249fe4b84b8761d4a49f3c7f6fd.
2020-03-01Merge branch 'glitch'Starfall
generated by cgit-pink (git 2.37.1) at 2024-11-18 14:10:16 +0000