d86033c352
Merge branch 'master' into glitch-soc/merge-upstream
...
Conflicts:
- app/controllers/about_controller.rb
- app/controllers/tags_controller.rb
- app/views/about/show.html.haml
- spec/views/about/show.html.haml_spec.rb
6 years ago
5ff943716e
Fix `tagged` param not being normalized before querying tags ( #10249 )
6 years ago
9d214f30ae
Fix to limit to discoverable accounts. ( #10253 )
6 years ago
d5377d0d45
Fix poll update handler calling method was that was not available ( #10246 )
...
* Fix poll update handler calling method was that was not available
Fix regression from #10209
* Refactor VoteService
* Refactor ActivityPub::DistributePollUpdateWorker and optimize it
* Fix typo
* Fix typo
6 years ago
45d257a20f
Optimize RemoveStatusService by removing n+1 query and using shared inboxes ( #10247 )
6 years ago
de50bc6def
Add muted style for polls in web UI ( #10248 )
6 years ago
3a435fa130
Fix public timeline page not paginating correctly ( #10245 )
6 years ago
56822606f4
Redesign landing page ( #10232 )
6 years ago
ae33129975
Squish username before validation ( #10239 )
...
* Squish username before validation (#10101 )
Fix #10101
* Move before_validation hook to a private method
Also add Unicode wite-spaces to the spec to support the use of squish
over strip.
6 years ago
2572884347
Fix remote interaction dialogs being indexed by search engines ( #10240 )
...
Fix #10116
6 years ago
edd48921c6
Merge branch 'master' into glitch-soc/merge-upstream
6 years ago
043978a20e
Remove leftover console.log
6 years ago
1e4ea4f391
Make clicking on the account and status column headers scroll to top
6 years ago
154c8a0302
Increase DNS timeouts ( #10238 )
6 years ago
91045bef61
Merge pull request #953 from ThibG/glitch-soc/merge-upstream
...
Merge upstream changes
6 years ago
3a7fb657f3
[Glitch] Add support for poll ending notifications
...
Port front-end parts of 11ce444b8b
6 years ago
bd6951a15d
Do not leak instance-local polls to remote followers
6 years ago
00bc35891b
add local setting to auto reveal media behind cw
6 years ago
2172dec88d
fix poll fotter layout
...
画面の幅が充分でないときに
表示外にまでボタンが拡大されてしまわないように修正。
6 years ago
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.
6 years ago
cdf5a7f854
Avoid race conditions when creating backups ( #10234 )
...
Under load, multiple backups for a single user could be planned, which
is very expensive.
6 years ago
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
6 years ago
88d4b28714
Merge branch 'master' into glitch-soc/merge-upstream
6 years ago
05aa8b9303
Reject existing Follows when suspending a remote account ( #10230 )
...
* Reject existing Follows when suspending a remote account
Partial fix to #10229
* Add tests
6 years ago
caa40e9d9b
Change joinmastodon.org to joinmastodon.org/#getting-started for sign up on another server ( #10224 )
6 years ago
dad42ecee0
Merge pull request #947 from ThibG/glitch-soc/merge-upstream
...
Merge upstream changes
6 years ago
96e7f430de
Fix min/max duration poll limits being inverted
6 years ago
bed7758022
Merge branch 'master' into glitch-soc/merge-upstream
6 years ago
32f0cc5ccd
Fix setting up fields of a previously suspended account ( #10222 )
...
Fix #10177 for real
6 years ago
b9a799c343
[Glitch] Fix NaN in Poll component
...
Port 19cccea89a
6 years ago
7565b8afa3
[Glitch] Fix public timelines being broken by new toots when they are not mounted
...
Port 8e9db67a6a
6 years ago
9b093dfcde
Merge branch 'master' into glitch-soc/merge-upstream
6 years ago
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
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
19cccea89a
Fix NaN in Poll component ( #10213 )
6 years ago
8e9db67a6a
Fix public timelines being broken by new toots when they are not mounted ( #10131 )
6 years ago
641384d288
Handle StaleObjectError when retrieving polls ( #10208 )
6 years ago
d8d8c64965
Merge branch 'master' into glitch-soc/merge-upstream
6 years ago
5232eccc5c
i18n: 🇵🇱 ( #10199 )
...
Signed-off-by: Marcin Mikołajczak <me@m4sk.in>
6 years ago
db21a6c5ee
Avoid unnecessarily fetching the replies collection when it is empty ( #10201 )
6 years ago
ed3d470069
Fix #10202 ( #10203 )
6 years ago
a9597fd8a6
Allow setting whether this is a single choice poll or multiple choices one
6 years ago
81a92465f2
Disable file upload when there is a poll
6 years ago
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
9f06da948b
Serialize poll limits in instance serializer and initial state
6 years ago
e2d56cc90d
[Glitch] Port polls creation UI from upstream
6 years ago
6b4eb1ac96
[Glitch] Disable the underlying button element when an ItemButton is disabled
...
Port 365f875f57
6 years ago
f123b809a7
Merge branch 'master' into glitch-soc/merge-upstream
6 years ago
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
365f875f57
Disable the underlying button element when an ItemButton is disabled ( #10194 )
...
Fixes #10191
6 years ago
Thibaut Girka
Eugen Rochko
mayaeh
Aurélien Reeves
ash lea
Kirishima21
Aditoo17
marcin mikołajczak
rinsuki