ThibG
fb1b710e8d
Fix scrolling in single-column mode on Chrome ( #11395 )
...
Fixes #11389
2019-07-23 15:47:18 +02:00
dependabot-preview[bot]
1955aa9f7d
Bump active_model_serializers from 0.10.9 to 0.10.10 ( #11311 )
...
* 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-23 11:10:42 +02:00
Daigo 3 Dango
cd68714393
List columns within the method ( #11377 )
...
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-23 11:08:11 +02:00
dependabot-preview[bot]
24367ef906
Bump css-loader from 2.1.1 to 3.1.0 ( #11382 )
...
* 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-23 11:07:47 +02:00
Thibaut Girka
621590b4ab
Refactor DisplayName component to make it closer to upstream
2019-07-23 10:51:12 +02:00
Thibaut Girka
cd8763b600
[Glitch] Display custom emoji in bio field names
...
Port 4bd58b7f2d
2019-07-23 10:51:12 +02:00
Thibaut Girka
8a89a2b0f4
Revert some refactoring in order to make codebase closer to upstream
2019-07-23 10:51:12 +02:00
Thibaut Girka
444796b69b
Merge branch 'master' into glitch-soc/merge-upstream
...
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-23 10:51:07 +02:00
dependabot-preview[bot]
ab3126e7a2
Bump browser from 2.5.3 to 2.6.1 ( #11388 )
...
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-22 23:11:01 +09:00
dependabot-preview[bot]
05b8468755
Bump oj from 3.7.12 to 3.8.0 ( #11387 )
...
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-22 23:07:42 +09:00
dependabot-preview[bot]
e980e19a91
Bump rubocop from 0.72.0 to 0.73.0 ( #11384 )
...
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-22 23:06:34 +09:00
dependabot-preview[bot]
362fa2dc8a
Bump premailer-rails from 1.10.2 to 1.10.3 ( #11386 )
...
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-22 23:05:34 +09:00
dependabot-preview[bot]
b47e3b6cd8
Bump capybara from 3.25.0 to 3.26.0 ( #11385 )
...
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-22 23:04:17 +09:00
Eugen Rochko
964ae8eee5
Change unconfirmed user login behaviour ( #11375 )
...
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-22 10:48:50 +02:00
dependabot-preview[bot]
fea903f574
Bump eslint from 5.16.0 to 6.1.0 ( #11383 )
...
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-22 17:37:11 +09:00
dependabot-preview[bot]
e2b3437a84
Bump babel-eslint from 10.0.1 to 10.0.2 ( #11381 )
...
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-22 17:36:55 +09:00
dependabot-preview[bot]
44b04358b3
Bump intl-relativeformat from 6.4.2 to 6.4.3 ( #11380 )
...
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-22 16:27:44 +09:00
dependabot-preview[bot]
28a60cb04f
Bump @clusterws/cws from 0.14.0 to 0.15.0 ( #11379 )
...
Bumps @clusterws/cws from 0.14.0 to 0.15.0.
Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2019-07-22 16:27:16 +09:00
Daigo 3 Dango
00fc17b2ed
Bind servers to 0.0.0.0 in Procfile ( #11378 )
...
* Bind to 0.0.0.0
* Make Procfile common to main and streaming apps
2019-07-22 06:16:30 +02:00
Eugen Rochko
c669bb42ba
Add (back) rails-level JSON caching ( #11333 )
2019-07-21 22:32:16 +02:00
Thibaut Girka
6db5669818
Clean up redundant shouldUpdateScroll definitions
2019-07-21 20:57:42 +02:00
Eugen Rochko
e58af04287
[Glitch] Fix mutes, blocks, domain blocks and follow requests not paginating
...
Port ea7ad59af2
2019-07-21 20:57:42 +02:00
ThibG
bd7b1538f1
[Glitch] Fix followers and followings on account profiles
...
Partial fix from 55abff8af7
2019-07-21 20:57:42 +02:00
Jakub Mendyk
c614abb95d
[Glitch] Fix followers/follows layout issues from #8418
...
Port ceed1ebe5b
2019-07-21 20:57:42 +02:00
Thibaut Girka
b294b5956b
Add empty column message to bookmarks column
2019-07-21 20:57:42 +02:00
Jakub Mendyk
e9f88f4005
[Glitch] Add messages informing that collections are empty
...
Port 5129f6f2aa
2019-07-21 20:57:42 +02:00
ThibG
59fd622adc
Fix boost to original audience not working on mobile ( #11371 )
2019-07-21 18:11:09 +02:00
ThibG
7de8c51873
Play animated custom emoji on hover ( #11348 )
...
* 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-21 18:10:40 +02:00
Eugen Rochko
043d52f785
Fix alerts booleans not being typecast correctly in push subscription ( #11343 )
...
* Fix `alerts` booleans not being typecast correctly in push subscription
Fix #10789
* Fix typo
2019-07-21 18:10:07 +02:00
Eugen Rochko
bd1545de5e
Change locale detection to run once per session ( #8657 )
...
Fix #6462
2019-07-21 18:08:02 +02:00
Eugen Rochko
bd87e66679
Remove WebSub subscriptions ( #11303 )
2019-07-21 04:08:00 +02:00
ThibG
4bd58b7f2d
Display custom emoji in bio field names ( #11350 )
...
Already displayed in public pages, but not WebUI
2019-07-21 03:40:27 +02:00
ysksn
2859790890
Not to create an account if already exist ( #11366 )
2019-07-21 03:40:08 +02:00
ThibG
f1597e1ab9
Merge pull request #1158 from ThibG/glitch-soc/merge-upstream
...
Merge upstream changes
2019-07-21 00:53:28 +02:00
Lady Lumb
19c3a941e8
Added max search results var to sample env
...
Added and documented MAX_SEARCH_RESULTS to the .env.production.sample file
2019-07-20 16:39:48 +02:00
Lady Lumb
0ed0c77266
Add env variable to control search limit
...
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-20 16:39:48 +02:00
Thibaut Girka
055450bc02
Merge branch 'master' into glitch-soc/merge-upstream
2019-07-19 23:37:41 +02:00
ThibG
c37c1da41e
Disallow numeric-only hashtags ( #11363 )
...
* Add spec covering numeric-only hashtags
* Fix hashtag regex
2019-07-19 23:22:35 +02:00
ThibG
650459f93c
Fix some flash notices/alerts staying on unrelated pages ( #11364 )
2019-07-19 23:13:21 +02:00
Thibaut Girka
86d4461948
Fix HTML entities being encoded as hashtag links…
2019-07-19 20:15:03 +02:00
Thibaut Girka
249b7c7c12
Fix filtering behaviors
2019-07-19 19:21:20 +02:00
Thibaut Girka
3407ae8683
Fix sanitizer text case for glitch-soc, which preserves lists
2019-07-19 19:16:07 +02:00
ThibG
490cf3aa03
[Glitch] Add ActivityPub actor representing the entire server
...
Port SCSS changes from 730c4053d6
2019-07-19 18:35:45 +02:00
Eugen Rochko
bf3ab44e77
Remove Atom feeds and old URLs in the form of GET /:username/updates/:id
...
Port SCSS changes from b851456139
2019-07-19 18:27:26 +02:00
Thibaut Girka
249991c498
Merge branch 'master' into glitch-soc/merge-upstream
...
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-19 18:26:49 +02:00
dependabot-preview[bot]
6867a0beb5
Bump strong_migrations from 0.4.0 to 0.4.1 ( #11307 )
...
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-20 01:08:02 +09:00
Eugen Rochko
aa22b38fdb
Change single-column mode to scroll the whole page ( #11359 )
...
Fix #10840
2019-07-19 09:25:22 +02:00
ThibG
4fa6472523
Fix avatar animation on hover when not logged in ( #11349 )
2019-07-19 09:18:23 +02:00
koyu
8df0022e66
Added logout to dropdown menu ( #11353 )
...
* 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-19 03:58:46 +02:00
ThibG
fda437a020
Fix sanitizing lists contents ( #11354 )
...
* Add test
* Fix code for sanitizing nested lists stripping all tags
2019-07-19 01:44:58 +02:00
