ThibG
44e6c2dd74
Merge pull request #840 from ThibG/glitch-soc/merge-upstream
...
Merge upstream changes
6 years ago
Thibaut Girka
a07e37cc17
Merge branch 'master' into glitch-soc/merge-upstream
6 years ago
Thibaut Girka
4b85bf12ab
Fix since_id
6 years ago
ThibG
5648b30d6c
Fix last_status parameter for notifications and conversations ( #9407 )
6 years ago
Quentí
6a285f0a15
[i18n] update and corrections for Occitan locale ( #9404 )
...
* Update + correction
Colomna and not columna
Pòt, verb missing
* Correction
D’aquí is followed by a time period, and dins by a season.
Read : https://github.com/briannesbitt/Carbon/pull/1403 for more details.
* Correction admin zone
* Correction
Reïnicializacion, with the funny ï
6 years ago
Paweł Ngei
b9ec34de57
Add a tooltip explaining what a locked account is ( #9403 )
...
* create a title tooltip explaining what a locked account is
* improve phrasing
* minor phrasing fix to unify default and english
6 years ago
ThibG
3cbe0c26bb
Merge pull request #837 from ThibG/glitch-soc/merge-upstream
...
Merge upstream changes
6 years ago
Thibaut Girka
76320bf6d8
Scroll to selected toot even if the ancestors happen to be loaded
6 years ago
Thibaut Girka
a10fee3c09
Scroll to detailed status when new ancestors get inserted
6 years ago
Thibaut Girka
31599ad91c
[Glitch] Fix bug in order of conversations in web UI
...
Port e18390cfe6
to glitch-soc
6 years ago
Thibaut Girka
837ea32c88
[Glitch] Replace recursion in status mapStateToProps
...
Port dfbadd6837
to glitch-soc
6 years ago
Thibaut Girka
a28f5695f3
[Glitch] Fix context building in the reducer
...
Port 7706ed038f
to glitch-soc
6 years ago
Thibaut Girka
1624a95b2b
[Glitch] Introduce flat layout to contexts reducer
...
Port 023fe5181b
to glitch-soc
6 years ago
Thibaut Girka
1a5de04789
Display a double reply arrow on public pages for toots that are replies
6 years ago
Eugen Rochko
c480da375b
Bump version to 2.6.4 ( #9402 )
6 years ago
Thibaut Girka
bc8411ec87
Merge branch 'master' into glitch-soc/merge-upstream
6 years ago
mayaeh
bfec030a4e
Fix that translation is not applied to "joining hashtags" ( #9397 )
6 years ago
Eugen Rochko
3948b6fa52
Remove npm-run-all dependency ( #9401 )
...
Fix #9359
6 years ago
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>
6 years ago
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>
6 years ago
Eugen Rochko
d037e88277
Bump version to 2.6.3 ( #9391 )
6 years ago
ThibG
b65daa25fa
Merge pull request #835 from ThibG/glitch-soc/merge-upstream
...
Merge upstream changes
6 years ago
Thibaut Girka
ad7a3974cc
Merge branch 'master' into glitch-soc/merge-upstream
6 years ago
Thibaut Girka
6a264c9379
Improve detailed status component lifecycle
...
- Move componentWillMount and componentWillReceiveProps logic to
getDerivedStateFromProps.
- Compute CW auto-unfold status earlier
6 years ago
ThibG
fa9f28f52d
Swap avatar and header input fields in profile page ( #9271 )
...
Fixes #9211
6 years ago
Thibaut Girka
7e63fb26e0
Do not hardcode preferences link, pleroma doesn't have it
6 years ago
Thibaut Girka
922d05864f
Add error boundary component to catch Web UI crashes
6 years ago
Thibaut Girka
39c8a71df8
Do not crash the whole UI when loading an invalid column
6 years ago
Thibaut Girka
c18bb5d245
Switch “cycling” reply policy link to set of radio inputs
...
Fixes #832
6 years ago
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>
6 years ago
Thibaut Girka
6b22845039
Add specs for list replies policy
6 years ago
Thibaut Girka
f17a61a916
Add basic UI to set list replies setting in glitch-soc
6 years ago
Thibaut Girka
06c7fb8015
Add backend support to read and update list-specific show_replies settings
6 years ago
Thibaut Girka
53d0293d25
Add database support for list show-reply preferences
6 years ago
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>
6 years ago
David Yip
74a281475a
Merge pull request #829 from ThibG/glitch-soc/features/volume-sliders
...
[Glitch] Volume sliders for videos
6 years ago
Eugen Rochko
c39d7e7b2b
Fix TLS handshake timeout not being enforced ( #9381 )
...
Follow-up to #9329
6 years ago
Eugen Rochko
11955600ad
Skip deliveries to inboxes that have already been marked as unavailable ( #9358 )
6 years ago
Eugen Rochko
81f96c973a
Don't count suspended users in user count ( #9380 )
...
Fix #7637
6 years ago
Eugen Rochko
43c311b3a1
Fix nil error when no DNS addresses are found for host ( #9379 )
6 years ago
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
6 years ago
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
6 years ago
ThibG
33be091f50
Merge pull request #828 from ThibG/glitch-soc/merge-upstream
...
Merge upstream changes
6 years ago
Thibaut Girka
3b707bdc12
[Glitch] Volume sliders for videos
...
Port f978afa487
to glitch-soc
6 years ago
Thibaut Girka
55edfd6e0e
Merge branch 'master' into glitch-soc/merge-upstream
6 years ago
Eugen Rochko
637d0ed838
Bump version to 2.6.2 ( #9370 )
6 years ago
Eugen Rochko
4afda5444a
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
6 years ago
Eugen Rochko
2ba5d63a05
Remove unused translations ( #9372 )
6 years ago
Thibaut Girka
f969eca07e
[Glitch] check_boxes label should use display: inline-block
...
Port 180ae0472a
to glitch-soc
6 years ago
Thibaut Girka
f8e07ca5cd
Merge branch 'master' into glitch-soc/merge-upstream
...
Conflicts:
- app/models/status.rb
Resolved by taking both changes (not a real conflict, just changes too close
to each other).
6 years ago