17cd443b37
Bump webmock from 3.4.2 to 3.5.1 ( #9641 )
...
Bumps [webmock](https://github.com/bblimke/webmock ) from 3.4.2 to 3.5.1.
- [Release notes](https://github.com/bblimke/webmock/releases )
- [Changelog](https://github.com/bblimke/webmock/blob/master/CHANGELOG.md )
- [Commits](https://github.com/bblimke/webmock/compare/v3.4.2...v3.5.1 )
Signed-off-by: dependabot[bot] <support@dependabot.com>
2018-12-27 12:23:27 +01:00
ee1ba59692
Add exclude_reblogs option to account statuses API ( #9640 )
...
Fix #9606
2018-12-27 03:42:35 +01:00
9b8c7a9aad
Redirect to reports overview instead of report after account action ( #9639 )
2018-12-27 03:42:29 +01:00
f63a0134d7
[i18n] OC/CAT/FR «crop» => «change preview» ( #9636 )
...
* Rename "crop" to "change preview" (tootsuite#9616)
* Rename "crop" to "change preview" (tootsuite#9616)
* Rename "crop" to "change preview" (tootsuite#9616)
2018-12-26 19:16:40 +01:00
4423999609
Fix account unsilencing and unsuspension ( #9637 )
...
Fix regression from 3c033c4352
2018-12-26 19:16:15 +01:00
aa9a20cde0
Fix ThreadResolveWorker getting queued with invalid URLs ( #9628 )
2018-12-26 19:15:53 +01:00
17cd91c777
Fix signature verification stoplight triggering on non-timeout errors ( #9617 )
2018-12-26 19:15:43 +01:00
f349fe2159
Fix account unsilencing and unsuspension
...
Fix regression from 3c033c4352
2018-12-26 19:13:54 +01:00
8be0843467
Bump cld3 from 3.2.2 to 3.2.3 ( #9632 )
...
Bumps [cld3](https://github.com/akihikodaki/cld3-ruby ) from 3.2.2 to 3.2.3.
- [Release notes](https://github.com/akihikodaki/cld3-ruby/releases )
- [Commits](https://github.com/akihikodaki/cld3-ruby/compare/v3.2.2...v3.2.3 )
Signed-off-by: dependabot[bot] <support@dependabot.com>
2018-12-26 06:39:17 +01:00
a8ba291beb
Fix scope latest of ReportNote ( #9630 )
2018-12-26 06:38:59 +01:00
0c1e4bb969
Create DomainNormalizable#normalize_domain ( #9631 )
2018-12-26 06:38:42 +01:00
bf70e5cfda
Add error message with invalid email confirmation ( #9625 )
2018-12-25 19:35:26 +01:00
6641a1cac9
Remove Form::StatusBatch::ACTION_TYPE unused ( #9623 )
2018-12-25 18:29:51 +01:00
fd16502ae4
Add support for Malayalam in language filter ( #9624 )
2018-12-25 18:29:30 +01:00
5d2fc6de32
Add REST API for creating an account ( #9572 )
...
* Add REST API for creating an account
The method is available to apps with a token obtained via the client
credentials grant. It creates a user and account records, as well as
an access token for the app that initiated the request. The user is
unconfirmed, and an e-mail is sent as usual.
The method returns the access token, which the app should save for
later. The REST API is not available to users with unconfirmed
accounts, so the app must be smart to wait for the user to click a
link in their e-mail inbox.
The method is rate-limited by IP to 5 requests per 30 minutes.
* Redirect users back to app from confirmation if they were created with an app
* Add tests
* Return 403 on the method if registrations are not open
* Require agreement param to be true in the API when creating an account
2018-12-24 19:12:38 +01:00
acf9358c52
Rename "crop" to "change preview" ( #9616 )
2018-12-24 19:12:18 +01:00
2ee779dcd3
Update emoji codepoint mappings to v11.0 ( #9618 )
2018-12-24 19:12:00 +01:00
5f387995d9
Limit maximum visibility of local silenced users to unlisted ( #9583 )
...
Fixes #9580
2018-12-24 19:06:14 +01:00
8a3e4a4883
Merge pull request #871 from ThibG/glitch-soc/merge-upstream
...
Merge upstream changes
2018-12-23 15:23:12 +01:00
cb98e7dbd3
[Glitch] Add moderation warnings
...
Port SCSS changes from 3c033c4352
2018-12-23 12:54:09 +01:00
71d683b410
Change instance_presenter_spec to point to glitch-soc instead of tootsuite
2018-12-23 11:45:26 +01:00
82088f0d7d
[Glitch] Remove links to bridge.joinmastodon.org (non-functional)
...
Port bb62827c16
2018-12-23 11:43:47 +01:00
c5c4450fdd
Remove file added by error
2018-12-23 11:43:25 +01:00
22dedb676b
[Glitch] Fix unnecessary loadMore calls when the end of a timeline has been reached
...
Port 8389b496ba
2018-12-23 11:40:52 +01:00
3e686beaea
Merge branch 'master' into glitch-soc/merge-upstream
...
Conflicts:
- config/routes.rb
Upstream changed some admin routes, conflict was because of an added :show
action for statuses on our side. Kept it.
2018-12-23 11:28:28 +01:00
e25947db4a
Sanitize and sandbox toot embeds ( #9552 )
2018-12-23 02:16:35 +01:00
bb62827c16
Remove links to bridge.joinmastodon.org (non-functional) ( #9608 )
...
Add link to profile directory
2018-12-22 23:32:00 +01:00
59e333385b
Show 40 profiles per directory page instead of 30 ( #9609 )
...
To better align with the list of hashtags
2018-12-22 23:31:23 +01:00
3c033c4352
Add moderation warnings ( #9519 )
...
* Add moderation warnings
Replace individual routes for disabling, silencing, and suspending
a user, as well as the report update route, with a unified account
action controller that allows you to select an action (none,
disable, silence, suspend) as well as whether it should generate an
e-mail notification with optional custom text. That notification,
with the optional custom text, is saved as a warning.
Additionally, there are warning presets you can configure to save
time when performing the above.
* Use Account#local_username_and_domain
2018-12-22 20:02:09 +01:00
00862dcaff
[i18n] Occitan update ( #9607 )
...
* Update for new On Board messages
* Update oc.json
2018-12-22 18:27:03 +01:00
bd4ee732c2
Remove MailerHelper does nothing ( #9604 )
2018-12-22 02:35:55 +01:00
1a3088364f
Fix composer not getting focus after reply confirmation dialog
...
The modal-handling code gives back focus to the element focused when the
modal opened. However, in the case of reply confirmation, it would do so
*after* the composer code itself requested focus.
2018-12-21 20:00:49 +01:00
0605c004a5
Fix incorrect and duplicate onConfirm callback
2018-12-21 20:00:49 +01:00
6166751f9e
[Glitch] Fix that translation is not applied to "joining hashtags"
...
Port bfec030a4e
2018-12-21 19:54:54 +01:00
3611ea02e2
[Glitch] Deep compare tags for hashtag column reload
...
Port 4fdefffb99
2018-12-21 19:54:54 +01:00
4be7313298
[Glitch] Allow joining several hashtags in a single column
...
Port 4c03e05a4e
2018-12-21 19:54:54 +01:00
aa0e1ff286
i18n: Update Polish translation ( #9594 )
...
Signed-off-by: Marcin Mikołajczak <me@m4sk.in>
2018-12-21 18:56:24 +01:00
eee2b05ea2
Add specs for CustomEmojiFilter ( #9599 )
2018-12-21 18:52:57 +01:00
a6079a42b6
Fix composer not getting focus after reply confirmation dialog ( #9602 )
...
The modal-handling code gives back focus to the element focused when the
modal opened. However, in the case of reply confirmation, it would do so
*after* the composer code itself requested focus.
2018-12-21 18:52:41 +01:00
de3cecf37a
Add specs for AdminMailer ( #9597 )
2018-12-21 09:34:34 +01:00
1bc78ec50e
Add specs for InstancePresenter ( #9596 )
2018-12-21 08:59:56 +01:00
240c122767
Skip mailer job retries when a record no longer exists ( #9590 )
...
Fix #8666
2018-12-21 06:16:17 +01:00
6073195a7d
[Glitch] Display customized mascot in web UI
...
Port relevant parts of 9d4541c612
2018-12-20 18:39:05 +01:00
fb63941c47
Make drawer markup and styling closer to upstream
...
WARNING: This may break some custom skins!
`.drawer > .contents` has been moved to
`.drawer > .drawer__pager > .drawer__iner`, and the waves have been moved
from `.drawer > .contents` to `.drawer__inner__mastodon`!
2018-12-20 18:39:05 +01:00
6a2d030c2f
Add specs for ReportNotePolicy ( #9592 )
2018-12-20 17:52:18 +01:00
b93e317886
Add specs for policies ( #9591 )
...
* Add spec for RelayPolicy
* Add specs for SubscriptionPolicy
* Add specs for SettingsPolicy
* Add specs for TagPolicy
* Add specs for ReportPolicy
2018-12-20 17:52:07 +01:00
be9640bfc2
Add specs for UserPolicy ( #9593 )
2018-12-20 17:51:55 +01:00
5eaf2c9e02
[Glitch] Back to the getting-started when pins the timeline
...
Port 5bf100f87b
2018-12-20 14:51:28 +01:00
bc113927d6
Move hide_followers_count logic to an helper
2018-12-20 14:51:12 +01:00
bd23288a52
Add a per-user setting to hide followers count
...
This is only available if the instance-wide setting isn't set and allows
people to hide their own followers count. This does not hide others' to
them.
2018-12-20 14:51:12 +01:00
dependabot[bot]