about summary refs log tree commit diff
AgeCommit message (Collapse)Author
2020-05-03Merge pull request #1324 from ThibG/glitch-soc/merge-upstreamThibG
Merge upstream changes
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-05-03Revert "improve status title (#8596)" (#13591)Yamagishi Kazutoshi
This reverts commit 05756c9a14864655ae6777505a4ee5cfa9b0ee93.
2020-05-03Add more tests for ActivityPub controllers (#13585)Eugen Rochko
2020-05-01Fix the circleci packages for Buster. (#13583)Shlee
* Update config.yml * Update config.yml * Update config.yml * Update config.yml * Update config.yml * Update config.yml * Update config.yml * Update .circleci/config.yml Co-authored-by: Sandro <sandro.jaeckel@gmail.com> * Update config.yml Co-authored-by: Sandro <sandro.jaeckel@gmail.com> Co-authored-by: Eugen Rochko <eugen@zeonfederated.com>
2020-05-01Change CircleCI test output (#13587)Eugen Rochko
2020-04-30Only check locally when deduplicating usernames (#13581)kaiyou
When deduplicating account usernames for OAuthable users, the routine did check if any account was known with that username, including remote accounts. This caused some unnecessary deduplication, and usernames ending with unexpected trailing _1. This fixes #13580
2020-04-28Fix admin-facing uses of inline CSS (#13575)ThibG
* Move .back-button inline styles to CSS file All occurrences of the back-button CSS class used the same inline CSS rules, so moved them over to the CSS file * Fix “Add new domain block” button using inline CSS * Replace common pattern of inline-styled button boxes by a CSS class In particular, switching from `float: left/right` to a flexbox with `justify-content: space-between`. This implied changing the order of a few HTML tags and adding an empty `div` in one case. Also removed a `margin-bottom` rule that wasn't needed due to the margins of surrounding elements. * Move account admin view inline CSS to CSS file
2020-04-29Bump parslet from 1.8.2 to 2.0.0 (#13564)dependabot-preview[bot]
Bumps [parslet](https://github.com/kschiess/parslet) from 1.8.2 to 2.0.0. - [Release notes](https://github.com/kschiess/parslet/releases) - [Changelog](https://github.com/kschiess/parslet/blob/master/HISTORY.txt) - [Commits](https://github.com/kschiess/parslet/commits) Signed-off-by: dependabot-preview[bot] <support@dependabot.com> Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>
2020-04-29Bump json-ld from 3.1.2 to 3.1.3 (#13566)dependabot-preview[bot]
Bumps [json-ld](https://github.com/ruby-rdf/json-ld) from 3.1.2 to 3.1.3. - [Release notes](https://github.com/ruby-rdf/json-ld/releases) - [Commits](https://github.com/ruby-rdf/json-ld/compare/3.1.2...3.1.3) Signed-off-by: dependabot-preview[bot] <support@dependabot.com> Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>
2020-04-29Bump ruby-saml from 1.9.0 to 1.11.0 (#13559)dependabot-preview[bot]
Bumps [ruby-saml](https://github.com/onelogin/ruby-saml) from 1.9.0 to 1.11.0. - [Release notes](https://github.com/onelogin/ruby-saml/releases) - [Changelog](https://github.com/onelogin/ruby-saml/blob/master/changelog.md) - [Commits](https://github.com/onelogin/ruby-saml/compare/v1.9.0...v1.11.0) Signed-off-by: dependabot-preview[bot] <support@dependabot.com> Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>
2020-04-29Bump mime-types-data from 3.2019.1009 to 3.2020.0425 (#13554)dependabot-preview[bot]
Bumps [mime-types-data](https://github.com/mime-types/mime-types-data) from 3.2019.1009 to 3.2020.0425. - [Release notes](https://github.com/mime-types/mime-types-data/releases) - [Changelog](https://github.com/mime-types/mime-types-data/blob/master/History.md) - [Commits](https://github.com/mime-types/mime-types-data/compare/v3.2019.1009...v3.2020.0425) Signed-off-by: dependabot-preview[bot] <support@dependabot.com> Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>
2020-04-29Bump http-form_data from 2.2.0 to 2.3.0 (#13560)dependabot-preview[bot]
Bumps [http-form_data](https://github.com/httprb/form_data.rb) from 2.2.0 to 2.3.0. - [Release notes](https://github.com/httprb/form_data.rb/releases) - [Changelog](https://github.com/httprb/form_data/blob/master/CHANGES.md) - [Commits](https://github.com/httprb/form_data.rb/compare/v2.2.0...v2.3.0) Signed-off-by: dependabot-preview[bot] <support@dependabot.com> Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>
2020-04-29Bump aws-sdk-s3 from 1.61.2 to 1.63.0 (#13562)dependabot-preview[bot]
Bumps [aws-sdk-s3](https://github.com/aws/aws-sdk-ruby) from 1.61.2 to 1.63.0. - [Release notes](https://github.com/aws/aws-sdk-ruby/releases) - [Changelog](https://github.com/aws/aws-sdk-ruby/blob/master/gems/aws-sdk-s3/CHANGELOG.md) - [Commits](https://github.com/aws/aws-sdk-ruby/commits/v1.63.0) Signed-off-by: dependabot-preview[bot] <support@dependabot.com> Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>
2020-04-29Bump aws-partitions from 1.296.0 to 1.303.0 (#13552)dependabot-preview[bot]
Bumps [aws-partitions](https://github.com/aws/aws-sdk-ruby) from 1.296.0 to 1.303.0. - [Release notes](https://github.com/aws/aws-sdk-ruby/releases) - [Changelog](https://github.com/aws/aws-sdk-ruby/blob/master/gems/aws-partitions/CHANGELOG.md) - [Commits](https://github.com/aws/aws-sdk-ruby/commits) Signed-off-by: dependabot-preview[bot] <support@dependabot.com> Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>
2020-04-28Fix page incorrectly scrolling when bringing up dropdown menus (#13574)ThibG
Fixes #13573 For some reason (I suspect this may be related to focusing the item before it got drown by the browser), Firefox scrolls to top when bringing up dropdown menus with pre-selected items. This commit uses the “preventScroll” option as, due to the placement behavior, the menu should be visible anyway and not trigger scrolling.
2020-04-28Bump normalize-package-data from 2.4.0 to 2.5.0 (#13561)dependabot-preview[bot]
Bumps [normalize-package-data](https://github.com/npm/normalize-package-data) from 2.4.0 to 2.5.0. - [Release notes](https://github.com/npm/normalize-package-data/releases) - [Commits](https://github.com/npm/normalize-package-data/compare/v2.4.0...v2.5.0) Signed-off-by: dependabot-preview[bot] <support@dependabot.com> Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>
2020-04-28Bump flatted from 2.0.0 to 2.0.2 (#13558)dependabot-preview[bot]
Bumps [flatted](https://github.com/WebReflection/flatted) from 2.0.0 to 2.0.2. - [Release notes](https://github.com/WebReflection/flatted/releases) - [Commits](https://github.com/WebReflection/flatted/compare/v2.0.0...v2.0.2) Signed-off-by: dependabot-preview[bot] <support@dependabot.com> Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>
2020-04-28Bump nearley from 2.16.0 to 2.19.2 (#13556)dependabot-preview[bot]
Bumps [nearley](https://github.com/hardmath123/nearley) from 2.16.0 to 2.19.2. - [Release notes](https://github.com/hardmath123/nearley/releases) - [Commits](https://github.com/hardmath123/nearley/commits) Signed-off-by: dependabot-preview[bot] <support@dependabot.com> Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>
2020-04-28Bump core-js-pure from 3.6.4 to 3.6.5 (#13553)dependabot-preview[bot]
Bumps [core-js-pure](https://github.com/zloirock/core-js) from 3.6.4 to 3.6.5. - [Release notes](https://github.com/zloirock/core-js/releases) - [Changelog](https://github.com/zloirock/core-js/blob/master/CHANGELOG.md) - [Commits](https://github.com/zloirock/core-js/compare/v3.6.4...v3.6.5) Signed-off-by: dependabot-preview[bot] <support@dependabot.com> Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>
2020-04-28Bump request from 2.88.0 to 2.88.2 (#13565)dependabot-preview[bot]
Bumps [request](https://github.com/request/request) from 2.88.0 to 2.88.2. - [Release notes](https://github.com/request/request/releases) - [Changelog](https://github.com/request/request/blob/master/CHANGELOG.md) - [Commits](https://github.com/request/request/commits) Signed-off-by: dependabot-preview[bot] <support@dependabot.com> Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>
2020-04-28Bump cacache from 12.0.3 to 12.0.4 (#13567)dependabot-preview[bot]
Bumps [cacache](https://github.com/npm/cacache) from 12.0.3 to 12.0.4. - [Release notes](https://github.com/npm/cacache/releases) - [Changelog](https://github.com/npm/cacache/blob/v12.0.4/CHANGELOG.md) - [Commits](https://github.com/npm/cacache/compare/v12.0.3...v12.0.4) Signed-off-by: dependabot-preview[bot] <support@dependabot.com> Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>
2020-04-28Bump functions-have-names from 1.2.0 to 1.2.1 (#13568)dependabot-preview[bot]
Bumps [functions-have-names](https://github.com/ljharb/functions-have-names) from 1.2.0 to 1.2.1. - [Release notes](https://github.com/ljharb/functions-have-names/releases) - [Changelog](https://github.com/inspect-js/functions-have-names/blob/master/CHANGELOG.md) - [Commits](https://github.com/ljharb/functions-have-names/compare/v1.2.0...v1.2.1) Signed-off-by: dependabot-preview[bot] <support@dependabot.com> Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>
2020-04-28Bump loglevel from 1.6.6 to 1.6.8 (#13569)dependabot-preview[bot]
Bumps [loglevel](https://github.com/pimterry/loglevel) from 1.6.6 to 1.6.8. - [Release notes](https://github.com/pimterry/loglevel/releases) - [Commits](https://github.com/pimterry/loglevel/compare/v1.6.6...v1.6.8) Signed-off-by: dependabot-preview[bot] <support@dependabot.com> Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>
2020-04-28Bump svgo from 1.1.1 to 1.3.2 (#13570)dependabot-preview[bot]
Bumps [svgo](https://github.com/svg/svgo) from 1.1.1 to 1.3.2. - [Release notes](https://github.com/svg/svgo/releases) - [Changelog](https://github.com/svg/svgo/blob/master/CHANGELOG.md) - [Commits](https://github.com/svg/svgo/compare/v1.1.1...v1.3.2) Signed-off-by: dependabot-preview[bot] <support@dependabot.com> Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>
2020-04-28Fix end-user-facing uses of inline CSS (#13438)ThibG
* Move some inline styles to CSS files * Move default_account_display_name span to fix useless tags with duplicate id * Change handling of public pages spoiler text from inline CSS to dataset attribute * Use the `dir` HTML attribute instead of inline CSS * Move status action bar inline CSS to CSS file * Hide logo resources from CSS file, not inline CSS Fixes #11601 * Move translation prompt styling from inline CSS to CSS file * Move “invited by” styling on registration form from inline to CSS file * Use the progress tag to display poll results in JS fallback * Fix poll results JS-less fallback when the user has voted for an option * Change account public page “moved” notice to use img tags instead of inline CSS * Move OTP hint inline CSS to SCSS file * Hide JS-less fallback vote progressbars from accessibility tools Co-authored-by: Eugen Rochko <eugen@zeonfederated.com>
2020-04-28Refactor/cleanup TIMELINE_DELETE-related code (#13175)ThibG
2020-04-28Fix messed up z-index when NoScript blocks media/previews (#13449)ThibG
Fixes #13444
2020-04-28Fix /public showing public instead of community timeline for logged-in users ↵ThibG
(#13499)
2020-04-28Add `invites_enabled` to API (#13501)ThibG
2020-04-27Add `tootctl emoji export` (#13534)Lerk
* add emoji export command to cli * fix codeclimate issues * add error when no matching category was found * add other suggestions * exit 1 when no matching category is found * changes according to suggestions * 👀 * RubyNein Y u always autoformat :c
2020-04-27Bump oj from 3.10.5 to 3.10.6 (#13557)dependabot-preview[bot]
Bumps [oj](https://github.com/ohler55/oj) from 3.10.5 to 3.10.6. - [Release notes](https://github.com/ohler55/oj/releases) - [Changelog](https://github.com/ohler55/oj/blob/develop/CHANGELOG.md) - [Commits](https://github.com/ohler55/oj/compare/v3.10.5...v3.10.6) Signed-off-by: dependabot-preview[bot] <support@dependabot.com> Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>
2020-04-27Add JS IDE helper (#13012)Даниил Пронин
* add IDE helper for Webpack * fix ESLint error in IDE helper * fix IDE helper code style
2020-04-27Fix naming issue (#13551)mayaeh
2020-04-26Add separate cache directory for non-local uploads (#12821)Eugen Rochko
2020-04-25Fix not being able to resolve public resources in development environment ↵Eugen Rochko
(#13505)
2020-04-25Merge pull request #1321 from ThibG/glitch-soc/merge-upstreamThibG
Merge upstream changes
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-25Merge branch 'master' into glitch-soc/merge-upstreamThibaut Girka
2020-04-25Fix uninformative error message when uploading unsupported image files (#13540)ThibG
Attempting to upload image files that the browser is unable to load results in “Oops! An unexpected error occurred.” This commit changes the error handling so that an unprocessable image results in the file being sent anyway, which might cover a few corner cases, and provide a slightly better error message.
2020-04-25Fix expanded video player issues (#13541)ThibG
Fixes #13536 - Expanding a paused video doesn't autoplay anymore - Default volume level for the expanded video inherited from the original video Position/playing state/volume are carried over from the original video player to the modal, but they're not reported back to the modal as it would require deeper changes.
2020-04-23Fix enable/disable relay failures (#13535)Takeshi Umeda
generated by cgit-pink (git 2.37.1) at 2024-11-24 01:31:48 +0000