Commit graph

39698 commits

Author SHA1 Message Date
ThibG
b65daa25fa
Merge pull request #835 from ThibG/glitch-soc/merge-upstream
Merge upstream changes
2018-11-29 21:47:18 +01:00
Thibaut Girka
77b9249250 Merge branch 'master' into glitch-soc/merge-upstream 2018-11-29 19:22:52 +01:00
Thibaut Girka
ad7a3974cc Merge branch 'master' into glitch-soc/merge-upstream 2018-11-29 19:22:52 +01:00
Thibaut Girka
fc707adcde Improve detailed status component lifecycle
- Move componentWillMount and componentWillReceiveProps logic to
  getDerivedStateFromProps.
- Compute CW auto-unfold status earlier
2018-11-29 18:32:42 +01:00
Thibaut Girka
6a264c9379 Improve detailed status component lifecycle
- Move componentWillMount and componentWillReceiveProps logic to
  getDerivedStateFromProps.
- Compute CW auto-unfold status earlier
2018-11-29 18:32:42 +01:00
ThibG
a6b5451df5 Swap avatar and header input fields in profile page (#9271)
Fixes #9211
2018-11-29 02:56:09 +01:00
ThibG
fa9f28f52d Swap avatar and header input fields in profile page (#9271)
Fixes #9211
2018-11-29 02:56:09 +01:00
Thibaut Girka
c37a81a5d7 Do not hardcode preferences link, pleroma doesn't have it 2018-11-28 22:36:01 +01:00
Thibaut Girka
7e63fb26e0 Do not hardcode preferences link, pleroma doesn't have it 2018-11-28 22:36:01 +01:00
Thibaut Girka
cb2822b68a Add error boundary component to catch Web UI crashes 2018-11-28 22:36:01 +01:00
Thibaut Girka
922d05864f Add error boundary component to catch Web UI crashes 2018-11-28 22:36:01 +01:00
Thibaut Girka
c0675a272e Do not crash the whole UI when loading an invalid column 2018-11-28 22:36:01 +01:00
Thibaut Girka
39c8a71df8 Do not crash the whole UI when loading an invalid column 2018-11-28 22:36:01 +01:00
Thibaut Girka
76603a189a Switch “cycling” reply policy link to set of radio inputs
Fixes #832
2018-11-28 22:35:42 +01:00
Thibaut Girka
c18bb5d245 Switch “cycling” reply policy link to set of radio inputs
Fixes #832
2018-11-28 22:35:42 +01:00
dependabot[bot]
45cdfe00c5 Bump aws-sdk-s3 from 1.25.0 to 1.27.0 (#9385)
Bumps [aws-sdk-s3](https://github.com/aws/aws-sdk-ruby) from 1.25.0 to 1.27.0.
- [Release notes](https://github.com/aws/aws-sdk-ruby/releases)
- [Changelog](https://github.com/aws/aws-sdk-ruby/blob/master/gems/aws-sdk-s3/CHANGELOG.md)
- [Commits](https://github.com/aws/aws-sdk-ruby/commits)

Signed-off-by: dependabot[bot] <support@dependabot.com>
2018-11-28 16:34:53 +01:00
dependabot[bot]
6fac300ea4 Bump aws-sdk-s3 from 1.25.0 to 1.27.0 (#9385)
Bumps [aws-sdk-s3](https://github.com/aws/aws-sdk-ruby) from 1.25.0 to 1.27.0.
- [Release notes](https://github.com/aws/aws-sdk-ruby/releases)
- [Changelog](https://github.com/aws/aws-sdk-ruby/blob/master/gems/aws-sdk-s3/CHANGELOG.md)
- [Commits](https://github.com/aws/aws-sdk-ruby/commits)

Signed-off-by: dependabot[bot] <support@dependabot.com>
2018-11-28 16:34:53 +01:00
Thibaut Girka
6be659a5ba Add specs for list replies policy 2018-11-28 14:46:07 +01:00
Thibaut Girka
6b22845039 Add specs for list replies policy 2018-11-28 14:46:07 +01:00
Thibaut Girka
f21f359653 Add basic UI to set list replies setting in glitch-soc 2018-11-28 14:46:07 +01:00
Thibaut Girka
f17a61a916 Add basic UI to set list replies setting in glitch-soc 2018-11-28 14:46:07 +01:00
Thibaut Girka
5b84011025 Add backend support to read and update list-specific show_replies settings 2018-11-28 14:46:07 +01:00
Thibaut Girka
06c7fb8015 Add backend support to read and update list-specific show_replies settings 2018-11-28 14:46:07 +01:00
Thibaut Girka
b2e9a23ac9 Add database support for list show-reply preferences 2018-11-28 14:46:07 +01:00
Thibaut Girka
53d0293d25 Add database support for list show-reply preferences 2018-11-28 14:46:07 +01:00
dependabot[bot]
33fbb0f65a [Security] Bump rails from 5.2.1 to 5.2.1.1 (#9383)
Bumps [rails](https://github.com/rails/rails) from 5.2.1 to 5.2.1.1. **This update includes security fixes.**
- [Release notes](https://github.com/rails/rails/releases)
- [Commits](https://github.com/rails/rails/compare/v5.2.1...v5.2.1.1)

Signed-off-by: dependabot[bot] <support@dependabot.com>
2018-11-27 23:34:39 +01:00
dependabot[bot]
7f68452a15 [Security] Bump rails from 5.2.1 to 5.2.1.1 (#9383)
Bumps [rails](https://github.com/rails/rails) from 5.2.1 to 5.2.1.1. **This update includes security fixes.**
- [Release notes](https://github.com/rails/rails/releases)
- [Commits](https://github.com/rails/rails/compare/v5.2.1...v5.2.1.1)

Signed-off-by: dependabot[bot] <support@dependabot.com>
2018-11-27 23:34:39 +01:00
David Yip
50b7d2f002 Merge pull request #829 from ThibG/glitch-soc/features/volume-sliders
[Glitch] Volume sliders for videos
2018-11-27 15:27:21 -06:00
David Yip
74a281475a
Merge pull request #829 from ThibG/glitch-soc/features/volume-sliders
[Glitch] Volume sliders for videos
2018-11-27 15:27:21 -06:00
Eugen Rochko
030ce53623 Fix TLS handshake timeout not being enforced (#9381)
Follow-up to #9329
2018-11-27 19:46:05 +01:00
Eugen Rochko
c39d7e7b2b
Fix TLS handshake timeout not being enforced (#9381)
Follow-up to #9329
2018-11-27 19:46:05 +01:00
Eugen Rochko
12ee020187 Skip deliveries to inboxes that have already been marked as unavailable (#9358) 2018-11-27 19:15:08 +01:00
Eugen Rochko
11955600ad
Skip deliveries to inboxes that have already been marked as unavailable (#9358) 2018-11-27 19:15:08 +01:00
Eugen Rochko
81536e07ab Don't count suspended users in user count (#9380)
Fix #7637
2018-11-27 18:49:37 +01:00
Eugen Rochko
81f96c973a
Don't count suspended users in user count (#9380)
Fix #7637
2018-11-27 18:49:37 +01:00
Eugen Rochko
8c7ba82dc1 Fix nil error when no DNS addresses are found for host (#9379) 2018-11-27 18:13:36 +01:00
Eugen Rochko
43c311b3a1
Fix nil error when no DNS addresses are found for host (#9379) 2018-11-27 18:13:36 +01:00
Marcin Mikołajczak
cb7ecf5df8 Do not leak existence of e-mail addresses during login attempt, part 2 (#9376)
* Do not leak existence of e-mail addresses during login attempt, part 2

* Update devise.uk.yml
2018-11-27 17:39:41 +01:00
Marcin Mikołajczak
cb583ff355 Do not leak existence of e-mail addresses during login attempt, part 2 (#9376)
* Do not leak existence of e-mail addresses during login attempt, part 2

* Update devise.uk.yml
2018-11-27 17:39:41 +01:00
Marcin Mikołajczak
72ee0afe5f security/l10n [fr] do not leak registered e-mail addresses (#9375)
Do not leak existence of e-mail addresses during login attempt in French translation
2018-11-27 16:40:39 +01:00
Marcin Mikołajczak
6bdc9866b7 security/l10n [fr] do not leak registered e-mail addresses (#9375)
Do not leak existence of e-mail addresses during login attempt in French translation
2018-11-27 16:40:39 +01:00
ThibG
d47ccbf5ba Merge pull request #828 from ThibG/glitch-soc/merge-upstream
Merge upstream changes
2018-11-27 16:26:18 +01:00
ThibG
33be091f50
Merge pull request #828 from ThibG/glitch-soc/merge-upstream
Merge upstream changes
2018-11-27 16:26:18 +01:00
Thibaut Girka
c81ad5a2cb [Glitch] Volume sliders for videos
Port b7229bef1a to glitch-soc
2018-11-27 15:21:57 +01:00
Thibaut Girka
3b707bdc12 [Glitch] Volume sliders for videos
Port f978afa487 to glitch-soc
2018-11-27 15:21:57 +01:00
Thibaut Girka
35b6fb4e62 Merge branch 'master' into glitch-soc/merge-upstream 2018-11-27 15:10:58 +01:00
Thibaut Girka
55edfd6e0e Merge branch 'master' into glitch-soc/merge-upstream 2018-11-27 15:10:58 +01:00
Eugen Rochko
163c5e6893 Bump version to 2.6.2 (#9370) 2018-11-27 13:56:47 +01:00
Eugen Rochko
637d0ed838
Bump version to 2.6.2 (#9370) 2018-11-27 13:56:47 +01:00
Eugen Rochko
9606e4dabf Change identities id column to a bigint (#9371)
* fix: change Identity's id column to a bigint

This appears to be the last model created using a 5.0 migration,
where column types defaulted to `integer` rather than `bigint`.

This migration changes the column type to match that of all of the
other ID columns.

* Change user_id column in identities to bigint and fix down-migration
2018-11-27 13:56:25 +01:00