about summary refs log tree commit diff
AgeCommit message (Collapse)Author
2019-07-24Merge pull request #1176 from ThibG/glitch-soc/merge-upstreamThibG
Merge upstream changes
2019-07-24Merge branch 'master' into glitch-soc/merge-upstreamThibaut Girka
2019-07-24Fix tootctl statuses removeThomas Citharel
A ending parenthesis was missing in the bookmark special line.
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-23Merge pull request #1174 from ThibG/glitch-soc/merge-upstreamThibG
Merge upstream changes
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-23Remove modules.localIdentName (#11398)Yamagishi Kazutoshi
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-23List columns within the method (#11377)Daigo 3 Dango
To avoid the exception: NoMethodError: undefined method `perform' for nil:NilClass .../vendor/bundle/ruby/2.6.0/gems/strong_migrations-0.4.1/lib/strong_migrations/migration.rb:14:in `method_missing' .../vendor/bundle/ruby/2.6.0/gems/activerecord-5.2.3/lib/active_record/migration.rb:604:in `method_missing' .../db/migrate/20170918125918_ids_to_bigints.rb:69:in `<class:IdsToBigints>' .../db/migrate/20170918125918_ids_to_bigints.rb:3:in `<top (required)>'
2019-07-23Bump css-loader from 2.1.1 to 3.1.0 (#11382)dependabot-preview[bot]
* Bump css-loader from 2.1.1 to 3.1.0 Bumps [css-loader](https://github.com/webpack-contrib/css-loader) from 2.1.1 to 3.1.0. - [Release notes](https://github.com/webpack-contrib/css-loader/releases) - [Changelog](https://github.com/webpack-contrib/css-loader/blob/master/CHANGELOG.md) - [Commits](https://github.com/webpack-contrib/css-loader/compare/v2.1.1...v3.1.0) Signed-off-by: dependabot-preview[bot] <support@dependabot.com> * localIdentName -> modules.localIdentName
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-22Bump browser from 2.5.3 to 2.6.1 (#11388)dependabot-preview[bot]
Bumps [browser](https://github.com/fnando/browser) from 2.5.3 to 2.6.1. - [Release notes](https://github.com/fnando/browser/releases) - [Changelog](https://github.com/fnando/browser/blob/master/CHANGELOG.md) - [Commits](https://github.com/fnando/browser/compare/v2.5.3...v2.6.1) Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2019-07-22Bump oj from 3.7.12 to 3.8.0 (#11387)dependabot-preview[bot]
Bumps [oj](https://github.com/ohler55/oj) from 3.7.12 to 3.8.0. - [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.7.12...v3.8.0) Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2019-07-22Bump rubocop from 0.72.0 to 0.73.0 (#11384)dependabot-preview[bot]
Bumps [rubocop](https://github.com/rubocop-hq/rubocop) from 0.72.0 to 0.73.0. - [Release notes](https://github.com/rubocop-hq/rubocop/releases) - [Changelog](https://github.com/rubocop-hq/rubocop/blob/master/CHANGELOG.md) - [Commits](https://github.com/rubocop-hq/rubocop/compare/v0.72.0...v0.73.0) Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2019-07-22Bump premailer-rails from 1.10.2 to 1.10.3 (#11386)dependabot-preview[bot]
Bumps [premailer-rails](https://github.com/fphilipe/premailer-rails) from 1.10.2 to 1.10.3. - [Release notes](https://github.com/fphilipe/premailer-rails/releases) - [Changelog](https://github.com/fphilipe/premailer-rails/blob/master/CHANGELOG.md) - [Commits](https://github.com/fphilipe/premailer-rails/compare/v1.10.2...v1.10.3) Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2019-07-22Bump capybara from 3.25.0 to 3.26.0 (#11385)dependabot-preview[bot]
Bumps [capybara](https://github.com/teamcapybara/capybara) from 3.25.0 to 3.26.0. - [Release notes](https://github.com/teamcapybara/capybara/releases) - [Changelog](https://github.com/teamcapybara/capybara/blob/master/History.md) - [Commits](https://github.com/teamcapybara/capybara/compare/3.25.0...3.26.0) Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
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-22Bump eslint from 5.16.0 to 6.1.0 (#11383)dependabot-preview[bot]
Bumps [eslint](https://github.com/eslint/eslint) from 5.16.0 to 6.1.0. - [Release notes](https://github.com/eslint/eslint/releases) - [Changelog](https://github.com/eslint/eslint/blob/master/CHANGELOG.md) - [Commits](https://github.com/eslint/eslint/compare/v5.16.0...v6.1.0) Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2019-07-22Bump babel-eslint from 10.0.1 to 10.0.2 (#11381)dependabot-preview[bot]
Bumps [babel-eslint](https://github.com/babel/babel-eslint) from 10.0.1 to 10.0.2. - [Release notes](https://github.com/babel/babel-eslint/releases) - [Commits](https://github.com/babel/babel-eslint/compare/v10.0.1...v10.0.2) Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2019-07-22Bump intl-relativeformat from 6.4.2 to 6.4.3 (#11380)dependabot-preview[bot]
Bumps [intl-relativeformat](https://github.com/formatjs/formatjs) from 6.4.2 to 6.4.3. - [Release notes](https://github.com/formatjs/formatjs/releases) - [Commits](https://github.com/formatjs/formatjs/compare/intl-relativeformat@6.4.2...intl-relativeformat@6.4.3) Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2019-07-22Bump @clusterws/cws from 0.14.0 to 0.15.0 (#11379)dependabot-preview[bot]
Bumps @clusterws/cws from 0.14.0 to 0.15.0. Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2019-07-22Bind servers to 0.0.0.0 in Procfile (#11378)Daigo 3 Dango
* Bind to 0.0.0.0 * Make Procfile common to main and streaming apps
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
2019-07-21Change locale detection to run once per session (#8657)Eugen Rochko
Fix #6462
2019-07-21Remove WebSub subscriptions (#11303)Eugen Rochko
2019-07-21Display custom emoji in bio field names (#11350)ThibG
Already displayed in public pages, but not WebUI
2019-07-21Not to create an account if already exist (#11366)ysksn
2019-07-21Merge pull request #1158 from ThibG/glitch-soc/merge-upstreamThibG
Merge upstream changes
2019-07-20Added max search results var to sample envLady Lumb
Added and documented MAX_SEARCH_RESULTS to the .env.production.sample file
2019-07-20Add env variable to control search limitLady Lumb
Changed the default search limit to allow a variable called MAX_SEARCH_RESULTS in the .env.production file to change the maximum search results limit.
2019-07-19Merge branch 'master' into glitch-soc/merge-upstreamThibaut Girka
2019-07-19Disallow numeric-only hashtags (#11363)ThibG
* Add spec covering numeric-only hashtags * Fix hashtag regex
2019-07-19Fix some flash notices/alerts staying on unrelated pages (#11364)ThibG
2019-07-19Fix HTML entities being encoded as hashtag links…Thibaut Girka
2019-07-19Fix filtering behaviorsThibaut Girka
2019-07-19Fix sanitizer text case for glitch-soc, which preserves listsThibaut Girka
generated by cgit-pink (git 2.37.1) at 2024-11-03 22:42:46 +0000