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.
6 years ago
457cfafad4
Fix error in AdminMailer#new_pending_account ( #10264 )
6 years ago
bd094f1c78
Fix wrong method used in PollExpirationNotifyWorker ( #10265 )
6 years ago
73fb7bfa0f
Admission-based registrations mode ( #10250 )
...
Fix #6856
Fix #6951
6 years ago
2e6c6ce855
Improve invites list with click-to-copy inputs ( #10259 )
6 years ago
3592fc182d
Refactor User model, extract PamAuthenticable, LdapAuthenticable ( #10217 )
6 years ago
103278e29a
[Security] Bump rails from 5.2.2 to 5.2.2.1 ( #10257 )
...
Bumps [rails](https://github.com/rails/rails ) from 5.2.2 to 5.2.2.1. **This update includes security fixes.**
- [Release notes](https://github.com/rails/rails/releases )
- [Commits](https://github.com/rails/rails/compare/v5.2.2...v5.2.2.1 )
Signed-off-by: dependabot[bot] <support@dependabot.com>
6 years ago
161fb3671c
Merge pull request #958 from ThibG/glitch-soc/merge-upstream
...
Merge upstream changes
6 years ago
0381a07606
[Glitch] Add UI for enabling/disabling poll notifications
6 years ago
5ce73f89f1
Merge branch 'master' into glitch-soc/merge-upstream
6 years ago
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
6 years ago
ce9a322c0a
Merge pull request #957 from ThibG/glitch-soc/merge-upstream
...
Merge upstream changes
6 years ago
177258aa57
[Glitch] Add muted style for polls in web UI
...
Port de50bc6def
6 years ago
ac5169aa31
[Glitch] Fix public timeline page not paginating correctly
...
Port 3a435fa130
6 years ago
21366f9e05
[Glitch] Redesign landing page
...
Port 56822606f4
6 years ago
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
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.
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
f326de90ef
Bump active_record_query_trace from 1.6.1 to 1.6.2 ( #10252 )
...
Bumps [active_record_query_trace](https://github.com/brunofacca/active-record-query-trace ) from 1.6.1 to 1.6.2.
- [Release notes](https://github.com/brunofacca/active-record-query-trace/releases )
- [Changelog](https://github.com/brunofacca/active-record-query-trace/blob/master/HISTORY.md )
- [Commits](https://github.com/brunofacca/active-record-query-trace/compare/v1.6.1...v1.6.2 )
Signed-off-by: dependabot[bot] <support@dependabot.com>
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
9c76fab112
Bump concurrent-ruby from 1.1.4 to 1.1.5 ( #10242 )
...
Bumps [concurrent-ruby](https://github.com/ruby-concurrency/concurrent-ruby ) from 1.1.4 to 1.1.5.
- [Release notes](https://github.com/ruby-concurrency/concurrent-ruby/releases )
- [Changelog](https://github.com/ruby-concurrency/concurrent-ruby/blob/master/CHANGELOG.md )
- [Commits](https://github.com/ruby-concurrency/concurrent-ruby/compare/v1.1.4...v1.1.5 )
Signed-off-by: dependabot[bot] <support@dependabot.com>
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
ce56a44760
Merge pull request #955 from ThibG/glitch-soc/merge-upstream
...
Merge upstream changes
6 years ago
edd48921c6
Merge branch 'master' into glitch-soc/merge-upstream
6 years ago
b80943b08b
Bump aws-sdk-s3 from 1.30.1 to 1.31.0 ( #10236 )
...
Bumps [aws-sdk-s3](https://github.com/aws/aws-sdk-ruby ) from 1.30.1 to 1.31.0.
- [Release notes](https://github.com/aws/aws-sdk-ruby/releases )
- [Changelog](https://github.com/aws/aws-sdk-ruby/blob/master/gems/aws-sdk-s3/CHANGELOG.md )
- [Commits](https://github.com/aws/aws-sdk-ruby/compare/1.30.1...1.31.0 )
Signed-off-by: dependabot[bot] <support@dependabot.com>
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
e7bc85a91a
Add `tootctl statuses remove` to sweep unreferenced statuses ( #10063 )
...
Query by @tateisu
Fix #1554
6 years ago
5101d1ea41
Bump pkg-config from 1.3.5 to 1.3.6 ( #10235 )
...
Bumps [pkg-config](https://github.com/ruby-gnome2/pkg-config ) from 1.3.5 to 1.3.6.
- [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.5...1.3.6 )
Signed-off-by: dependabot[bot] <support@dependabot.com>
6 years ago
d8d9c9b983
Bump active_record_query_trace from 1.6 to 1.6.1 ( #10237 )
...
Bumps [active_record_query_trace](https://github.com/brunofacca/active-record-query-trace ) from 1.6 to 1.6.1.
- [Release notes](https://github.com/brunofacca/active-record-query-trace/releases )
- [Changelog](https://github.com/brunofacca/active-record-query-trace/blob/master/HISTORY.md )
- [Commits](https://github.com/brunofacca/active-record-query-trace/compare/v1.6...v1.6.1 )
Signed-off-by: dependabot[bot] <support@dependabot.com>
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
5bc62cee47
Fix streaming API always attempting to use SSL with Postgres ( #10231 )
...
Fix #10223
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
dc285ec4ca
Merge pull request #950 from ThibG/glitch-soc/merge-upstream
...
Merge upstream changes
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
d182fec01a
Fix SSL configuration regression in streaming API ( #10225 )
...
* Fix SSL configuration regression in streaming API
Fix #10223
* Fix code style issues and integrate #10219
* Fix dumb thing
6 years ago
Thibaut Girka
Eugen Rochko
dependabot[bot]
mayaeh
Aurélien Reeves
ash lea
Kirishima21