about summary refs log tree commit diff
AgeCommit message (Collapse)Author
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
2019-07-19[Glitch] Add ActivityPub actor representing the entire serverThibG
Port SCSS changes from 730c4053d642024b9949d72c8a9f1873532c6212 Signed-off-by: Thibaut Girka <thib@sitedethib.com>
2019-07-19Remove Atom feeds and old URLs in the form of `GET /:username/updates/:id`Eugen Rochko
Port SCSS changes from b8514561394767a10d3cf40132ada24d938c1680 to glitch-soc Signed-off-by: Thibaut Girka <thib@sitedethib.com>
2019-07-19Merge branch 'master' into glitch-soc/merge-upstreamThibaut Girka
Conflicts: - Gemfile.lock - app/controllers/accounts_controller.rb - app/controllers/admin/dashboard_controller.rb - app/controllers/follower_accounts_controller.rb - app/controllers/following_accounts_controller.rb - app/controllers/remote_follow_controller.rb - app/controllers/stream_entries_controller.rb - app/controllers/tags_controller.rb - app/javascript/packs/public.js - app/lib/sanitize_config.rb - app/models/account.rb - app/models/form/admin_settings.rb - app/models/media_attachment.rb - app/models/stream_entry.rb - app/models/user.rb - app/serializers/initial_state_serializer.rb - app/services/batched_remove_status_service.rb - app/services/post_status_service.rb - app/services/process_mentions_service.rb - app/services/reblog_service.rb - app/services/remove_status_service.rb - app/views/admin/settings/edit.html.haml - config/locales/simple_form.pl.yml - config/settings.yml - docker-compose.yml
2019-07-20Bump strong_migrations from 0.4.0 to 0.4.1 (#11307)dependabot-preview[bot]
Bumps [strong_migrations](https://github.com/ankane/strong_migrations) from 0.4.0 to 0.4.1. - [Release notes](https://github.com/ankane/strong_migrations/releases) - [Changelog](https://github.com/ankane/strong_migrations/blob/master/CHANGELOG.md) - [Commits](https://github.com/ankane/strong_migrations/compare/v0.4.0...v0.4.1) Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2019-07-19Change single-column mode to scroll the whole page (#11359)Eugen Rochko
Fix #10840
2019-07-19Fix avatar animation on hover when not logged in (#11349)ThibG
2019-07-19Added logout to dropdown menu (#11353)koyu
* Added logout to dropdown menu * Triggering build-and-test with empty commit as it seems it failed due to some internal failure * Looks fine, ready to review * Added changes from review * method can be null without any problems * Also target can be null
2019-07-19Fix sanitizing lists contents (#11354)ThibG
* Add test * Fix code for sanitizing nested lists stripping all tags
2019-07-19Add ActivityPub actor representing the entire server (#11321)ThibG
* Add support for an instance actor * Skip username validation for local Application accounts * Add migration script to create instance actor * Make Codeclimate happy * Switch to id -99 for instance actor * Remove unused `icon` and `image` attributes from instance actor * Use if/elsif/else instead of return + ternary operator * Add instance actor to fresh installs * Use instance actor as instance representative Use instance actor for forwarding reports, relay operations, and spam auto-reporting. * Seed database in test environment * Fix single-user mode * Fix tests * Fix specs to accomodate for an extra `Account` * Auto-reject follows on instance actor Following an instance actor might make sense, but we are not handling that right now, so auto-reject. * Fix webfinger lookup and serialization for instance actor * Rename instance actor * Make it clear in the HTML view that the instance actor should not be blocked * Raise cache time for instance actor as there's no dynamic content * Re-use /about/more with a flash message for instance actor profile
2019-07-18Fix timestamp display in boost/fav modals in RTL localesThibaut Girka
2019-07-18FixupsThibaut Girka
2019-07-18Public pages RTL fixesThibaut Girka
2019-07-18Unfiy status__prepend with upstreamThibaut Girka