80ae1f7bcf
[Glitch] Admission-based registrations mode
...
Port SCSS changes from 73fb7bfa0f
2019-03-14 17:54:44 +01:00
c128abc413
[Glitch] Improve invites list with click-to-copy inputs
...
Port 2e6c6ce855
2019-03-14 17:44:39 +01:00
741766a01d
Merge branch 'master' into glitch-soc/merge-upstream
...
Conflicts:
- app/views/admin/settings/edit.html.haml:
Conflict due to how the theming settings change.
2019-03-14 17:17:20 +01:00
457cfafad4
Fix error in AdminMailer#new_pending_account ( #10264 )
2019-03-14 14:20:22 +01:00
bd094f1c78
Fix wrong method used in PollExpirationNotifyWorker ( #10265 )
2019-03-14 14:04:07 +01:00
73fb7bfa0f
Admission-based registrations mode ( #10250 )
...
Fix #6856
Fix #6951
2019-03-14 05:28:30 +01:00
2e6c6ce855
Improve invites list with click-to-copy inputs ( #10259 )
2019-03-14 05:25:49 +01:00
3592fc182d
Refactor User model, extract PamAuthenticable, LdapAuthenticable ( #10217 )
2019-03-14 02:13:42 +01:00
0381a07606
[Glitch] Add UI for enabling/disabling poll notifications
2019-03-13 22:21:52 +01:00
5ce73f89f1
Merge branch 'master' into glitch-soc/merge-upstream
2019-03-13 21:35:43 +01:00
104c3879aa
Add UI for enabling/disabling poll notifications ( #10255 )
...
* Add UI for enabling/disabling poll notifications
* Add poll notifications to the (advanced) quick filter bar
* Update poll notification message
“Your poll has ended” → “A poll you have voted in has ended”
* Clear up associated notifications when a poll is deleted
2019-03-13 19:29:54 +01:00
177258aa57
[Glitch] Add muted style for polls in web UI
...
Port de50bc6def
2019-03-13 16:02:36 +01:00
ac5169aa31
[Glitch] Fix public timeline page not paginating correctly
...
Port 3a435fa130
2019-03-13 15:56:51 +01:00
21366f9e05
[Glitch] Redesign landing page
...
Port 56822606f4
2019-03-13 15:53:00 +01:00
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
2019-03-13 15:16:02 +01:00
c130aebba8
i18n: Add Japanese translations for new landing page ( #10254 )
...
* yarn manage:translations && i18n-tasks add-missing
* Update Japanese translations for new landing page.
I don't change the tagline from English yet.
I think that translating a tagline is difficult and requires time-consuming discussions.
Some translations related about the poll are already done in Weblate, so I will leave it as it is.
2019-03-13 14:56:40 +01:00
5ff943716e
Fix `tagged` param not being normalized before querying tags ( #10249 )
2019-03-13 13:02:13 +01:00
9d214f30ae
Fix to limit to discoverable accounts. ( #10253 )
2019-03-13 13:01:57 +01:00
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
2019-03-12 22:58:59 +01:00
45d257a20f
Optimize RemoveStatusService by removing n+1 query and using shared inboxes ( #10247 )
2019-03-12 22:34:55 +01:00
de50bc6def
Add muted style for polls in web UI ( #10248 )
2019-03-12 22:08:18 +01:00
3a435fa130
Fix public timeline page not paginating correctly ( #10245 )
2019-03-12 21:53:56 +01:00
56822606f4
Redesign landing page ( #10232 )
2019-03-12 17:34:00 +01:00
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.
2019-03-11 20:48:24 +01:00
2572884347
Fix remote interaction dialogs being indexed by search engines ( #10240 )
...
Fix #10116
2019-03-11 20:47:50 +01:00
edd48921c6
Merge branch 'master' into glitch-soc/merge-upstream
2019-03-11 17:31:02 +01:00
043978a20e
Remove leftover console.log
2019-03-11 14:39:45 +01:00
1e4ea4f391
Make clicking on the account and status column headers scroll to top
2019-03-11 14:19:16 +01:00
154c8a0302
Increase DNS timeouts ( #10238 )
2019-03-11 13:27:57 +01:00
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
Eugen Rochko