about summary refs log tree commit diff
path: root/app
AgeCommit message (Collapse)Author
2019-07-30[Glitch] Fix crash when expanding search results for hashtagsThibG
Port 78144f4c7923d502cc86b322f044e740e4a8fa8a to glitch-soc
2019-07-30Merge branch 'master' into glitch-soc/merge-upstreamThibaut Girka
Conflicts: - app/controllers/directories_controller.rb - package.json - yarn.lock
2019-07-30Change links in webUI to rewrite misleading links (#11426)ThibG
* [WiP] Show host for “misleading” links * Disallow misleading targets which domain names are prefixes of link text * Move decodeIDNA to app/javascript/mastodon/utils * Add support for international domain names * Change link origin tag color to darker text color * Handle links to domains starting with www. as shortened by Mastodon * [WiP] Ignore links that cannot be misread as URLs, rewrite other links
2019-07-30Fix crash when expanding search results for hashtags (#11447)ThibG
2019-07-30Add whitelist mode (#11291)Eugen Rochko
2019-07-29Merge pull request #1179 from ThibG/glitch-soc/merge-upstreamThibG
Merge upstream changes
2019-07-29Fix tag normalization and migration not removing duplicate tags (#11441)Eugen Rochko
Fix #11428
2019-07-29Fix emoji autosuggestions (#11442)Eugen Rochko
Regression from cfb2ed78231758a79af038a964ab7f7b7b35274e
2019-07-29Fix crash in /web/listsThibaut Girka
Fixes #1181
2019-07-28Revert "Remove conversation URI (#11423)" (#11424)Eugen Rochko
This reverts commit 75f7f9930eb2a6f5c4041ec44fe0aa795c9ec449.
2019-07-28Remove conversation URI (#11423)Eugen Rochko
It is not part of ActivityPub and will free up a lot of space
2019-07-28[Glitch] Add search results pagination to web UI (#11409)Eugen Rochko
Port 8a4674f2c3d89c998eb5438b96b7977dc2be3167 to glitch-soc Signed-off-by: Thibaut Girka <thib@sitedethib.com>
2019-07-28[Glitch] Change contrast of status links that are not mentions nor hashtagsThibG
Port 10e78ecf57242cc5030b903131bf27e027bb4a97 to glitch-soc Signed-off-by: Thibaut Girka <thib@sitedethib.com>
2019-07-28[Glitch] Change account domain block to clear out notifications and followsEugen Rochko
Port 4eeff26533b75b592395e353c6d4506db9958bcf to glitch-soc Signed-off-by: Thibaut Girka <thib@sitedethib.com>
2019-07-28Merge branch 'master' into glitch-soc/merge-upstreamThibaut Girka
2019-07-28Add autosuggestions for hashtags (#11422)Eugen Rochko
2019-07-28Bump json-ld-preloaded from 3.0.2 to 3.0.3 (#11316)dependabot-preview[bot]
* Bump json-ld-preloaded from 3.0.2 to 3.0.3 Bumps [json-ld-preloaded](https://github.com/ruby-rdf/json-ld-preloaded) from 3.0.2 to 3.0.3. - [Release notes](https://github.com/ruby-rdf/json-ld-preloaded/releases) - [Commits](https://github.com/ruby-rdf/json-ld-preloaded/compare/3.0.2...3.0.3) Signed-off-by: dependabot-preview[bot] <support@dependabot.com> * use json-ld edge
2019-07-28Add `tootctl preview_cards remove` (#11320)mayaeh
* Add `tootctl preview_cards remove` * fix code style * Remove `Scheduler::PreviewCardsCleanupScheduler` file * fix code style again Add exclude case where image_file_name is blank * Added a function to output confirmation if the specified number of days is less than 2 weeks
2019-07-28Fix animate on hover in poll options without CW (#11404)ThibG
2019-07-28Prevent archiving when user set "noindex" (#11421)Jeong Arm
2019-07-28Change contrast of status links that are not mentions nor hashtags (#11406)ThibG
2019-07-28Change hashtags to preserve first-used casing (#11416)Eugen Rochko
2019-07-27Fix tabs bar scrolling along with content on mobile (#11418)Eugen Rochko
2019-07-27Add search results pagination to web UI (#11409)Eugen Rochko
* Add search results pagination to web UI Fix #10737 * Fix code style issue
2019-07-27Add search syntax for operators and phrases (#11411)Eugen Rochko
2019-07-27Remove timestamps from converted images to make them deterministic (#11408)Eugen Rochko
2019-07-26Fix invites not being disabled upon account suspension (#11412)ThibG
* Disable invite links from disabled/suspended users * Add has_many invites relationship to users * Destroy unused invites when suspending an account
2019-07-25Change account domain block to clear out notifications and follows (#11393)Eugen Rochko
2019-07-24Fix links in status media having their title rewrittenThibaut Girka
2019-07-24Merge branch 'master' into glitch-soc/merge-upstreamThibaut Girka
2019-07-24 Don't delete periods when validating username uniqueness (#11392) (#11400)Rey Tucker
* Check to make sure usernames with '.' cannot be created * Add test for instance actor account name conflicts This makes sure that migration 20190715164535_add_instance_actor won't fail if there's already an account that is named the same as the domain (minus the .) * Put the test into the correct context... * Add another test to split this into two validations * Don't delete periods when validating username uniqueness (#11392) The 20190715164535_add_instance_actor migration fails if there's already a username similar to the domain name, e.g. if you are 'vulpine.club' and have a user named 'vulpineclub', validation fails. Upon further review, usernames with periods are dropped by the regular expression in the Account class, so we don't need to worry about it here. Fixes #11392
2019-07-23Handle animated emoji on mouse hover in CWs and poll optionsThibaut Girka
2019-07-23[Glitch] Play animated custom emoji on hoverThibG
Port 7de8c51873b51d8450f7a6597a43d454964d0407 to glitch-soc
2019-07-23Fix scrolling in single-column mode on Chrome (#11395)ThibG
Fixes #11389
2019-07-23Bump active_model_serializers from 0.10.9 to 0.10.10 (#11311)dependabot-preview[bot]
* Bump active_model_serializers from 0.10.9 to 0.10.10 Bumps [active_model_serializers](https://github.com/rails-api/active_model_serializers) from 0.10.9 to 0.10.10. - [Release notes](https://github.com/rails-api/active_model_serializers/releases) - [Changelog](https://github.com/rails-api/active_model_serializers/blob/v0.10.10/CHANGELOG.md) - [Commits](https://github.com/rails-api/active_model_serializers/compare/v0.10.9...v0.10.10) Signed-off-by: dependabot-preview[bot] <support@dependabot.com> * Add root option to render method
2019-07-23Refactor DisplayName component to make it closer to upstreamThibaut Girka
2019-07-23[Glitch] Display custom emoji in bio field namesThibaut Girka
Port 4bd58b7f2da369a608eacb97f832728ddc139ce8 to glitch-soc
2019-07-23Revert some refactoring in order to make codebase closer to upstreamThibaut Girka
2019-07-23Merge branch 'master' into glitch-soc/merge-upstreamThibaut Girka
Conflicts: - app/controllers/application_controller.rb - app/controllers/auth/confirmations_controller.rb - app/controllers/auth/sessions_controller.rb - app/controllers/settings/deletes_controller.rb - app/controllers/settings/two_factor_authentication/recovery_codes_controller.rb
2019-07-22Change unconfirmed user login behaviour (#11375)Eugen Rochko
Allow access to account settings, 2FA, authorized applications, and account deletions to unconfirmed and pending users, as well as users who had their accounts disabled. Suspended users cannot update their e-mail or password or delete their account. Display account status on account settings page, for example, when an account is frozen, limited, unconfirmed or pending review. After sign up, login users straight away and show a simple page that tells them the status of their account with links to account settings and logout, to reduce onboarding friction and allow users to correct wrongly typed e-mail addresses. Move the final sign-up step of SSO integrations to be the same as above to reduce code duplication.
2019-07-21Add (back) rails-level JSON caching (#11333)Eugen Rochko
2019-07-21Clean up redundant shouldUpdateScroll definitionsThibaut Girka
2019-07-21[Glitch] Fix mutes, blocks, domain blocks and follow requests not paginatingEugen Rochko
Port ea7ad59af20af2aa6817b3b40dca34c8fba3373a to glitch-soc Signed-off-by: Thibaut Girka <thib@sitedethib.com>
2019-07-21[Glitch] Fix followers and followings on account profilesThibG
Partial fix from 55abff8af75b9a8ab541ec68a3603c77e1339e23 Signed-off-by: Thibaut Girka <thib@sitedethib.com>
2019-07-21[Glitch] Fix followers/follows layout issues from #8418Jakub Mendyk
Port ceed1ebe5b308a95f9c167c93d3bc0976937fb58 to glitch-soc Signed-off-by: Thibaut Girka <thib@sitedethib.com>
2019-07-21Add empty column message to bookmarks columnThibaut Girka
2019-07-21[Glitch] Add messages informing that collections are emptyJakub Mendyk
Port 5129f6f2aa56afb21708aec552a798d062ccaff9 to glitch-soc Signed-off-by: Thibaut Girka <thib@sitedethib.com>
2019-07-21Fix boost to original audience not working on mobile (#11371)ThibG
2019-07-21Play animated custom emoji on hover (#11348)ThibG
* Play animated custom emoji on hover in status * Play animated custom emoji on hover in display names * Play animated custom emoji on hover in bios/bio fields * Add support for animation on hover on public pages emojis too * Fix tests * Code style cleanup
2019-07-21Fix `alerts` booleans not being typecast correctly in push subscription (#11343)Eugen Rochko
* Fix `alerts` booleans not being typecast correctly in push subscription Fix #10789 * Fix typo