Thibaut Girka
bed7758022
Merge branch 'master' into glitch-soc/merge-upstream
6 years ago
ThibG
32f0cc5ccd
Fix setting up fields of a previously suspended account ( #10222 )
...
Fix #10177 for real
6 years ago
Ben Lubar
f461d0a193
Re-organize Dockerfile to improve incremental builds. ( #10212 )
...
- Always run apt update before any other apt command. (This fixes
incremental builds failing if a remote package is updated.)
- Only copy dependency lists before installing dependencies. (This means
editing code doesn't force all dependencies to be re-downloaded.)
- Delete cache in the same layer that it is created. (Otherwise,
deleting cache *increases* the size of the image on non-squashed
builds.)
- Move the installation of some static dependencies to *before* Mastodon
code is imported to Docker.
6 years ago
Sascha
291fbe21c2
config: add DB_SSLMODE for managed/remote PG ( #10210 )
...
* config: add DB_SSLMODE for managed/remote PG
* streaming: set PG sslmode, defaults to prefer
6 years ago
dependabot[bot]
51faba7b59
Bump pkg-config from 1.3.4 to 1.3.5 ( #10218 )
...
Bumps [pkg-config](https://github.com/ruby-gnome2/pkg-config ) from 1.3.4 to 1.3.5.
- [Release notes](https://github.com/ruby-gnome2/pkg-config/releases )
- [Changelog](https://github.com/ruby-gnome2/pkg-config/blob/master/NEWS )
- [Commits](https://github.com/ruby-gnome2/pkg-config/compare/1.3.4...1.3.5 )
Signed-off-by: dependabot[bot] <support@dependabot.com>
6 years ago
ThibG
5baae3d9c0
Merge pull request #945 from ThibG/glitch-soc/merge-upstream
...
Merge upstream changes
6 years ago
Eugen Rochko
b9a799c343
[Glitch] Fix NaN in Poll component
...
Port 19cccea89a
to glitch-soc
6 years ago
Eugen Rochko
7565b8afa3
[Glitch] Fix public timelines being broken by new toots when they are not mounted
...
Port 8e9db67a6a
to glitch-soc
6 years ago
Thibaut Girka
9b093dfcde
Merge branch 'master' into glitch-soc/merge-upstream
6 years ago
ThibG
dcbe6c16ba
Do not allow adding votes to expired polls ( #10214 )
...
* Do not allow adding votes to expired polls
* Only validate expires_at on create
6 years ago
Eugen Rochko
b7a8a52bc5
Immediately display poll results to poll author ( #10187 )
...
* Immediately display poll results to poll author
* Refactor Poll#loaded_options and add Poll#voted? to improve DRYness
6 years ago
Eugen Rochko
19cccea89a
Fix NaN in Poll component ( #10213 )
6 years ago
Eugen Rochko
8e9db67a6a
Fix public timelines being broken by new toots when they are not mounted ( #10131 )
6 years ago
ThibG
641384d288
Handle StaleObjectError when retrieving polls ( #10208 )
6 years ago
ThibG
51e37e9d6a
Merge pull request #944 from ThibG/glitch-soc/merge-upstream
...
Merge upstream changes
6 years ago
Thibaut Girka
d8d8c64965
Merge branch 'master' into glitch-soc/merge-upstream
6 years ago
dependabot[bot]
adc68b7a2e
Bump webpush from 0.3.6 to 0.3.7 ( #10205 )
...
Bumps [webpush](https://github.com/zaru/webpush ) from 0.3.6 to 0.3.7.
- [Release notes](https://github.com/zaru/webpush/releases )
- [Changelog](https://github.com/zaru/webpush/blob/master/CHANGELOG.md )
- [Commits](https://github.com/zaru/webpush/compare/v0.3.6...v0.3.7 )
Signed-off-by: dependabot[bot] <support@dependabot.com>
6 years ago
marcin mikołajczak
5232eccc5c
i18n: 🇵🇱 ( #10199 )
...
Signed-off-by: Marcin Mikołajczak <me@m4sk.in>
6 years ago
ThibG
db21a6c5ee
Avoid unnecessarily fetching the replies collection when it is empty ( #10201 )
6 years ago
ThibG
401a3cfdf0
Fix AddLockVersionToPolls migration ( #10200 )
6 years ago
rinsuki
ed3d470069
Fix #10202 ( #10203 )
6 years ago
Thibaut Girka
a9597fd8a6
Allow setting whether this is a single choice poll or multiple choices one
6 years ago
Thibaut Girka
81a92465f2
Disable file upload when there is a poll
6 years ago
Thibaut Girka
49c4e57973
Use server-provided poll limits instead of hardcoded ones
...
Also does not enable polls if no limits are provided by the server
6 years ago
Thibaut Girka
9f06da948b
Serialize poll limits in instance serializer and initial state
6 years ago
Thibaut Girka
e2d56cc90d
[Glitch] Port polls creation UI from upstream
6 years ago
Thibaut Girka
8124b60a99
Fix AddLockVersionToPolls migration
6 years ago
ThibG
cff221b519
Merge pull request #942 from ThibG/glitch-soc/merge-upstream
...
Merge upstream changes
6 years ago
ThibG
6b4eb1ac96
[Glitch] Disable the underlying button element when an ItemButton is disabled
...
Port 365f875f57
to glitch-soc
6 years ago
Thibaut Girka
f123b809a7
Merge branch 'master' into glitch-soc/merge-upstream
6 years ago
ThibG
4f2eb43d8a
Add optimistic lock to avoid race conditions when handling votes ( #10196 )
...
* Add optimistic lock to avoid race conditions when handling votes
* Force-reload polls when getting `ActiveRecord::StaleObjectError`
6 years ago
ThibG
365f875f57
Disable the underlying button element when an ItemButton is disabled ( #10194 )
...
Fixes #10191
6 years ago
ThibG
0b7c53937f
Disable file upload when there is a poll ( #10195 )
6 years ago
Thibaut Girka
8d82e153f3
Add an icon to highlight polls behind a Content Warning
6 years ago
ThibG
1397836898
Merge pull request #939 from ThibG/glitch-soc/merge-upstream
...
Merge upstream changes
6 years ago
Eugen Rochko
9844b44e99
Fix poll options not rendering text after vote/refresh
...
Port 9cae3a3b48
to glitch-soc
6 years ago
Eugen Rochko
31017d18a5
Avoid line breaks in poll options
...
Port 0d8890f073
to glitch-soc
6 years ago
Eugen Rochko
3ce4d88e6c
Render unicode emoji in polls using emoji pack
...
Port 73d3bb4a2c
to glitch-soc
6 years ago
Thibaut Girka
3ebbc1f017
Merge branch 'master' into glitch-soc/merge-upstream
6 years ago
dependabot[bot]
67764e36f9
Bump active_record_query_trace from 1.5.4 to 1.6 ( #10192 )
...
Bumps [active_record_query_trace](https://github.com/brunofacca/active-record-query-trace ) from 1.5.4 to 1.6.
- [Release notes](https://github.com/brunofacca/active-record-query-trace/releases )
- [Changelog](https://github.com/brunofacca/active-record-query-trace/blob/v1.6/HISTORY.md )
- [Commits](https://github.com/brunofacca/active-record-query-trace/compare/v1.5.4...v1.6 )
Signed-off-by: dependabot[bot] <support@dependabot.com>
6 years ago
Eugen Rochko
9cae3a3b48
Fix poll options not rendering text after vote/refresh ( #10189 )
...
* Fix poll options not rendering text after vote/refresh
* Fix poll options not showing up on public pages
* Fix code style issue
6 years ago
Eugen Rochko
0d8890f073
Avoid line breaks in poll options ( #10188 )
6 years ago
Eugen Rochko
1441046fdf
Fix poll validation issues ( #10186 )
...
- Fix missing interpolation argument in PollValidator
- Fix PollValidator rejecting exact allowed min/max durations
6 years ago
Eugen Rochko
a15b0dc600
Add UI for creating polls ( #10184 )
...
* Add actions and reducers for polls
* Add poll button
* Disable media upload if poll enabled
* Add poll form
* Make delete & redraft work with polls
6 years ago
Eugen Rochko
73d3bb4a2c
Render unicode emoji in polls using emoji pack ( #10185 )
6 years ago
Thibaut Girka
bd97259b57
Fix toots opening in dynamic column when trying to interact with them
...
This fixes inline preview cards and polls, preventing them from opening
the toot in detailed view when clicking on an interactive element.
6 years ago
ThibG
66206bf2f9
Merge pull request #938 from ThibG/glitch-soc/merge-upstream
...
Merge upstream changes
6 years ago
Thibaut Girka
9cb4a4c14e
Merge branch 'master' into glitch-soc/merge-upstream
6 years ago
ThibG
46f837a107
Fix newlines in OStatus and RSS serializations ( #10183 )
6 years ago
Thibaut Girka
6ad1fc3254
[Glitch] Perform deep comparison for card data when receiving new props
...
Prevents embedded players from resetting when interacting with the toot
6 years ago