02062aab55
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
2019-03-13 15:16:02 +01:00
06663fcf87
Fix `tagged` param not being normalized before querying tags ( #10249 )
2019-03-13 13:02:13 +01:00
d4ef90eae3
Fix to limit to discoverable accounts. ( #10253 )
2019-03-13 13:01:57 +01:00
9f5b55ad4f
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
2019-03-12 22:58:59 +01:00
a41afef80c
Optimize RemoveStatusService by removing n+1 query and using shared inboxes ( #10247 )
2019-03-12 22:34:55 +01:00
5b50c2cbaa
Add muted style for polls in web UI ( #10248 )
2019-03-12 22:08:18 +01:00
da45b8b4c9
Fix public timeline page not paginating correctly ( #10245 )
2019-03-12 21:53:56 +01:00
65fffeac3f
Redesign landing page ( #10232 )
2019-03-12 17:34:00 +01:00
85537b0069
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.
2019-03-11 20:48:24 +01:00
f5eeac0104
Fix remote interaction dialogs being indexed by search engines ( #10240 )
...
Fix #10116
2019-03-11 20:47:50 +01:00
f3e7634156
Merge branch 'master' into glitch-soc/merge-upstream
2019-03-11 17:31:02 +01:00
a1c6e6de1b
Remove leftover console.log
2019-03-11 14:39:45 +01:00
4849eb8e7f
Make clicking on the account and status column headers scroll to top
2019-03-11 14:19:16 +01:00
79b00d294d
Increase DNS timeouts ( #10238 )
2019-03-11 13:27:57 +01:00
45e4c90a23
Merge pull request #953 from ThibG/glitch-soc/merge-upstream
...
Merge upstream changes
2019-03-11 13:23:54 +01:00
9c620fc5c8
[Glitch] Add support for poll ending notifications
...
Port front-end parts of 3a92885a86
2019-03-11 13:08:21 +01:00
7d026aa079
Do not leak instance-local polls to remote followers
2019-03-11 13:08:20 +01:00
f534f4869e
add local setting to auto reveal media behind cw
2019-03-11 12:14:45 +01:00
1bf035fb67
fix poll fotter layout
...
画面の幅が充分でないときに
表示外にまでボタンが拡大されてしまわないように修正。
2019-03-11 12:09:30 +01:00
89bee860cd
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
5506b9406d
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
3a92885a86
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
dfe7322922
Merge branch 'master' into glitch-soc/merge-upstream
2019-03-10 16:48:44 +01:00
c11dff5049
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
6c0a96912a
Change joinmastodon.org to joinmastodon.org/#getting-started for sign up on another server ( #10224 )
2019-03-09 17:07:59 +01:00
42cc93e892
Merge pull request #947 from ThibG/glitch-soc/merge-upstream
...
Merge upstream changes
2019-03-08 20:43:51 +01:00
93daa97fc3
Fix min/max duration poll limits being inverted
2019-03-08 20:43:18 +01:00
674fe32f97
Merge branch 'master' into glitch-soc/merge-upstream
2019-03-08 20:15:57 +01:00
3f4a6d44fe
Fix setting up fields of a previously suspended account ( #10222 )
...
Fix #10177 for real
2019-03-08 19:59:08 +01:00
ca45198ccb
[Glitch] Fix NaN in Poll component
...
Port 75cb93676b
2019-03-08 01:01:19 +01:00
6fe48dd050
[Glitch] Fix public timelines being broken by new toots when they are not mounted
...
Port be1c634b2b
2019-03-08 01:00:14 +01:00
5528719bc9
Merge branch 'master' into glitch-soc/merge-upstream
2019-03-08 00:57:13 +01:00
3aaac4f134
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
054bbb3da2
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
75cb93676b
Fix NaN in Poll component ( #10213 )
2019-03-07 22:18:05 +01:00
be1c634b2b
Fix public timelines being broken by new toots when they are not mounted ( #10131 )
2019-03-07 22:17:52 +01:00
09c042aa10
Handle StaleObjectError when retrieving polls ( #10208 )
2019-03-07 15:52:38 +01:00
9c5e7805cc
Merge branch 'master' into glitch-soc/merge-upstream
2019-03-07 13:24:30 +01:00
44475bbc9c
i18n: 🇵🇱 ( #10199 )
...
Signed-off-by: Marcin Mikołajczak <me@m4sk.in>
2019-03-07 02:52:43 +01:00
34f261e6af
Avoid unnecessarily fetching the replies collection when it is empty ( #10201 )
2019-03-07 01:50:37 +01:00
f44091d653
Fix #10202 ( #10203 )
2019-03-07 01:49:42 +01:00
84c807a0dc
Allow setting whether this is a single choice poll or multiple choices one
2019-03-06 23:56:53 +01:00
cb6e351f4d
Disable file upload when there is a poll
2019-03-06 23:56:53 +01:00
235be596bc
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
3b1390dc78
Serialize poll limits in instance serializer and initial state
2019-03-06 23:56:53 +01:00
8fe86cebaa
[Glitch] Port polls creation UI from upstream
2019-03-06 23:56:53 +01:00
6e295beab2
[Glitch] Disable the underlying button element when an ItemButton is disabled
...
Port b3668a79ec
2019-03-06 22:40:17 +01:00
cf4fd8bcfe
Merge branch 'master' into glitch-soc/merge-upstream
2019-03-06 22:39:22 +01:00
96f905f409
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
b3668a79ec
Disable the underlying button element when an ItemButton is disabled ( #10194 )
...
Fixes #10191
2019-03-06 15:10:32 +01:00
Thibaut Girka
Eugen Rochko
mayaeh
Aurélien Reeves
ash lea
Kirishima21
Aditoo17
marcin mikołajczak
rinsuki