91045bef61
Merge pull request #953 from ThibG/glitch-soc/merge-upstream
...
Merge upstream changes
2019-03-11 13:23:54 +01:00
3a7fb657f3
[Glitch] Add support for poll ending notifications
...
Port front-end parts of 11ce444b8b
2019-03-11 13:08:21 +01:00
bd6951a15d
Do not leak instance-local polls to remote followers
2019-03-11 13:08:20 +01:00
00bc35891b
add local setting to auto reveal media behind cw
2019-03-11 12:14:45 +01:00
2172dec88d
fix poll fotter layout
...
画面の幅が充分でないときに
表示外にまでボタンが拡大されてしまわないように修正。
2019-03-11 12:09:30 +01:00
33001891b6
Merge branch 'master' into glitch-soc/merge-upstream
...
Conflicts:
- app/services/post_status_service.rb
Small conflict due to handling of instance-local toots.
A subsequent change is required to ensure instance-local polls are not leaked
through Update.
2019-03-11 11:23:50 +01:00
cdf5a7f854
Avoid race conditions when creating backups ( #10234 )
...
Under load, multiple backups for a single user could be planned, which
is very expensive.
2019-03-11 00:50:31 +01:00
11ce444b8b
Support pushing and receiving updates to poll tallies ( #10209 )
...
* Process incoming poll tallies update
* Send Update on poll vote
* Do not send Updates for a poll more often than once every 3 minutes
* Include voters in people to notify of results update
* Schedule closing poll worker on poll creation
* Add new notification type for ending polls
* Add front-end support for ended poll notifications
* Fix UpdatePollSerializer
* Fix Updates not being triggered by local votes
* Fix tests failure
* Fix web push notifications for closing polls
* Minor cleanup
* Notify voters of both remote and local polls when those close
* Fix delivery of poll updates to mentioned accounts and voters
2019-03-11 00:49:31 +01:00
88d4b28714
Merge branch 'master' into glitch-soc/merge-upstream
2019-03-10 16:48:44 +01:00
05aa8b9303
Reject existing Follows when suspending a remote account ( #10230 )
...
* Reject existing Follows when suspending a remote account
Partial fix to #10229
* Add tests
2019-03-10 16:18:58 +01:00
caa40e9d9b
Change joinmastodon.org to joinmastodon.org/#getting-started for sign up on another server ( #10224 )
2019-03-09 17:07:59 +01:00
dad42ecee0
Merge pull request #947 from ThibG/glitch-soc/merge-upstream
...
Merge upstream changes
2019-03-08 20:43:51 +01:00
96e7f430de
Fix min/max duration poll limits being inverted
2019-03-08 20:43:18 +01:00
bed7758022
Merge branch 'master' into glitch-soc/merge-upstream
2019-03-08 20:15:57 +01:00
32f0cc5ccd
Fix setting up fields of a previously suspended account ( #10222 )
...
Fix #10177 for real
2019-03-08 19:59:08 +01:00
b9a799c343
[Glitch] Fix NaN in Poll component
...
Port 19cccea89a
2019-03-08 01:01:19 +01:00
7565b8afa3
[Glitch] Fix public timelines being broken by new toots when they are not mounted
...
Port 8e9db67a6a
2019-03-08 01:00:14 +01:00
9b093dfcde
Merge branch 'master' into glitch-soc/merge-upstream
2019-03-08 00:57:13 +01:00
dcbe6c16ba
Do not allow adding votes to expired polls ( #10214 )
...
* Do not allow adding votes to expired polls
* Only validate expires_at on create
2019-03-08 00:54:50 +01:00
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
2019-03-07 22:53:47 +01:00
19cccea89a
Fix NaN in Poll component ( #10213 )
2019-03-07 22:18:05 +01:00
8e9db67a6a
Fix public timelines being broken by new toots when they are not mounted ( #10131 )
2019-03-07 22:17:52 +01:00
641384d288
Handle StaleObjectError when retrieving polls ( #10208 )
2019-03-07 15:52:38 +01:00
d8d8c64965
Merge branch 'master' into glitch-soc/merge-upstream
2019-03-07 13:24:30 +01:00
5232eccc5c
i18n: 🇵🇱 ( #10199 )
...
Signed-off-by: Marcin Mikołajczak <me@m4sk.in>
2019-03-07 02:52:43 +01:00
db21a6c5ee
Avoid unnecessarily fetching the replies collection when it is empty ( #10201 )
2019-03-07 01:50:37 +01:00
ed3d470069
Fix #10202 ( #10203 )
2019-03-07 01:49:42 +01:00
a9597fd8a6
Allow setting whether this is a single choice poll or multiple choices one
2019-03-06 23:56:53 +01:00
81a92465f2
Disable file upload when there is a poll
2019-03-06 23:56:53 +01:00
49c4e57973
Use server-provided poll limits instead of hardcoded ones
...
Also does not enable polls if no limits are provided by the server
2019-03-06 23:56:53 +01:00
9f06da948b
Serialize poll limits in instance serializer and initial state
2019-03-06 23:56:53 +01:00
e2d56cc90d
[Glitch] Port polls creation UI from upstream
2019-03-06 23:56:53 +01:00
6b4eb1ac96
[Glitch] Disable the underlying button element when an ItemButton is disabled
...
Port 365f875f57
2019-03-06 22:40:17 +01:00
f123b809a7
Merge branch 'master' into glitch-soc/merge-upstream
2019-03-06 22:39:22 +01:00
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`
2019-03-06 19:53:57 +01:00
365f875f57
Disable the underlying button element when an ItemButton is disabled ( #10194 )
...
Fixes #10191
2019-03-06 15:10:32 +01:00
0b7c53937f
Disable file upload when there is a poll ( #10195 )
2019-03-06 15:09:18 +01:00
8d82e153f3
Add an icon to highlight polls behind a Content Warning
2019-03-06 13:01:27 +01:00
9844b44e99
Fix poll options not rendering text after vote/refresh
...
Port 9cae3a3b48
2019-03-06 11:44:27 +01:00
31017d18a5
Avoid line breaks in poll options
...
Port 0d8890f073
2019-03-06 11:43:14 +01:00
3ce4d88e6c
Render unicode emoji in polls using emoji pack
...
Port 73d3bb4a2c
2019-03-06 11:42:25 +01:00
3ebbc1f017
Merge branch 'master' into glitch-soc/merge-upstream
2019-03-06 11:29:06 +01:00
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
2019-03-06 05:35:52 +01:00
0d8890f073
Avoid line breaks in poll options ( #10188 )
2019-03-06 04:54:32 +01:00
1441046fdf
Fix poll validation issues ( #10186 )
...
- Fix missing interpolation argument in PollValidator
- Fix PollValidator rejecting exact allowed min/max durations
2019-03-06 04:54:11 +01:00
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
2019-03-06 04:53:37 +01:00
73d3bb4a2c
Render unicode emoji in polls using emoji pack ( #10185 )
2019-03-06 03:57:46 +01:00
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.
2019-03-06 00:20:43 +01:00
9cb4a4c14e
Merge branch 'master' into glitch-soc/merge-upstream
2019-03-06 00:03:46 +01:00
46f837a107
Fix newlines in OStatus and RSS serializations ( #10183 )
2019-03-05 23:58:58 +01:00
ThibG