Eugen Rochko
|
c480da375b
|
Bump version to 2.6.4 (#9402)
|
2018-11-30 21:38:09 +01:00 |
|
Thibaut Girka
|
fda8506a9c
|
Merge branch 'master' into glitch-soc/merge-upstream
|
2018-11-30 20:16:26 +01:00 |
|
Thibaut Girka
|
bc8411ec87
|
Merge branch 'master' into glitch-soc/merge-upstream
|
2018-11-30 20:16:26 +01:00 |
|
mayaeh
|
88e40d03d9
|
Fix that translation is not applied to "joining hashtags" (#9397)
|
2018-11-30 19:36:09 +01:00 |
|
mayaeh
|
bfec030a4e
|
Fix that translation is not applied to "joining hashtags" (#9397)
|
2018-11-30 19:36:09 +01:00 |
|
Eugen Rochko
|
272c58904f
|
Remove npm-run-all dependency (#9401)
Fix #9359
|
2018-11-30 19:16:32 +01:00 |
|
Eugen Rochko
|
3948b6fa52
|
Remove npm-run-all dependency (#9401)
Fix #9359
|
2018-11-30 19:16:32 +01:00 |
|
dependabot[bot]
|
3a75150a93
|
Bump oj from 3.7.1 to 3.7.4 (#9393)
Bumps [oj](https://github.com/ohler55/oj) from 3.7.1 to 3.7.4.
- [Release notes](https://github.com/ohler55/oj/releases)
- [Changelog](https://github.com/ohler55/oj/blob/master/CHANGELOG.md)
- [Commits](https://github.com/ohler55/oj/compare/v3.7.1...v3.7.4)
Signed-off-by: dependabot[bot] <support@dependabot.com>
|
2018-11-30 19:09:31 +01:00 |
|
dependabot[bot]
|
d0453e77dc
|
Bump oj from 3.7.1 to 3.7.4 (#9393)
Bumps [oj](https://github.com/ohler55/oj) from 3.7.1 to 3.7.4.
- [Release notes](https://github.com/ohler55/oj/releases)
- [Changelog](https://github.com/ohler55/oj/blob/master/CHANGELOG.md)
- [Commits](https://github.com/ohler55/oj/compare/v3.7.1...v3.7.4)
Signed-off-by: dependabot[bot] <support@dependabot.com>
|
2018-11-30 19:09:31 +01:00 |
|
dependabot[bot]
|
1b7a2516e8
|
Bump fastimage from 2.1.4 to 2.1.5 (#9395)
Bumps [fastimage](https://github.com/sdsykes/fastimage) from 2.1.4 to 2.1.5.
- [Release notes](https://github.com/sdsykes/fastimage/releases)
- [Commits](https://github.com/sdsykes/fastimage/compare/v2.1.4...v2.1.5)
Signed-off-by: dependabot[bot] <support@dependabot.com>
|
2018-11-30 19:08:31 +01:00 |
|
dependabot[bot]
|
5866e0b909
|
Bump fastimage from 2.1.4 to 2.1.5 (#9395)
Bumps [fastimage](https://github.com/sdsykes/fastimage) from 2.1.4 to 2.1.5.
- [Release notes](https://github.com/sdsykes/fastimage/releases)
- [Commits](https://github.com/sdsykes/fastimage/compare/v2.1.4...v2.1.5)
Signed-off-by: dependabot[bot] <support@dependabot.com>
|
2018-11-30 19:08:31 +01:00 |
|
Eugen Rochko
|
ab3f2aba04
|
Bump version to 2.6.3 (#9391)
|
2018-11-30 14:20:15 +01:00 |
|
Eugen Rochko
|
d037e88277
|
Bump version to 2.6.3 (#9391)
|
2018-11-30 14:20:15 +01:00 |
|
ThibG
|
546ce24295
|
Merge pull request #835 from ThibG/glitch-soc/merge-upstream
Merge upstream changes
|
2018-11-29 21:47:18 +01:00 |
|
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 |
|