about summary refs log tree commit diff
path: root/app
AgeCommit message (Collapse)Author
2019-12-19fix multiple space (#12655)Marcin Mikołajczak
2019-12-18Fix custom emoji category creation silently erroring out on duplicate ↵ThibG
category (#12647) Instead, just re-use the existing category if any. Fixes #12608
2019-12-18Fix link crawler not specifying accepted content-type (#12646)ThibG
The link crawler expects HTML documents, so set the `Accept` header accordingly. Fixes #12618
2019-12-18Add signature to exported status (#12649)Takeshi Umeda
2019-12-18Fix an error when ActivityPub::FetchRemoteStatusService url is called with ↵Takeshi Umeda
nil (#12652)
2019-12-17Fix various issues caused by wrong `unread` key being updatedThibaut Girka
2019-12-17Clean up OStatus-related codepaths (#12173)ThibG
* Remove “protocol” argument and return value, as only ActivityPub is supported * Remove FetchRemoteAccountService, only use ActivityPub::FetchRemoteAccountService * Fix tests
2019-12-17Fixes featured hashtag setting page erroring out instead of rejecting ↵ThibG
invalid tags (#12436) * Revert "Fix ignoring whole status because of one invalid hashtag (#11621)" This reverts commit dff46b260b2f7d765d254c84a4b89105c7de5e97. * Fix statuses being rejected because of invalid hashtag names * Add spec for invalid hashtag names in statuses * Add test for featured tags controller
2019-12-17Increase max backup size (#12602)scd31
* Increased max backup size * partially reverted schema.rb
2019-12-16Admin setting to disable default follows (#12566)Alice Gaudon
2019-12-16Add Event activity-type support (#12637)Thomas Citharel
This adds support for Event AP type in Mastodon. Events are converted into toots by taking their title (AS name) and their URL (AP ID). Event picture is also brought in if available. Testable by fetching event content from https://test.mobilizon.org Signed-off-by: Thomas Citharel <tcit@tcit.fr>
2019-12-16Improve report page structure (#12615)Sasha Sorokin
* Move resolved button to the heading This is one of the commits on improving overall reports page structure. It changes where resolved button is located, moving it to the heading, right next to the "Report #n" header, so-called "hot-place" to look at. To accomplish this we have to declare one more content variable, change admin dashboard template to respect it and CSS files for minor styling, so buttons are inlined and centrally aligned according to the heading. * Move actions buttons below the report table I believe that actions to react on report should not be located at the top of the page, instead they should be either after the table or reporter's comment. This is just a logical sign that you should not react to the report without reading all the details first.
2019-12-16Fix tooltip messages of multiple poll switcher are reversed (#12616)Acid Chicken (硫酸鶏)
2019-12-12Avoid using pluralize on moderation pages (#12589)Sasha Sorokin
Pluralize function from Rails framework does not work with other languages than English, moreover it does not even work properly with English [1]. Not that the latest applies to this context, it's just a sign that we best to avoid this function, especially when there are more reliable ways. This commit changes how reports pages generated in order to avoid usage of pluralize function, replacing it with default translation function, called with given counter. On top of that, we have to make strings pluralizable, so have to change locale files. [1]: https://medium.com/@anna7/b3927de2ca8e#6a60
2019-12-12Fix edit filter link in filtered “Show why” dialogThibaut Girka
2019-12-12Merge branch 'master' into glitch-soc/merge-upstreamThibaut Girka
Conflicts: - app/controllers/application_controller.rb Minor conflict due to glitch-soc's theming system
2019-12-10Revert "Fix an eslint warning (#12426)" (#12596)Eugen Rochko
This reverts commit 054ef83fc5808596643dd366286b4e85446b850c.
2019-12-10Fix missing error templates for non-HTML requests (#12593)Eugen Rochko
2019-12-09Use codeblock for native redirect URI (#12570)Sasha Sorokin
This commit changes how doorkeeper.applications.help.native_redirect_uri string is being formatted to use <code> tag for native_redirect_uri placeholder. This makes the URI look more distinguishable.
2019-12-08Add `tootctl media remove-orphans` (#12568)Eugen Rochko
2019-12-07Fix erroneous inclusion of upstream codeThibaut Girka
2019-12-07[Glitch] Highlight border when focusing poll-form footerHinaloe
Port eb551c480d4c687d75d6bc94915adfcd8aae93fb to glitch-soc Signed-off-by: Thibaut Girka <thib@sitedethib.com>
2019-12-07[Glitch] Add basic support for group actorsTakeshi Umeda
Port f43f1e01840cd0bad7a88c90d9ea44b183a2a15d to glitch-soc Signed-off-by: Thibaut Girka <thib@sitedethib.com>
2019-12-07[Glitch] Fix poll options not being selectable via keyboardThibG
Port c05ed8a6254bc82fda3ae0fd3934dc2cdcf7c82d to glitch-soc Signed-off-by: Thibaut Girka <thib@sitedethib.com>
2019-12-07[Glitch] Add follow_request notification typeThibG
Port 911cc144815babf83ddf99f2daa3682021d401b8 to glitch-soc Signed-off-by: Thibaut Girka <thib@sitedethib.com>
2019-12-07[Glitch] upgrade/replace websocket.js to @gamestdio/websocket v2Shlee
Port f92ed32df4489210ab0ef557f1df90bc5e97d8e6 to glitch-soc Co-authored-by: hina <hina@hinaloe.net> Signed-off-by: Thibaut Girka <thib@sitedethib.com>
2019-12-07Merge branch 'master' into glitch-soc/merge-upstreamThibaut Girka
Conflicts: - package.json Not really a conflict, caused by an additional dependency in glitch-soc. - yarn.lock Not really a conflict, caused by an additional dependency in glitch-soc.
2019-12-06Fix generic HTTP 500 error on duplicate records (#12563)Eugen Rochko
Fix #12551 Fix #12547
2019-12-06Fix account search with no query (#12549)trwnh
* Fix account search with no query Modeled after #12541. Fix #12548 * fix codeclimate
2019-12-05Highlight border when focusing poll-form footer (#12544)Hinaloe
2019-12-05Fix media open hotkey (#12546)Jeong Arm
2019-12-05Remove some duplicate methods from StatusHelper and reflect changes to ↵Takeshi Umeda
AccountHelper (#12545)
2019-12-04Add basic support for group actors (#12071)Takeshi Umeda
* Show badge on group actor in WebUI * Do not notify in case of by following group actor * If you mention group actor, also mention group actor followers * Relax characters that can be used in username (same as Application) * Revert "Relax characters that can be used in username (same as Application)" This reverts commit 7e10a137b878d0db1b5252c52106faef5e09ca4b. * Delete display_name method
2019-12-04upgrade/replace websocket.js to @gamestdio/websocket v2 (#12543)Shlee
* Update stream.js * Update package.json * Update yarn.lock Co-authored-by: hina <hina@hinaloe.net>
2019-12-04Fix error when using search API with no query (#12541)Eugen Rochko
Fix #12462
2019-12-03Return `discoverable` via REST API (fix #12507) (#12508)trwnh
2019-12-03Fix poll options not being selectable via keyboard (#12538)ThibG
* Fix poll options not being selectable via keyboard Fixes #12384 * Improve styling of poll option checkboxes/radio buttons * Use more appropriate ARIA roles for poll options * Allow switching between single and multiple choice from keyboard * Coding style * Avoid using .bind()
2019-12-02Update ESLint and RuboCop in Code Climate (#12534)Yamagishi Kazutoshi
2019-12-02Fix blocking/unblocking users from status dropdown menu (#12535)ThibG
Fixes #12511
2019-12-02Fix notifications label (#12517)mayaeh
* Fix translations not being displayed * ran `yarn manage:translations en`
2019-12-01Link to reports targetting instance in admin view (#12513)ThibG
2019-12-01:sparkles: Add an LDAP Mail attribute config (#12053)Mathieu Brunot
Signed-off-by: mathieu.brunot <mathieu.brunot@monogramm.io>
2019-12-01Add follow_request notification type (#12198)ThibG
* Add follow_request notification type The notification type already existed in the backend but was never pushed to the front-end. This also means translation strings were also available for the backend, from the notification mailer. Unlike other notification types, these are off by default, to match what I remember of Gargron's view on the topic: that follow requests should not clutter notifications and should instead be reviewed at the user's own leisure in the dedicated column. Since follow requests have their own column, I've deemed it unnecessary to add a specific tab for them in the notification quick filter. * Show follow request link in single-column if there are pending requests, even if account isn't locked * Push follow requests from notifications to the follow_requests list * Offer to accept or reject follow request from the notification * Redesign follow request notification
2019-12-01Only normalize local polls (#12515)ThibG
Before this patch, if remote poll options have leading or trailing spaces, the information stored locally won't match them, causing federated voting to fail.
2019-12-01[Glitch] Fix conversations not having an unread indicator in web UIEugen Rochko
Fix ed73376f1ca7ef5e254a3ec21e1ead85b2d34fd6 to glitch-soc Signed-off-by: Thibaut Girka <thib@sitedethib.com>
2019-12-01[Glitch] Fix lost focus when modals open/closeThibG
Port 35b142a7ad19821483f900e81e915a7925fd4eaf to glitch-soc Signed-off-by: Thibaut Girka <thib@sitedethib.com>
2019-12-01Merge branch 'master' into glitch-soc/merge-upstreamThibaut Girka
2019-12-01:sparkles: Convert LDAP username (#12461)Mathieu Brunot
* :sparkles: Convert LDAP username #12021 Signed-off-by: mathieu.brunot <mathieu.brunot@monogramm.io> * :bug: Fix conversion var use Signed-off-by: mathieu.brunot <mathieu.brunot@monogramm.io> * :bug: Fix LDAP uid conversion test Signed-off-by: mathieu.brunot <mathieu.brunot@monogramm.io> * :ok_hand: Remove comments with ref to PR Signed-off-by: mathieu.brunot <mathieu.brunot@monogramm.io> * :ok_hand: Remove unnecessary paranthesis Signed-off-by: mathieu.brunot <mathieu.brunot@monogramm.io> * :wrench: Move space in conversion string Signed-off-by: mathieu.brunot <mathieu.brunot@monogramm.io>
2019-12-01Split relationships page strings (#12502)Sasha Sorokin
Before this moment relationships managing page was using strings from other context - from counters, but in order for translators to be able to translate it relatively to the page, it must use separate strings. I've split the strings for "Following" and "Followers" and put them to "relationships" keyset in localization file. This should solve this issue. Fixes #10863
2019-12-01Fix conversations not having an unread indicator in web UI (#12506)Eugen Rochko