Thibaut Girka
403eca7ad6
Revert some refactoring in order to make codebase closer to upstream
2019-07-23 10:51:12 +02:00
Thibaut Girka
579ccb0bb9
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]
adbe5310fa
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]
c7f90215b1
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]
fe26f82cca
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]
43a34ed422
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]
179bb74f47
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
6be7b414e2
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]
e144b8db05
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]
52d1aea1ed
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]
53a0a8f91a
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]
9fc0c8fd37
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
8262f43036
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
79b9eee938
Add (back) rails-level JSON caching ( #11333 )
2019-07-21 22:32:16 +02:00
Thibaut Girka
f447eef7cd
Clean up redundant shouldUpdateScroll definitions
2019-07-21 20:57:42 +02:00
Eugen Rochko
06990c0ece
[Glitch] Fix mutes, blocks, domain blocks and follow requests not paginating
...
Port 8ff757ed6a
2019-07-21 20:57:42 +02:00
ThibG
9b58e25df5
[Glitch] Fix followers and followings on account profiles
...
Partial fix from 513f59726a
2019-07-21 20:57:42 +02:00
Jakub Mendyk
1d58c95a8b
[Glitch] Fix followers/follows layout issues from #8418
...
Port 816384cf32
2019-07-21 20:57:42 +02:00
Thibaut Girka
b67c436220
Add empty column message to bookmarks column
2019-07-21 20:57:42 +02:00
Jakub Mendyk
be07e0038c
[Glitch] Add messages informing that collections are empty
...
Port 6fae7f6a04
2019-07-21 20:57:42 +02:00
ThibG
ee7254e8eb
Fix boost to original audience not working on mobile ( #11371 )
2019-07-21 18:11:09 +02:00
ThibG
99b3dd5b00
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
9027d911d0
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
2b4fa0d6fa
Change locale detection to run once per session ( #8657 )
...
Fix #6462
2019-07-21 18:08:02 +02:00
Eugen Rochko
f9ed4354b1
Remove WebSub subscriptions ( #11303 )
2019-07-21 04:08:00 +02:00
ThibG
2582701b72
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
1f72e6226a
Not to create an account if already exist ( #11366 )
2019-07-21 03:40:08 +02:00
ThibG
c0f0a24e27
Merge pull request #1158 from ThibG/glitch-soc/merge-upstream
...
Merge upstream changes
2019-07-21 00:53:28 +02:00
Lady Lumb
4496755734
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
c81369aeb0
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
f4ef7a621a
Merge branch 'master' into glitch-soc/merge-upstream
2019-07-19 23:37:41 +02:00
ThibG
6d5f00fdfe
Disallow numeric-only hashtags ( #11363 )
...
* Add spec covering numeric-only hashtags
* Fix hashtag regex
2019-07-19 23:22:35 +02:00
ThibG
47dfcc601b
Fix some flash notices/alerts staying on unrelated pages ( #11364 )
2019-07-19 23:13:21 +02:00
Thibaut Girka
efcd18579a
Fix HTML entities being encoded as hashtag links…
2019-07-19 20:15:03 +02:00
Thibaut Girka
4daf8b17e3
Fix filtering behaviors
2019-07-19 19:21:20 +02:00
Thibaut Girka
d1ed28cf94
Fix sanitizer text case for glitch-soc, which preserves lists
2019-07-19 19:16:07 +02:00
ThibG
8dd730a71d
[Glitch] Add ActivityPub actor representing the entire server
...
Port SCSS changes from c2126e3f98
2019-07-19 18:35:45 +02:00
Eugen Rochko
6c5f339573
Remove Atom feeds and old URLs in the form of GET /:username/updates/:id
...
Port SCSS changes from fbbcbd940d
2019-07-19 18:27:26 +02:00
Thibaut Girka
eecce7e59b
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]
2fe3965d17
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
de4ead8fc6
Change single-column mode to scroll the whole page ( #11359 )
...
Fix #10840
2019-07-19 09:25:22 +02:00
ThibG
026f3a9d2d
Fix avatar animation on hover when not logged in ( #11349 )
2019-07-19 09:18:23 +02:00
koyu
ee3ab5a51d
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
773130d51a
Fix sanitizing lists contents ( #11354 )
...
* Add test
* Fix code for sanitizing nested lists stripping all tags
2019-07-19 01:44:58 +02:00
ThibG
c2126e3f98
Add ActivityPub actor representing the entire server ( #11321 )
...
* 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-19 01:44:42 +02:00
Thibaut Girka
3f7c78d821
Fix timestamp display in boost/fav modals in RTL locales
2019-07-18 20:56:20 +02:00
Thibaut Girka
97643292bb
Fixups
2019-07-18 20:56:20 +02:00
Thibaut Girka
307ef1231f
Public pages RTL fixes
2019-07-18 20:56:20 +02:00
Thibaut Girka
a5bcce0795
Unfiy status__prepend with upstream
2019-07-18 20:56:20 +02:00
Thibaut Girka
bb8fa5568c
RTL fixes
2019-07-18 20:56:20 +02:00
