Commit graph

8987 commits

Author SHA1 Message Date
ThibG
641eb78740 Merge pull request #960 from ThibG/glitch-soc/merge-upstream
Merge upstream changes
2019-03-14 22:11:56 +01:00
Aditoo17
bb98b4e8f8 I18n: Update Czech translation (#10272) 2019-03-14 20:59:26 +01:00
Thibaut Girka
c40e812a66 Merge branch 'master' into glitch-soc/merge-upstream 2019-03-14 20:11:17 +01:00
ThibG
bd3ad7fd16 Migrate existing open_registrations setting to the new registrations_mode (#10269)
* Migrate existing `open_registrations` setting to the new `registrations_mode`

Fixes #10263

* Remove unrelated db changes that have creeped in
2019-03-14 20:10:43 +01:00
Eugen Rochko
80ae1f7bcf [Glitch] Admission-based registrations mode
Port SCSS changes from 73fb7bfa0f to glitch-soc
2019-03-14 17:54:44 +01:00
Eugen Rochko
c128abc413 [Glitch] Improve invites list with click-to-copy inputs
Port 2e6c6ce855 to glitch-soc
2019-03-14 17:44:39 +01:00
Thibaut Girka
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
Eugen Rochko
457cfafad4 Fix error in AdminMailer#new_pending_account (#10264) 2019-03-14 14:20:22 +01:00
Eugen Rochko
bd094f1c78 Fix wrong method used in PollExpirationNotifyWorker (#10265) 2019-03-14 14:04:07 +01:00
Eugen Rochko
73fb7bfa0f Admission-based registrations mode (#10250)
Fix #6856
Fix #6951
2019-03-14 05:28:30 +01:00
Eugen Rochko
2e6c6ce855 Improve invites list with click-to-copy inputs (#10259) 2019-03-14 05:25:49 +01:00
Eugen Rochko
3592fc182d Refactor User model, extract PamAuthenticable, LdapAuthenticable (#10217) 2019-03-14 02:13:42 +01:00
dependabot[bot]
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>
2019-03-14 00:25:53 +01:00
ThibG
161fb3671c Merge pull request #958 from ThibG/glitch-soc/merge-upstream
Merge upstream changes
2019-03-13 23:44:37 +01:00
ThibG
0381a07606 [Glitch] Add UI for enabling/disabling poll notifications 2019-03-13 22:21:52 +01:00
Thibaut Girka
5ce73f89f1 Merge branch 'master' into glitch-soc/merge-upstream 2019-03-13 21:35:43 +01:00
ThibG
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
ThibG
ce9a322c0a Merge pull request #957 from ThibG/glitch-soc/merge-upstream
Merge upstream changes
2019-03-13 16:55:07 +01:00
Eugen Rochko
177258aa57 [Glitch] Add muted style for polls in web UI
Port de50bc6def to glitch-soc
2019-03-13 16:02:36 +01:00
Eugen Rochko
ac5169aa31 [Glitch] Fix public timeline page not paginating correctly
Port 3a435fa130 to glitch-soc
2019-03-13 15:56:51 +01:00
Eugen Rochko
21366f9e05 [Glitch] Redesign landing page
Port 56822606f4 to glitch-soc
2019-03-13 15:53:00 +01:00
Thibaut Girka
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
mayaeh
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
Eugen Rochko
5ff943716e Fix tagged param not being normalized before querying tags (#10249) 2019-03-13 13:02:13 +01:00
mayaeh
9d214f30ae Fix to limit to discoverable accounts. (#10253) 2019-03-13 13:01:57 +01:00
dependabot[bot]
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>
2019-03-13 14:57:02 +09:00
Eugen Rochko
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
Eugen Rochko
45d257a20f Optimize RemoveStatusService by removing n+1 query and using shared inboxes (#10247) 2019-03-12 22:34:55 +01:00
Eugen Rochko
de50bc6def Add muted style for polls in web UI (#10248) 2019-03-12 22:08:18 +01:00
Eugen Rochko
3a435fa130 Fix public timeline page not paginating correctly (#10245) 2019-03-12 21:53:56 +01:00
Eugen Rochko
56822606f4 Redesign landing page (#10232) 2019-03-12 17:34:00 +01:00
dependabot[bot]
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>
2019-03-12 13:05:20 +01:00
Aurélien Reeves
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
Eugen Rochko
2572884347 Fix remote interaction dialogs being indexed by search engines (#10240)
Fix #10116
2019-03-11 20:47:50 +01:00
ThibG
ce56a44760 Merge pull request #955 from ThibG/glitch-soc/merge-upstream
Merge upstream changes
2019-03-11 17:52:18 +01:00
Thibaut Girka
edd48921c6 Merge branch 'master' into glitch-soc/merge-upstream 2019-03-11 17:31:02 +01:00
dependabot[bot]
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>
2019-03-11 15:29:07 +01:00
Thibaut Girka
043978a20e Remove leftover console.log 2019-03-11 14:39:45 +01:00
Thibaut Girka
1e4ea4f391 Make clicking on the account and status column headers scroll to top 2019-03-11 14:19:16 +01:00
Eugen Rochko
e7bc85a91a Add tootctl statuses remove to sweep unreferenced statuses (#10063)
Query by @tateisu

Fix #1554
2019-03-11 13:45:17 +01:00
dependabot[bot]
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>
2019-03-11 21:31:16 +09:00
dependabot[bot]
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>
2019-03-11 13:29:53 +01:00
ThibG
154c8a0302 Increase DNS timeouts (#10238) 2019-03-11 13:27:57 +01:00
ThibG
91045bef61 Merge pull request #953 from ThibG/glitch-soc/merge-upstream
Merge upstream changes
2019-03-11 13:23:54 +01:00
Thibaut Girka
3a7fb657f3 [Glitch] Add support for poll ending notifications
Port front-end parts of 11ce444b8b to glitch-soc
2019-03-11 13:08:21 +01:00
Thibaut Girka
bd6951a15d Do not leak instance-local polls to remote followers 2019-03-11 13:08:20 +01:00
ash lea
00bc35891b add local setting to auto reveal media behind cw 2019-03-11 12:14:45 +01:00
Kirishima21
2172dec88d fix poll fotter layout
画面の幅が充分でないときに
表示外にまでボタンが拡大されてしまわないように修正。
2019-03-11 12:09:30 +01:00
Thibaut Girka
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
Eugen Rochko
5bc62cee47 Fix streaming API always attempting to use SSL with Postgres (#10231)
Fix #10223
2019-03-11 00:51:23 +01:00