about summary refs log tree commit diff
AgeCommit message (Collapse)Author
2017-11-14i18n: Update Polish translation (#5699)Marcin Mikołajczak
Signed-off-by: Marcin Mikołajczak <me@m4sk.in>
2017-11-14Rename MAX_CHARS to MAX_TOOT_CHARS to be more specific.Lain Iwakura
2017-11-14Code style fixes.Lain Iwakura
2017-11-14Handle character limit in initial state in frontend.Lain Iwakura
2017-11-14Return character limit in API and initial state.Lain Iwakura
2017-11-14Make character limit configurable.Lain Iwakura
2017-11-14Add Japanese translations for moderator roles and its own admin actions. (#5689)mayaeh
2017-11-14i18n: fix typo in Polish translation (#5688)Marcin Mikołajczak
2017-11-14Add tests for Setting (#5683)ysksn
2017-11-14l10n: PT-BR translation updated (#5681)Anna e só
* Improved e-mail messages; delted repeated words * pt-BR.json translations updated * Revert "pt-BR.json translations updated" This reverts commit 108c460531196fed6e6d14f93e8d8d047c835ffd. * Updated pt-BR.json * pt-BR.yml updated
2017-11-13Merge pull request #214 from glitch-soc/keyword-muteDavid Yip
Maintain case-insensitivity when merging multiple matchers (#213)
2017-11-13Maintain case-insensitivity when merging multiple matchers (#213)David Yip
When given two regexps, Regexp.union preserves the options set (or not set) on each regex; this meant that none of the multiline (m), case-insensitivity (i), or extended syntax (x) options were set. Our regexps are written expecting the m, i, and x options were set on all of them, so we need to make sure that we preserve that behavior.
2017-11-13Add code of conduct from GitHub generator (#5674)Eugen Rochko
2017-11-13fix Code Climate badge on README.md (#5671)takayamaki
and change badge's URI to https
2017-11-13Add tests for SessionActivation (#5668)ysksn
* Fabricate SessionActivation not only user_id but user association. * Add tests for SessionActivation
2017-11-12Update model annotations to use BIGINT for IDs (#5461)Daniel Hunsaker
All the migrations have been updated to use BIGINTs for ID fields in the DB, but ActiveRecord needs to be told to treat those values as BIGINT as well. This PR does that.
2017-11-12Fix #5652 - Notify too short when abbrev in JA (#5664)KEINOS
* Fix #5652 - Notify too short when abbrev in JA Fix #5652 of the notification message to be understandable when abbreviated. * Changed quotes as original Double quote to single and single quote as none. But I am not convinced of this fix. * Added a single quote as YAMLlint's suggestion * `bundle exec i18n-tasks normalize`
2017-11-12Add tests for RemoteProfile (#5665)ysksn
2017-11-11Actually filter blocked reblogs from feedaschmitz
And even a relevant test. Whoops.
2017-11-12Fix #5632 - Reset column loading status after fetch fail (#5659)Eugen Rochko
2017-11-11Don't update follower counts on reblog toggleaschmitz
2017-11-11i18n: Update Polish translation (for #5635) (#5661)Marcin Mikołajczak
* i18n: Update Polish translation (for #5635) * 😑🔫
2017-11-11Updates per code reviewaschmitz
Thanks, @valerauko!
2017-11-11Add moderator role and add pundit policies for admin actions (#5635)Eugen Rochko
* Add moderator role and add pundit policies for admin actions * Add rake task for turning user into mod and revoking it again * Fix handling of unauthorized exception * Deliver new report e-mails to staff, not just admins * Add promote/demote to admin UI, hide some actions conditionally * Fix unused i18n
2017-11-11Retry thread resolving (#5599)ThibG
Thread resolving is one of the few tasks that isn't retried on failure. One common cause for failure of this task is a well-connected user replying to a toot from a little-connected user on a small instance: the small instance will get many requests at once, and will often fail to answer requests within the 10 seconds timeout used by Mastodon. This changes makes the ThreadResolveWorker retry a few times, with a rapidly-increasing time before retries and large random contribution in order to spread the load over time.
2017-11-10Per-user reblog hiding implementation/fixes/testsaschmitz
Note that this will only hide/show *future* reblogs by a user, and does nothing to remove/add reblogs that are already in the timeline. I don't think that's a particularly confusing behavior, and it's a lot easier to implement (similar to mutes, I believe).
2017-11-10Add tests for RemoteFollow (#5651)ysksn
* Add tests for RemoteFollow.initialize * Add tests for RemoteFollow#valid? * Add tests for RemoteFollow#subscribe_address_for
2017-11-10Update en.yml (#5648)Matt
Changed "Toots with replies" to read "Toots and replies"
2017-11-09Fix focused background color of direct toots (#5642)Lynx Kotoura
2017-11-09"Show reblogs" per-follower UI/database changesaschmitz
TODO: * Tests (particularly for FollowRequests). * Anything to respect the setting when putting reblogs in timelines.
2017-11-09Add tests for Notification (#5640)ysksn
* Add tests for Notification#target_status * Add tests for Notification#browserable? * Add tests for Notification.reload_stale_associations!
2017-11-09Add and Remove tests for FollowRequest (#5622)ysksn
* Add a test for FollowRequest#authorize! * Remove tests There is no need to test ActiveModel::Validations::ClassMethods#validates. * Make an alias of destroy! as reject! Instead of defining the method, make an alias of destroy! as reject! because of reducing test.
2017-11-09Rewrite account_controller_spec (#5633)Nanamachi
* make accounts_controller_spec DRY * Add blocked user spec
2017-11-09Show confirmation dialog on leaving WebUI while composing (#5616)unarist
* Show confirmation dialog on leaving WebUI while composing Currently, Back button and Back hotkey can cause leaving from WebUI, as well as browser's back button. Users may hit those buttons accidentally, and their composing text will be lost. So this prevents it by showing confirmation dialog from `onbeforeunload` event. * Fix message and comments
2017-11-09i18n: Update Polish translation (#5639)Marcin Mikołajczak
Signed-off-by: Marcin Mikołajczak <me@m4sk.in>
2017-11-09Translate ja (#5637)nullkal
2017-11-08i10n OC: Memorial (#5615) + #5467 (#5623)Quenty31
* Changed ĩ => ï * Changed ĩ => ï * Add ability to disable login and mark accounts as memorial (#5615)
2017-11-08In remove_remote, exclude removed media attachments. (#5626)Naoki Kosaka
2017-11-08Add tests for MediaAttachment (#5620)ysksn
- `#local?` - `#needs_redownload?` - `#to_param`
2017-11-08Add tests for CustomEmoji#local? and #object_type (#5621)ysksn
2017-11-07Fix process mentions for local users, as local users are considered to use ↵ThibG
OStatus (#5618)
2017-11-07Eliminate space around emoji (#5474)nullkal
* Eliminate space around emoji * More improve emoji style * Make more compatible with Twemoji * Make scss-lint happy * Make not modify normal emoji's behavior * Decrease status__action-bar's margin-top to 5px * Make the test be passed * Revert "Make the test be passed" This reverts commit 54a8c60e5907ef20a5ceb5ab2c86a933e06f3ece. * Revert "Make not modify normal emoji's behavior" This reverts commit 6a5bdf0c11df16ebd190cb3ab9d2e8f1349f435a.
2017-11-07Twidere mention workaround (#5552)ThibG
* Work around Twidere and Tootdon bug Tootdon and Twidere construct @user@domain handles from mentions in toots based solely on the mention text and account URI's domain without performing any webfinger call or retrieving account info from the Mastodon server. As a result, when a remote user has WEB_DOMAIN ≠ LOCAL_DOMAIN, Twidere and Tootdon will construct the mention as @user@WEB_DOMAIN. Now, this will usually resolve to the correct account (since the recommended configuration is to have WEB_DOMAIN perform webfinger redirections to LOCAL_DOMAIN) when processing mentions, but won't do so when displaying them (as it does not go through the whole account resolution at that time). This change rewrites mentions to the resolved account, so that displaying the mentions will work. * Use lookbehind instead of non-capturing group in MENTION_RE Indeed, substitutions with the previous regexp would erroneously eat any preceding whitespace, which would lead to concatenated mentions in the previous commit. Note that users will “lose” up to one character space per mention for their toots, as that regexp is also used to remove the domain-part of mentioned users for character counting purposes, and it also erroneously removed the preceding character if it was a space.
2017-11-07Add ability to disable login and mark accounts as memorial (#5615)Eugen Rochko
Fix #5597
2017-11-07Fix spell miss (SWIIFT_OBJECT_URL -> SWIFT_OBJECT_URL) (#5617)MitarashiDango
2017-11-07fix: slang to adequate word (#5453)voidSatisfaction
2017-11-07 Show the local couterpart of emoji when it exists in /admin/custom_emojis ↵nullkal
(#5467) * Show the local couterpart of emoji when it exists in admin/custom_emojis * Fix indentation * Fix error * Add class table-action-link to Overwrite link * Make it enable to overwrite emojis * Make Code Climate happy
2017-11-07Avoid emojifying on invisible text (#5558)MIYAGI Hikaru
2017-11-07Do not process undeliverable mentions (#5598)ThibG
* Resolve remote accounts when mentioned even if they are already known This commit reduces the risk of not having up-to-date public key or protocol information for a remote account, which is required to deliver toots (especially direct messages). * Do not add mentions in private messages for remote users we cannot deliver to Mastodon does not deliver private and direct toots to OStatus users, as there is no guarantee the remote software understands the toot's privacy. However, users currently do not get any feedback on it (Mastodon won't attempt delivery, but the toot will be displayed exactly the same way to the user). This change introduces *some* feedback by not processing mentions that are not going to be delivered. A long-term solution is still needed to have delivery receipts or at least some better indication of what is going on, but at least an user can see *something* is up.
2017-11-07Resolve remote accounts when mentioned even if they are already known (#5539)ThibG
This commit reduces the risk of not having up-to-date public key or protocol information for a remote account, which is required to deliver toots (especially direct messages).