6a8c8dc6fb
Fix cache digesting log noise on status embeds ( #12750 )
2020-01-03 05:00:17 +01:00
9cbbc50fcd
Fix 12661 ( #12744 )
...
* Revert "persist last-intersected status update and restore when ScrollableList is restored"
This reverts commit 07e26142ef6a8e74bd2ac5e9b461a5a1699bd4c8.
accidentally merged spurious code in https://github.com/tootsuite/mastodon/pull/12661 . https://github.com/tootsuite/mastodon/pull/12735 removes the slowdown that this code was trying to solve; and other functionality successfully restores the view state of the list
* Revert "cache currently-viewing status id to avoid calling redux with identical value"
This reverts commit c93df2159fbd3888a5c48d8a8b8ae61dbbc54b89.
accidentally merged spurious code in https://github.com/tootsuite/mastodon/pull/12661 . https://github.com/tootsuite/mastodon/pull/12735 removes the slowdown that this code was trying to solve; and other functionality successfully restores the view state of the list
2020-01-02 22:46:42 +01:00
aa138ea350
Fix RefollowWorker not keeping show_reblogs setting ( #12707 )
...
* Fix RefollowWorker not keeping show_reblogs setting
* Fix RefollowWorker
2020-01-02 20:52:39 +01:00
09d54d1f62
Fix uncaught query param encoding errors ( #12741 )
2020-01-02 17:14:58 +01:00
9edab7afaf
Add translation project promotion link ( #12736 )
...
This commit adds promotional notice on appearance settings about
translation project if any other locale than English is used. It
allows users to learn and contribute translations to Mastodon.
Step ahead, in this commit one unusual string is added - link to a
guide. By default it refers to Crowdin project itself, but if any of
Mastodon localization teams established their own guide, they can
refer it. Or, if Crowdin supports localized domain for language, it
can also be put there (e.g. https://fr.crowdin.com/ ...).
2019-12-31 22:15:05 +01:00
2a5da8c961
refactor IntersectionObserver to observe viewport in single-column mode ( #12735 )
2019-12-31 21:39:25 +01:00
3b3bdc7293
Hide blocked users from more places ( #12733 )
...
* Hide blocked, muted, and blocked-by users from toot favourite lists
* Hide blocked, muted, and blocked-by users from toot reblog lists
* Hide blocked, muted, and blocked-by users from followers/following (API)
* Fix tests
* Hide blocked, muted, and blocked-by users from followers/following on public pages
2019-12-31 00:55:32 +01:00
2999c95596
Fix error when fetching followers/following from REST API when user has network hidden ( #12716 )
...
Fix #12510
2019-12-31 00:54:38 +01:00
f86ee4b59f
Fix IDN mentions not being processed, IDN domains not being rendered ( #12715 )
...
This changes the REST API to return unicode domains in the `acct`
attribute instead of punycode, and to render unicode instead of
punycode on public HTML pages as well.
Fix #7812 , fix #12246
2019-12-30 19:20:43 +01:00
b2f81060b7
Remove unused AccountRelationshipsPresenter call in public pages ( #12734 )
...
Those were used to show a “follow” or “unfollow” button on account grid on
public pages, but that got removed a while ago.
2019-12-30 19:13:02 +01:00
bb27ca14ef
Fix error when searching for empty phrase ( #12711 )
...
Fix #12619
2019-12-30 18:30:24 +01:00
6e9e8d89fa
Fix settings pages being cacheable by the browser ( #12714 )
...
Fix #12255
2019-12-30 04:38:30 +01:00
353c94910b
Fix HTML error pages being returned when JSON is expected ( #12713 )
...
Fix #12509
See also #12214
2019-12-30 04:38:18 +01:00
ca78b1473e
Fix undefined error regression in status component in web UI ( #12712 )
...
Regression from #12661
2019-12-30 03:55:11 +01:00
7e074610a6
Fix backups stopping due to read timeouts ( #12281 )
...
* Make BackupService resilient to read timeouts
If an attachment read times out, assume that the resources is
inaccessible and continue the backup without it. This fixes #12280 .
* Both errors on one line
2019-12-30 03:17:54 +01:00
0e8c0287d0
Fix shortNumberFormat to within 3 chars without units ( #12706 )
2019-12-29 16:59:25 +01:00
162dc845a0
Fix batch actions on non-pending tags in admin interface ( #12537 )
...
- Allow batch actions on unreviewed tags
- Hide checkboxes when batch actions aren't available
2019-12-29 05:41:26 +01:00
31f7c3fc5d
Summary: fix slowness due to layout thrashing when reloading a large … ( #12661 )
...
* Summary: fix slowness due to layout thrashing when reloading a large set of status updates
in order to limit the maximum size of a status in a list view (e.g. the home timeline), so as to avoid having to scroll all the way through an abnormally large status update (see https://github.com/tootsuite/mastodon/pull/8205 ), the following steps are taken:
•the element containing the status is rendered in the browser
•its height is calculated, to determine if it exceeds the maximum height threshold.
Unfortunately for performance, these steps are carried out in the componentDidMount(/Update) method, which also performs style modifications on the element. The combination of height request and style modification during javascript evaluation in the browser leads to layout-thrashing, where the elements are repeatedly re-laid-out (see https://developers.google.com/web/fundamentals/performance/rendering/avoid-large-complex-layouts-and-layout-thrashing & https://developer.mozilla.org/en-US/docs/Mozilla/Firefox/Performance_best_practices_for_Firefox_fe_engineers ).
The solution implemented here is to memoize the collapsed state in Redux the first time the status is seen (e.g. when fetched as part of a small batch, to populate the home timeline) , so that on subsequent re-renders, the value can be queried, rather than recalculated. This strategy is derived from https://github.com/tootsuite/mastodon/pull/4439 & https://github.com/tootsuite/mastodon/pull/4909 , and should resolve https://github.com/tootsuite/mastodon/issues/12455 .
Andrew Lin (https://github.com/onethreeseven ) is thanked for his assistance in root cause analysis and solution brainstorming
* remove getSnapshotBeforeUpdate from status
* remove componentWillUnmount from status
* persist last-intersected status update and restore when ScrollableList is restored
e.g. when navigating from home-timeline to a status conversational thread and <Back again
* cache currently-viewing status id to avoid calling redux with identical value
* refactor collapse toggle to pass explicit boolean
2019-12-29 05:39:48 +01:00
dace054c06
[Glitch] Fix manual scrolling issue on Firefox/Windows
...
Port dc0750abc3
2019-12-19 14:43:47 +01:00
e79fca176b
Fix issue because of theming system
2019-12-19 14:42:16 +01:00
7d2b1dc094
[Glitch] Improve report page structure
...
Port 34aa5c7cb2
2019-12-19 14:37:12 +01:00
ab5ff638f2
Merge branch 'master' into glitch-soc/master
...
Conflicts:
- `config/locales/en.yml`
No real conflict, upstream added a translatable string “too close” to
one specific to glitch-soc
- `lib/mastodon/statuses_cli.rb`
Fixes made upstream, while changed in glitch-soc to keep bookmarked statuses
- `package.json`
No real conflict, additional dependency in glitch-soc
2019-12-19 13:52:54 +01:00
902c6bed5a
Use different strings on exports page ( #12569 )
...
Currently the page re-uses strings from other contexts which doesn't fit
very well - strings incorrectly lowercase-d and pluralized, when they
don't need to be, because it's a table.
This commit changes page to re-use accounts.posts_tab_heading for toots,
and admin.accounts for "Following" and "Follows". This all should look
more aesthetically pleasing.
2019-12-19 12:47:55 +01:00
dc0750abc3
Fix manual scrolling issue on Firefox/Windows ( #12648 )
...
Fixes #12607
`will-change: transform` apparently makes manual scrolling impossible on
Firefox/Windows. While this should probably be considered a Firefox bug,
`will-change: transform` seem like a very aggressive performance hint that
may possibly make the browser consume more resources than needed, especially
in multiple-column mode.
This was originally added to improve scrolling performances on mobile, but
I think this isn't necessary anymore, because of the two following reasons:
- `contain: paint` (which is implied by `contain: strict`, which we apply
whenever the browser supports grids) should have similar effects
- in single-column mode, the scrolling container is the root element, which
I believe is optimized in at least Chromium
Keep in mind that I have not been able to make in-depth benchmarks, and
especially not been able to try on mobile, so performances should probably
be investigated further…
2019-12-19 12:47:19 +01:00
a90258dbe9
fix multiple space ( #12655 )
2019-12-19 07:39:08 +09:00
c0ed53b810
Fix custom emoji category creation silently erroring out on duplicate category ( #12647 )
...
Instead, just re-use the existing category if any.
Fixes #12608
2019-12-18 16:56:59 +01:00
b364175e1b
Fix link crawler not specifying accepted content-type ( #12646 )
...
The link crawler expects HTML documents, so set the `Accept`
header accordingly.
Fixes #12618
2019-12-18 16:56:06 +01:00
68070e82cc
Add signature to exported status ( #12649 )
2019-12-18 16:55:21 +01:00
a391eaf4d8
Fix an error when ActivityPub::FetchRemoteStatusService url is called with nil ( #12652 )
2019-12-18 16:54:03 +01:00
66ab1f83b0
Fix various issues caused by wrong `unread` key being updated
2019-12-17 15:55:10 +01:00
2ee5a9d9c3
Clean up OStatus-related codepaths ( #12173 )
...
* Remove “protocol” argument and return value, as only ActivityPub is supported
* Remove FetchRemoteAccountService, only use ActivityPub::FetchRemoteAccountService
* Fix tests
2019-12-17 13:32:57 +01:00
da2143b308
Fixes featured hashtag setting page erroring out instead of rejecting invalid tags ( #12436 )
...
* Revert "Fix ignoring whole status because of one invalid hashtag (#11621 )"
This reverts commit dff46b260b
2019-12-17 13:31:56 +01:00
3830c0b741
Increase max backup size ( #12602 )
...
* Increased max backup size
* partially reverted schema.rb
2019-12-17 13:30:58 +01:00
668f698077
Admin setting to disable default follows ( #12566 )
2019-12-16 23:55:50 +01:00
8094955461
Add Event activity-type support ( #12637 )
...
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-16 23:55:28 +01:00
34aa5c7cb2
Improve report page structure ( #12615 )
...
* 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-16 23:55:16 +01:00
09a72add0e
Fix tooltip messages of multiple poll switcher are reversed ( #12616 )
2019-12-16 23:55:02 +01:00
d5b7a4b116
Avoid using pluralize on moderation pages ( #12589 )
...
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-12 19:50:23 +01:00
6a1b4c3452
Fix edit filter link in filtered “Show why” dialog
2019-12-12 16:32:47 +01:00
be4849c083
Merge branch 'master' into glitch-soc/merge-upstream
...
Conflicts:
- app/controllers/application_controller.rb
Minor conflict due to glitch-soc's theming system
2019-12-12 15:40:06 +01:00
77e7b33dea
Revert "Fix an eslint warning ( #12426 )" ( #12596 )
...
This reverts commit 054ef83fc5
2019-12-10 19:39:02 +01:00
7ee6f51b78
Fix missing error templates for non-HTML requests ( #12593 )
2019-12-10 07:39:54 +01:00
ab91e7480b
Use codeblock for native redirect URI ( #12570 )
...
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-09 04:30:58 +01:00
f3d232381d
Add `tootctl media remove-orphans` ( #12568 )
2019-12-08 15:37:12 +01:00
49027ee948
Fix erroneous inclusion of upstream code
2019-12-07 15:53:04 +01:00
d4c22d48df
[Glitch] Highlight border when focusing poll-form footer
...
Port eb551c480d
2019-12-07 15:48:26 +01:00
510e527663
[Glitch] Add basic support for group actors
...
Port f43f1e0184
2019-12-07 15:48:26 +01:00
c6ba870f00
[Glitch] Fix poll options not being selectable via keyboard
...
Port c05ed8a625
2019-12-07 15:48:26 +01:00
1e1293e3c8
[Glitch] Add follow_request notification type
...
Port 911cc14481
2019-12-07 15:48:26 +01:00
176f1da267
[Glitch] upgrade/replace websocket.js to @gamestdio/websocket v2
...
Port f92ed32df4
2019-12-07 12:54:27 +01:00
abcba5c198
Merge branch 'master' into glitch-soc/merge-upstream
...
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-07 12:28:59 +01:00
6d7daf6154
Fix generic HTTP 500 error on duplicate records ( #12563 )
...
Fix #12551
Fix #12547
2019-12-06 22:40:06 +01:00
1653ae91ce
Fix account search with no query ( #12549 )
...
* Fix account search with no query
Modeled after #12541 . Fix #12548
* fix codeclimate
2019-12-06 19:44:23 +01:00
eb551c480d
Highlight border when focusing poll-form footer ( #12544 )
2019-12-05 00:51:07 +01:00
76adde4fe2
Fix media open hotkey ( #12546 )
2019-12-05 00:50:51 +01:00
04582e3c3e
Remove some duplicate methods from StatusHelper and reflect changes to AccountHelper ( #12545 )
2019-12-05 00:50:40 +01:00
f43f1e0184
Add basic support for group actors ( #12071 )
...
* 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-04 20:36:33 +01:00
f92ed32df4
upgrade/replace websocket.js to @gamestdio/websocket v2 ( #12543 )
...
* Update stream.js
* Update package.json
* Update yarn.lock
Co-authored-by: hina <hina@hinaloe.net>
2019-12-04 20:45:49 +09:00
bbf926b1c0
Fix error when using search API with no query ( #12541 )
...
Fix #12462
2019-12-04 04:34:08 +01:00
4354936a39
Return `discoverable` via REST API ( fix #12507 ) ( #12508 )
2019-12-03 19:56:34 +01:00
c05ed8a625
Fix poll options not being selectable via keyboard ( #12538 )
...
* 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-03 19:53:16 +01:00
6be16d02cb
Update ESLint and RuboCop in Code Climate ( #12534 )
2019-12-02 18:25:43 +01:00
27d5d02925
Fix blocking/unblocking users from status dropdown menu ( #12535 )
...
Fixes #12511
2019-12-02 18:25:24 +01:00
f9b82fa660
Fix notifications label ( #12517 )
...
* Fix translations not being displayed
* ran `yarn manage:translations en`
2019-12-02 13:39:53 +01:00
4195039420
Link to reports targetting instance in admin view ( #12513 )
2019-12-01 19:03:43 +01:00
bd8dc9bd0c
✨ Add an LDAP Mail attribute config ( #12053 )
...
Signed-off-by: mathieu.brunot <mathieu.brunot@monogramm.io>
2019-12-01 18:52:21 +01:00
911cc14481
Add follow_request notification type ( #12198 )
...
* 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-01 17:25:29 +01:00
f60cd97638
Only normalize local polls ( #12515 )
...
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 17:24:33 +01:00
fae7e0cace
[Glitch] Fix conversations not having an unread indicator in web UI
...
Fix ed73376f1c
2019-12-01 12:21:55 +01:00
2f8c4c588b
[Glitch] Fix lost focus when modals open/close
...
Port 35b142a7ad
2019-12-01 12:19:06 +01:00
99f1f48741
Merge branch 'master' into glitch-soc/merge-upstream
2019-12-01 12:12:42 +01:00
d70268f099
✨ Convert LDAP username ( #12461 )
...
* ✨ Convert LDAP username #12021
Signed-off-by: mathieu.brunot <mathieu.brunot@monogramm.io>
* 🐛 Fix conversion var use
Signed-off-by: mathieu.brunot <mathieu.brunot@monogramm.io>
* 🐛 Fix LDAP uid conversion test
Signed-off-by: mathieu.brunot <mathieu.brunot@monogramm.io>
* 👌 Remove comments with ref to PR
Signed-off-by: mathieu.brunot <mathieu.brunot@monogramm.io>
* 👌 Remove unnecessary paranthesis
Signed-off-by: mathieu.brunot <mathieu.brunot@monogramm.io>
* 🔧 Move space in conversion string
Signed-off-by: mathieu.brunot <mathieu.brunot@monogramm.io>
2019-12-01 07:21:28 +01:00
c8d82ef3c3
Split relationships page strings ( #12502 )
...
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-01 07:08:40 +01:00
ed73376f1c
Fix conversations not having an unread indicator in web UI ( #12506 )
2019-12-01 07:06:20 +01:00
f05b0463db
Fallback to Create audience when object has no defined audience ( #12249 )
...
Fixes #11137
2019-11-30 19:58:00 +01:00
d8f96028c5
Add ability to filter reports by target account domain ( #12154 )
...
* Add ability to filter reports by target account domain
* Reword by_target_domain label
2019-11-30 19:53:58 +01:00
35b142a7ad
Fix lost focus when modals open/close ( #12437 )
...
* Fix lost focus after modal closes
Regression caused by the use of the wicg-inert polyfill
* Fix regression introduced by wicg-inert
* Catch errors to please CodeClimate
2019-11-30 18:19:47 +01:00
b509b8812a
[Glitch] Fix counter sizing
...
Port b532ead798
2019-11-30 17:52:12 +01:00
776352d329
[Glitch] Add hotkey for opening media files
...
Port a690b3e470
2019-11-30 17:52:12 +01:00
949b37faba
[Glitch] Fix pending upload count not being decremented on error
...
Port 667708f5b0
2019-11-30 17:37:16 +01:00
7ce7575549
[Glitch] Fix OCR with delete & redraft
...
Port e7a7f88df7
2019-11-30 17:36:49 +01:00
2b7158427f
Merge branch 'master' into glitch-soc/merge-upstream
2019-11-30 17:29:44 +01:00
b532ead798
Fix counter sizing ( #12446 )
...
Counter size is currently set to strict 33.3% width, but with it
counter may break in other languages than English. For example it is
already broken on Gargron's profile on mastodon.social using Russian
locale.
This commit changes "width" to "min-width", so counters still displayed
correctly, but if they need more width to fit text, they are now allowed
to take as many width as they need.
2019-11-29 17:03:38 +01:00
fd45f5bbaa
Improve notifications page ( #12497 )
...
Currently notifications page seems a bit cluttered with no clear
separation between e-mail and filtering settings. This commit tries to
address them by adding clear separation with headers, hints and removing
continuously reused texts for events checkboxes.
2019-11-29 17:03:06 +01:00
a690b3e470
Add hotkey for opening media files ( #12498 )
...
* [WiP] Add hotkey to open media
* Give focus to play/pause button when opening video modal
2019-11-29 17:02:35 +01:00
667708f5b0
Fix pending upload count not being decremented on error ( #12499 )
...
The arguments were passed to the wrong function… also, there is no
need to have a conditional decrementation: failure to upload means
we marked an upload as pending, in all cases.
2019-11-29 17:02:18 +01:00
07da35c17c
Fix n+1 query for bookmarks on statuses ( #12494 )
2019-11-28 04:08:00 +01:00
d9793b2367
Fix proofs API being inaccessible in secure mode ( #12495 )
2019-11-28 04:07:49 +01:00
93b8aec7b7
Link move target account
2019-11-27 17:37:01 +01:00
93cb162d4a
Show acct of target account
2019-11-27 17:37:01 +01:00
014c2cad21
Add moved account warning
2019-11-27 17:37:01 +01:00
b25665d2e8
Do not consider moved accounts as non-functional
...
This might be somewhat controversial, but putting a redirection up
makes the account unusable, which works against use cases such as
using the moved account as backup in case the new one temporarily fails
(sure, the redirection can be temporarily removed, but it is a hassle)
2019-11-27 17:37:01 +01:00
00c219aa45
Fix empty poll options not being filtered on remote poll update ( #12484 )
...
If a poll contains empty options (which is apparently possible on Pleroma),
it is created without them. However, the poll update code doesn't filter
empty options, and thus:
1. Clear known votes, as it assumes the set of options has changed
2. Errors out because it tries adding empty options, which fails validation
This commit fixes that by filtering them out the same way they are filtered
out at poll creation time.
2019-11-26 22:46:31 +01:00
e7a7f88df7
Fix OCR with delete & redraft ( #12465 )
2019-11-25 01:42:51 +01:00
271b2e68f3
[Glitch] Fix blur behind closed registration message
...
Port SCSS changes from 42b3b019e0
2019-11-23 19:08:46 +01:00
962f485423
[Glitch] Change media description label to be context-sensitive
...
Port e86234b1e9
2019-11-23 19:07:23 +01:00
c0f7e21685
Merge branch 'master' into glitch-soc/merge-upstream
2019-11-23 19:03:01 +01:00
054ef83fc5
Fix an eslint warning ( #12426 )
2019-11-22 15:57:22 +01:00
42b3b019e0
Fix blur behind closed registration message ( #12442 )
...
* Fix closed registration message blur
* Adjust overlay margins to account for blur
Fixes #12425
2019-11-22 15:56:59 +01:00
a60b602ade
Fix OEmbed discovery not handling different URL variants in query ( #12439 )
...
Fix #12433
2019-11-21 19:03:07 +01:00
2edf6d81cb
Simplify SQL query when performing account search amongst followings ( #12302 )
2019-11-21 17:35:04 +01:00
c656cc2191
Fix FetchLinkCardServices crashing on a tags without a target ( #12159 )
...
* Add test for links without targets
* Fix FetchLinkCardServices crashing on a tags without a target
2019-11-21 16:04:52 +01:00
e86234b1e9
Change media description label to be context-sensitive ( #12270 )
...
“Describe for the visually impaired” makes no sense when the uploaded media
is an audio file.
2019-11-21 11:39:07 +01:00
c4d45765e3
Change domain block behavior to update user records before deleting data ( #12247 )
...
When suspending or silencing a domain, one probably wants the silence or
suspend parts to take effect as soon as possible. Deleting media files can
take a while (possibly days), so perform silencing as soon as possible, and
clean up media afterwards.
2019-11-21 11:36:15 +01:00
5bc4edd078
Fix whitelist federation for subdomains ( #12435 )
2019-11-21 11:35:39 +01:00
64225f4ac2
[Glitch] Fix unread toot indicator not honoring onlyMedia in public and community timelines
...
Port 0d6da8892a
2019-11-20 17:56:35 +01:00
ff67385cfb
Merge branch 'master' into glitch-soc/merge-upstream
...
Conflicts:
- README.md
discarded upstream changes
- app/controllers/api/v1/bookmarks_controller.rb
finally merged upstream, some code style fixes
and slightly changed pagination code
- app/controllers/application_controller.rb
changed upstream to always return HTML error pages
slight conflict caused by theming code
- app/models/bookmark.rb
finally merged upstream, no real conflict
- spec/controllers/api/v1/bookmarks_controller_spec.rb
finally merged upstream, slightly changed pagination code
2019-11-20 15:36:09 +01:00
8dfc45f757
Fix account dropdown not opening due to regression from #12377 ( #12430 )
2019-11-20 00:56:22 +01:00
853a67ed16
Add relationship-based options to status dropdowns ( #12377 )
...
Move bookmark action in inline statuses from action bar to dropdown
2019-11-19 21:24:16 +01:00
d14e74eff5
Add cache for OEmbed endpoints to avoid extra HTTP requests ( #12403 )
...
* add youtube oembed endpoint
* add check for oembed endpoint
* change unless for a more readable if
* clear blank lines
* endpoint via https
* Fix string literal in condition
* use cache for endpoints
* use cache for endpoints
* clean up and adding check
* clean up and remove redundant return
* add html check
* add false to return
* use double quotes
* use double quotes
* Clean up
2019-11-17 18:40:33 +01:00
5a2c0707f1
Support min_id-based pagination for bookmarks ( #12381 )
...
* Support min_id-based pagination for bookmarks
* Fix spec
2019-11-17 17:09:41 +01:00
fd93a9c871
make it not return http 400 when passing and empty source argument ( #12259 )
...
* make it not return http 400 when passing and empty source argument
* create a spec for the empty source hash bug
* compact checks for nil, empty? parameters
* use nil.blank? instead checking for nil
2019-11-16 19:02:09 +01:00
24ea938ce1
Add kn, mr, ur to available locales ( #12379 )
2019-11-13 23:36:41 +01:00
eee73de5c8
New Crowdin translations ( #12146 )
...
* New translations en.json (Tamil)
[ci skip]
* New translations en.json (Bengali)
[ci skip]
* New translations en.json (Portuguese, Brazilian)
[ci skip]
* New translations en.yml (Portuguese, Brazilian)
[ci skip]
* New translations en.json (Tamil)
[ci skip]
* New translations en.json (Tamil)
[ci skip]
* New translations devise.en.yml (Bengali)
[ci skip]
* New translations en.json (Tamil)
[ci skip]
* New translations devise.en.yml (Bengali)
[ci skip]
* New translations simple_form.en.yml (Bengali)
[ci skip]
* New translations devise.en.yml (Bengali)
[ci skip]
* New translations devise.en.yml (Bengali)
[ci skip]
* New translations devise.en.yml (Bengali)
[ci skip]
* New translations en.json (Thai)
[ci skip]
* New translations en.json (Tamil)
[ci skip]
* New translations en.json (Persian)
[ci skip]
* New translations en.yml (Persian)
[ci skip]
* New translations devise.en.yml (Tamil)
[ci skip]
* New translations devise.en.yml (Tamil)
[ci skip]
* New translations devise.en.yml (Tamil)
[ci skip]
* New translations en.json (Occitan)
[ci skip]
* New translations simple_form.en.yml (Occitan)
[ci skip]
* New translations en.json (Tamil)
[ci skip]
* New translations en.json (Occitan)
[ci skip]
* New translations en.yml (Occitan)
[ci skip]
* New translations en.json (Tamil)
[ci skip]
* New translations simple_form.en.yml (Tamil)
[ci skip]
* New translations en.json (Tamil)
[ci skip]
* New translations simple_form.en.yml (Tamil)
[ci skip]
* New translations activerecord.en.yml (Tamil)
[ci skip]
* New translations en.json (Tamil)
[ci skip]
* New translations en.json (Tamil)
[ci skip]
* New translations en.json (Arabic)
[ci skip]
* New translations en.yml (Arabic)
[ci skip]
* New translations simple_form.en.yml (Arabic)
[ci skip]
* New translations en.json (Finnish)
[ci skip]
* New translations en.json (Danish)
[ci skip]
* New translations en.json (Kannada)
[ci skip]
* New translations en.yml (Kannada)
[ci skip]
* New translations simple_form.en.yml (Kannada)
[ci skip]
* New translations activerecord.en.yml (Kannada)
[ci skip]
* New translations devise.en.yml (Kannada)
[ci skip]
* New translations doorkeeper.en.yml (Kannada)
[ci skip]
* New translations en.json (Marathi)
[ci skip]
* New translations en.yml (Marathi)
[ci skip]
* New translations simple_form.en.yml (Marathi)
[ci skip]
* New translations activerecord.en.yml (Marathi)
[ci skip]
* New translations devise.en.yml (Marathi)
[ci skip]
* New translations doorkeeper.en.yml (Marathi)
[ci skip]
* New translations en.json (Marathi)
[ci skip]
* New translations en.json (Hindi)
[ci skip]
* New translations en.yml (Hindi)
[ci skip]
* New translations simple_form.en.yml (Hindi)
[ci skip]
* New translations activerecord.en.yml (Hindi)
[ci skip]
* New translations devise.en.yml (Hindi)
[ci skip]
* New translations doorkeeper.en.yml (Hindi)
[ci skip]
* New translations en.json (Marathi)
[ci skip]
* New translations en.json (Urdu (Pakistan))
[ci skip]
* New translations en.yml (Urdu (Pakistan))
[ci skip]
* New translations simple_form.en.yml (Urdu (Pakistan))
[ci skip]
* New translations activerecord.en.yml (Urdu (Pakistan))
[ci skip]
* New translations devise.en.yml (Urdu (Pakistan))
[ci skip]
* New translations doorkeeper.en.yml (Urdu (Pakistan))
[ci skip]
* New translations activerecord.en.yml (Marathi)
[ci skip]
* New translations doorkeeper.en.yml (Marathi)
[ci skip]
* New translations doorkeeper.en.yml (Marathi)
[ci skip]
* New translations en.json (Marathi)
[ci skip]
* New translations simple_form.en.yml (Finnish)
[ci skip]
* New translations en.json (Marathi)
[ci skip]
* New translations en.json (Marathi)
[ci skip]
* New translations en.json (Marathi)
[ci skip]
* New translations en.json (Tamil)
[ci skip]
* New translations en.json (Marathi)
[ci skip]
* New translations en.json (Marathi)
[ci skip]
* New translations en.json (Marathi)
[ci skip]
* New translations en.json (Hindi)
[ci skip]
* New translations en.yml (Persian)
[ci skip]
* New translations simple_form.en.yml (Persian)
[ci skip]
* New translations devise.en.yml (Bengali)
[ci skip]
* New translations en.json (Hindi)
[ci skip]
* New translations devise.en.yml (Bengali)
[ci skip]
* New translations en.json (Hindi)
[ci skip]
* New translations en.json (Hindi)
[ci skip]
* New translations en.json (Hindi)
[ci skip]
* New translations en.json (Hindi)
[ci skip]
* New translations en.json (Hindi)
[ci skip]
* New translations en.json (Hindi)
[ci skip]
* New translations en.json (Hindi)
[ci skip]
* New translations en.json (Malayalam)
[ci skip]
* New translations en.yml (Malayalam)
[ci skip]
* New translations simple_form.en.yml (Malayalam)
[ci skip]
* New translations activerecord.en.yml (Malayalam)
[ci skip]
* New translations devise.en.yml (Malayalam)
[ci skip]
* New translations doorkeeper.en.yml (Malayalam)
[ci skip]
* New translations en.yml (Slovak)
[ci skip]
* New translations en.json (Slovak)
[ci skip]
* New translations en.yml (Slovak)
[ci skip]
* New translations simple_form.en.yml (Slovak)
[ci skip]
* New translations devise.en.yml (Slovak)
[ci skip]
* New translations en.json (Slovak)
[ci skip]
* New translations simple_form.en.yml (Slovak)
[ci skip]
* New translations doorkeeper.en.yml (Slovak)
[ci skip]
* New translations en.yml (Bengali)
[ci skip]
* New translations en.json (Ukrainian)
[ci skip]
* New translations simple_form.en.yml (Ukrainian)
[ci skip]
* New translations en.json (Norwegian Nynorsk)
[ci skip]
* New translations en.yml (Bengali)
[ci skip]
* New translations en.json (Hindi)
[ci skip]
* New translations devise.en.yml (Ukrainian)
[ci skip]
* New translations simple_form.en.yml (Ukrainian)
[ci skip]
* New translations en.json (Norwegian Nynorsk)
[ci skip]
* New translations en.json (Hindi)
[ci skip]
* New translations en.json (Norwegian Nynorsk)
[ci skip]
* New translations en.json (Hindi)
[ci skip]
* New translations en.json (Norwegian Nynorsk)
[ci skip]
* New translations en.json (Hindi)
[ci skip]
* New translations en.json (Malayalam)
[ci skip]
* New translations en.yml (Indonesian)
[ci skip]
* New translations en.json (Norwegian Nynorsk)
[ci skip]
* New translations simple_form.en.yml (Tamil)
[ci skip]
* New translations en.json (Hindi)
[ci skip]
* New translations en.yml (Malayalam)
[ci skip]
* New translations en.yml (Indonesian)
[ci skip]
* New translations en.json (Hindi)
[ci skip]
* New translations en.yml (Indonesian)
[ci skip]
* New translations en.json (Hindi)
[ci skip]
* New translations en.json (Hindi)
[ci skip]
* New translations en.json (Hindi)
[ci skip]
* New translations en.json (Hindi)
[ci skip]
* New translations en.json (Italian)
[ci skip]
* New translations en.json (Hindi)
[ci skip]
* New translations en.json (Hindi)
[ci skip]
* New translations en.yml (Hindi)
[ci skip]
* New translations en.json (Hindi)
[ci skip]
* New translations en.json (Marathi)
[ci skip]
* New translations en.json (Marathi)
[ci skip]
* New translations devise.en.yml (Tamil)
[ci skip]
* New translations en.json (Marathi)
[ci skip]
* New translations devise.en.yml (Tamil)
[ci skip]
* New translations en.json (Marathi)
[ci skip]
* New translations en.yml (Galician)
[ci skip]
* New translations simple_form.en.yml (Galician)
[ci skip]
* New translations simple_form.en.yml (Chinese Simplified)
[ci skip]
* New translations doorkeeper.en.yml (Chinese Simplified)
[ci skip]
* New translations en.json (Hungarian)
[ci skip]
* New translations en.yml (Hungarian)
[ci skip]
* New translations simple_form.en.yml (Japanese)
[ci skip]
* New translations en.yml (Chinese Simplified)
[ci skip]
* New translations en.json (Bengali)
[ci skip]
* New translations en.json (Basque)
[ci skip]
* New translations en.json (Spanish, Argentina)
[ci skip]
* New translations en.json (Russian)
[ci skip]
* New translations en.yml (Persian)
[ci skip]
* New translations en.yml (Russian)
[ci skip]
* New translations en.yml (Catalan)
[ci skip]
* New translations en.yml (Greek)
[ci skip]
* New translations en.yml (Swedish)
[ci skip]
* New translations en.yml (Swedish)
[ci skip]
* New translations en.json (Estonian)
[ci skip]
* New translations en.yml (Estonian)
[ci skip]
* New translations en.yml (Spanish, Argentina)
[ci skip]
* New translations en.yml (Estonian)
[ci skip]
* New translations en.yml (Japanese)
[ci skip]
* New translations devise.en.yml (Estonian)
[ci skip]
* New translations en.yml (Bengali)
[ci skip]
* New translations en.yml (Indonesian)
[ci skip]
* New translations en.yml (Bengali)
[ci skip]
* New translations en.yml (Kazakh)
[ci skip]
* New translations en.yml (Bengali)
[ci skip]
* New translations en.yml (Finnish)
[ci skip]
* New translations doorkeeper.en.yml (Finnish)
[ci skip]
* New translations en.json (Malayalam)
[ci skip]
* New translations doorkeeper.en.yml (Finnish)
[ci skip]
* New translations en.json (Malayalam)
[ci skip]
* New translations en.yml (Tamil)
[ci skip]
* New translations en.yml (Tamil)
[ci skip]
* New translations en.yml (Tamil)
[ci skip]
* New translations en.json (Malayalam)
[ci skip]
* New translations simple_form.en.yml (Estonian)
[ci skip]
* New translations en.json (Malayalam)
[ci skip]
* New translations devise.en.yml (Malayalam)
[ci skip]
* New translations en.yml (Estonian)
[ci skip]
* New translations simple_form.en.yml (Estonian)
[ci skip]
* New translations simple_form.en.yml (Malayalam)
[ci skip]
* New translations en.yml (Turkish)
[ci skip]
* New translations devise.en.yml (Portuguese, Brazilian)
[ci skip]
* New translations simple_form.en.yml (Portuguese, Brazilian)
[ci skip]
* New translations devise.en.yml (Portuguese, Brazilian)
[ci skip]
* New translations simple_form.en.yml (Portuguese, Brazilian)
[ci skip]
* New translations en.yml (Hungarian)
[ci skip]
* New translations en.yml (Swedish)
[ci skip]
* New translations en.yml (Swedish)
[ci skip]
* New translations en.yml (Swedish)
[ci skip]
* New translations en.yml (Swedish)
[ci skip]
* New translations en.yml (Swedish)
[ci skip]
* New translations en.yml (Corsican)
[ci skip]
* New translations en.yml (French)
[ci skip]
* New translations en.json (Esperanto)
[ci skip]
* New translations simple_form.en.yml (Slovak)
[ci skip]
* New translations devise.en.yml (Slovak)
[ci skip]
* New translations en.json (Hindi)
[ci skip]
* New translations devise.en.yml (Tamil)
[ci skip]
* New translations en.yml (Tamil)
[ci skip]
* New translations doorkeeper.en.yml (Tamil)
[ci skip]
* New translations doorkeeper.en.yml (Tamil)
[ci skip]
* New translations doorkeeper.en.yml (Slovak)
[ci skip]
* New translations en.yml (Spanish)
[ci skip]
* New translations en.yml (Estonian)
[ci skip]
* New translations en.yml (Estonian)
[ci skip]
* New translations en.yml (Estonian)
[ci skip]
* New translations en.yml (Estonian)
[ci skip]
* New translations en.yml (Estonian)
[ci skip]
* New translations en.json (Chinese Simplified)
[ci skip]
* New translations devise.en.yml (Chinese Simplified)
[ci skip]
* New translations en.yml (Chinese Simplified)
[ci skip]
* New translations devise.en.yml (Chinese Simplified)
[ci skip]
* New translations en.yml (Chinese Simplified)
[ci skip]
* New translations en.yml (Chinese Simplified)
[ci skip]
* New translations en.yml (Chinese Simplified)
[ci skip]
* New translations en.yml (Chinese Simplified)
[ci skip]
* New translations simple_form.en.yml (Chinese Simplified)
[ci skip]
* New translations en.json (Hindi)
[ci skip]
* New translations en.json (Hindi)
[ci skip]
* New translations en.json (Hindi)
[ci skip]
* New translations en.json (Hindi)
[ci skip]
* New translations en.yml (Basque)
[ci skip]
* New translations en.yml (Czech)
[ci skip]
* New translations en.yml (Danish)
[ci skip]
* New translations en.yml (Danish)
[ci skip]
* New translations en.yml (Ukrainian)
[ci skip]
* New translations devise.en.yml (Ukrainian)
[ci skip]
* New translations en.yml (Russian)
[ci skip]
* New translations en.json (Malayalam)
[ci skip]
* New translations en.json (Malayalam)
[ci skip]
* New translations en.json (Malayalam)
[ci skip]
* New translations en.yml (Bengali)
[ci skip]
* New translations en.yml (Bengali)
[ci skip]
* New translations en.json (Hindi)
[ci skip]
* New translations en.yml (Galician)
[ci skip]
* New translations en.json (Tamil)
[ci skip]
* New translations en.json (Russian)
[ci skip]
* New translations en.yml (Russian)
[ci skip]
* New translations doorkeeper.en.yml (Russian)
[ci skip]
* New translations en.json (Estonian)
[ci skip]
* New translations en.yml (Chinese Simplified)
[ci skip]
* New translations doorkeeper.en.yml (Chinese Simplified)
[ci skip]
* New translations en.yml (French)
[ci skip]
* New translations en.json (Bengali)
[ci skip]
* i18n-tasks normalize
* yarn manage:translations
2019-11-13 23:24:55 +01:00
dfea7368c9
Add bookmarks ( #7107 )
...
* Add backend support for bookmarks
Bookmarks behave like favourites, except they aren't shared with other
users and do not have an associated counter.
* Add spec for bookmark endpoints
* Add front-end support for bookmarks
* Introduce OAuth scopes for bookmarks
* Add bookmarks to archive takeout
* Fix migration
* Coding style fixes
* Fix rebase issue
* Update bookmarked_statuses to latest UI changes
* Update bookmark actions to properly reflect status changes in state
* Add bookmarks item to single-column layout
* Make active bookmarks red
2019-11-13 23:02:10 +01:00
afb398b583
Change to always returns html document in error pages ( #12214 )
2019-11-13 22:53:05 +01:00
a2014830c2
Fix broken admin audit log in whitelist mode ( #12303 )
2019-11-11 00:05:15 +02:00
0d6da8892a
Fix unread toot indicator not honoring onlyMedia in public and community timelines ( #12330 )
...
* Fix unread toot indicator not honoring onlyMedia in public and community timelines
* Fixup: `unread` already accounts for new content in pending items
2019-11-11 00:05:02 +02:00
0d5f3ae331
Fix already-known remote private toots not being searchable by URL ( #12336 )
...
* Fix already-known remote private toots not being searchable by URL
Whenever an URL search fails, and an account is provided, try getting a
private status matching that URL from database.
* Fix searching by `id` field instead of `uri`
2019-11-11 00:04:48 +02:00
0092096328
Fix type mismatch ( #12324 )
...
This was [causing an issue with feed regeneartion in tootctl](https://github.com/hometown-fork/hometown/issues/24 ), and @davefp fixed the issue.
2019-11-07 21:51:48 +02:00
2c6d8ebf02
[Glitch] Minor improvements to poll composing UI
...
Port 7cdb8c10e9
2019-11-07 14:43:07 +01:00
44acac0dcd
[Glitch] Fix WebUI allowing to upload more items than the limit
...
Port 66684c489c
2019-11-07 14:31:53 +01:00
83774367d2
Merge branch 'master' into glitch-soc/merge-upstream
...
Conflicts:
- `app/javascript/mastodon/features/compose/components/poll_form.js`
conflict because of the poll option limit being different than upstream's
2019-11-07 13:43:56 +01:00
514e427bd2
Fix relationship caches being broken as result of a follow request ( #12299 )
2019-11-07 09:08:00 +02:00
66684c489c
Fix WebUI allowing to upload more items than the limit ( #12300 )
...
Until this patch, drag'n'drop and copy-paste allowed to start uploading as
long as the number of *finished* uploads was below the limit.
2019-11-07 09:07:03 +02:00
7cdb8c10e9
Minor improvements to poll composing UI ( #12319 )
...
- Disable the “add option” button instead of hiding it
- Allow poll option inputs to scale to full width
2019-11-07 09:06:06 +02:00
66c1fe0495
Fix various issues with account migration ( #12301 )
...
* Fix being able to follow oneself by moving to an account that was following the old one
* Add specs
* Add spec to catch MoveWorker issue with local followers following both accounts
* Fix move worker breaking when a local account follows both source and target accounts
* Fix migration from remote to local account not sending Undo Follow
* Fix show_reblogs not being preserved for moved account's followers
2019-11-07 09:05:07 +02:00
84a27a08df
[Glitch] Fix notification message for own poll
...
Port a4301b5202be93318c05
2019-11-06 15:06:53 +01:00
ec567337dc
[Glitch] fix: support KaiOS arrow navigation on public pages
...
Port 1e232e455c
2019-11-06 14:59:57 +01:00
734181c3bf
[Glitch] Fix filtered out items being counted as pending items
...
Port 3db3c10762
2019-11-06 14:55:12 +01:00
d76ab55608
[Glitch] Use inert polyfill
...
Port 3cc9ff872f
2019-11-06 14:52:22 +01:00
ea55f70f97
[Glitch] Add support for submitting media description with ctrl+enter
...
Port 7488a9e154
2019-11-06 14:50:54 +01:00
f940c5a1fb
[Glitch] dont crash with null-ref
...
Port 8568018935
2019-11-06 14:50:27 +01:00
f2fc7246e1
[Glitch] Fix an issue where polls with 'expires_at' not set expired
...
Port 5b46467474
2019-11-06 14:49:43 +01:00
0ae7d84273
Merge branch 'master' into glitch-soc/merge-upstream
...
Conflicts:
- `package.json`
2019-11-06 14:38:28 +01:00
3cc9ff872f
Use inert polyfill ( #12209 )
...
* Inserting wicg-inert in project
* Import wicg-inert in moda_root component
* Update yarn.lock
* Solving code style problems
* Removing package-lock
2019-11-04 13:03:44 +01:00
be93318c05
Integrate own poll's translation into own_poll. ( #12231 )
...
run `yarn manage:translations en`
2019-11-04 13:03:29 +01:00
1e232e455c
fix: support KaiOS arrow navigation on public pages ( #12251 )
2019-11-04 13:03:09 +01:00
e37358b3bc
Fix code referencing wrong class ( #12263 )
...
For some reason, I have seen this only triggered here:
https://circleci.com/gh/tootsuite/mastodon/98324?utm_campaign=vcs-integration-link&utm_medium=referral&utm_source=github-checks-link
But Follow.find_by referenced the ActivityPub::Activity::Follow class
instead of the model class.
2019-11-04 13:02:27 +01:00
3db3c10762
Fix filtered out items being counted as pending items ( #12266 )
2019-11-04 13:02:16 +01:00
65e13cfacf
Add abilityto add oneself to lists ( #12271 )
...
* Add ability to add oneself to lists
* Change search results to include oneself when searching through followers
* Mark follow relation as optional in ListAccount
2019-11-04 13:02:01 +01:00
1a12943924
Fix notification filters not applying to poll options ( #12269 )
2019-11-04 13:01:50 +01:00
650820d62d
Fix remote media descriptions being cut off at 420 chars ( #12262 )
...
* Fix remote media descriptions being cut off at 420 chars
Fixes #12258
* Fix tests
2019-11-04 13:00:16 +01:00
7488a9e154
Add support for submitting media description with ctrl+enter ( #12272 )
2019-11-04 12:59:17 +01:00
8568018935
dont crash with null-ref ( #12274 )
2019-11-04 12:58:19 +01:00
046cd05a83
Fix download button icon color
2019-10-28 11:41:26 +01:00
2ed48037ea
[Glitch] Replace fav icon animation with CSS
...
Port 3a929dbedd
2019-10-27 21:10:24 +01:00
bde35e7878
[Glitch] Add download button to audio and video players
...
Port 9b36f62df6
2019-10-27 15:41:22 +01:00
ebe34ed529
[Glitch] Unliking a post updates like count on front end
...
Port a9530e29a2
2019-10-27 14:44:27 +01:00
957eb4241a
[Glitch] Fix volume slider in chromium 🤷
...
Port bcf694dce7
2019-10-27 14:42:44 +01:00
dd810a9405
[Glitch] Improve swipe experience
...
Port f4be89e24d
2019-10-27 14:41:37 +01:00
9840e1ad75
[Glitch] don't show outline of full-screen video
...
Port 547a5bac9d
2019-10-27 14:38:49 +01:00
a4dc0d2c27
[Glitch] Fix batch actions being hidden from mobile view
...
Port SCSS changes from aa884e0484
2019-10-27 14:37:17 +01:00
59946f9231
[Glitch] Add noopener and/or noreferrer
...
Port fccf83e1f2
2019-10-27 14:36:25 +01:00
a4301b5202
Fix notification message for own poll ( #12219 )
2019-10-27 12:46:35 +01:00
5b46467474
Fix an issue where polls with 'expires_at' not set expired ( #12222 )
2019-10-27 12:45:55 +01:00
7512f3a3e0
Change message of public timeline for local only ( #12224 )
2019-10-27 12:45:33 +01:00
4a0281d8c4
[Glitch] Bump react-select from 2.4.4 to 3.0.5
...
Port 183fc9d3cb
2019-10-27 12:25:15 +01:00
41a98b6543
Merge branch 'master' into glitch-soc/merge-upstream
...
Conflicts:
- README.md
- app/helpers/statuses_helper.rb
Upstream moved account helpers to their own file, we had extra
helpers there, moved too.
- app/lib/sanitize_config.rb
- app/models/user.rb
- app/serializers/initial_state_serializer.rb
- config/locales/simple_form.en.yml
- spec/lib/sanitize_config_spec.rb
2019-10-27 12:14:01 +01:00
18c07738a6
Fix media components being cropped
2019-10-26 17:51:22 +02:00
318362758b
Hide overflowing characters from reply indicator too
2019-10-26 17:51:22 +02:00
a24b954baa
Avoid toot text bleeding out of the content div
2019-10-26 17:51:22 +02:00
9b36f62df6
Add download button to audio and video players ( #12179 )
...
* Add download button for audio player
* Add download button for video player
* fix padding for download button in Audio component
2019-10-25 11:48:20 +02:00
48f75b86ae
Add setting for whether to crop images in unexpanded toots ( #12126 )
2019-10-24 22:51:41 +02:00
a6269b2f83
Split AccountsHelper from StatusesHelper ( #12078 )
2019-10-24 22:50:09 +02:00
a9530e29a2
Unliking a post updates like count on front end ( #12140 )
...
* return the new favourites_count
when unfavouriting a status
* Remove trailing whitespace
* revert changes to favourites_controller
* Decrease favourites_count through statuses reducer
* styling fix
* Fix missing trailing comma
2019-10-24 22:49:45 +02:00
15c192ce40
Add link to search for users connected from the same IP address ( #12157 )
...
* Add link to search for users connected from the same IP address
Fixes #11949
* Fix missing cell in admin account view table
2019-10-24 22:49:26 +02:00
bcf694dce7
Fix volume slider in chromium 🤷 ( #12158 )
...
Fixes #12156
2019-10-24 22:49:12 +02:00
f4be89e24d
Improve swipe experience ( #12168 )
2019-10-24 22:48:11 +02:00
488dd0ff7a
remove audio metadata ( #12171 )
2019-10-24 22:47:58 +02:00
3a929dbedd
Replace fav icon animation with CSS ( #12175 )
...
Fixes #12151
2019-10-24 22:47:48 +02:00
547a5bac9d
don't show outline of full-screen video ( #12176 )
2019-10-24 22:47:37 +02:00
aa884e0484
Fix batch actions being hidden from mobile view ( #12183 )
...
On mobile, batch actions are hidden from the settings/admin interface,
but there are several places those actions can only be performed through
batch actions.
This may not look great, but at least it makes the actions available again.
2019-10-24 22:46:59 +02:00
9762fe382c
microformat mentions can have an implicit property ( #12189 )
...
See the first example here: http://microformats.org/wiki/microformats2#hyperlinked_person
2019-10-24 22:46:15 +02:00
d2919f7e94
Allow Accept/Reject with a non-embedded object ( #12199 )
...
Some ActivityPub servers refuse to embed remote objects into their own
output. This is because they are not the authoritative source for these
objects, and as such embedding them is always a waste of space. The
follow request and follow models contain a URI, so this can be used to
match them.
2019-10-24 22:45:43 +02:00
bd684e25d9
Fix incoming federation in whitelist mode ( #12185 )
...
… posting to the AP inbox required a logged-in local user…
2019-10-24 22:45:35 +02:00
fccf83e1f2
Add noopener and/or noreferrer ( #12202 )
2019-10-24 22:44:42 +02:00
984fce613e
Change filter logic to keep filtered toots, but not mark them as unread
...
Keeping them in the TL fixes the front-end not being able to properly keep
track of pagination. Furthermore, filtered toots are not counted as unread
content, whether they are dropped or not.
2019-10-24 22:09:55 +02:00
183fc9d3cb
Bump react-select from 2.4.4 to 3.0.5 ( #11930 )
...
* Bump react-select from 2.4.4 to 3.0.5
Bumps [react-select](https://github.com/JedWatson/react-select ) from 2.4.4 to 3.0.5.
- [Release notes](https://github.com/JedWatson/react-select/releases )
- [Changelog](https://github.com/JedWatson/react-select/blob/master/.sweet-changelogs.js )
- [Commits](https://github.com/JedWatson/react-select/commits )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
* Change import path for react-select
2019-10-22 01:31:27 +09:00
069e0520c9
Fix notification filters not applying to poll options
2019-10-17 11:43:58 +02:00
003bb6ca1a
Refactor timeline filtering code
2019-10-17 11:43:58 +02:00
b4046dc026
Drop filtered messages if the filter is “irreversible”
...
… instead of adding them to the timelines and then not showing them.
This fixes timelines showing new items when the only new items are
“irreversibly” filtered toots. This may be an edge case in Mastodon/glitch-soc,
but it is not in Pleroma, which does no filtering server-side whatsoever.
2019-10-17 11:43:58 +02:00
10f1478498
Merge branch 'master' into glitch-soc/merge-upstream
2019-10-11 22:41:21 +02:00
c2112c7781
[Glitch] Fix crash when switching back/from mobile layout
...
Port 91582937f3
2019-10-11 22:40:52 +02:00
ef925f31a6
Merge pull request #1233 from ThibG/glitch-soc/merge-upstream
...
Merge upstream changes
2019-10-11 22:28:11 +02:00
877e8c9d79
[Glitch] Fix media editing modal changing dimensions when image loads
...
Port 6ebd74f4fa
2019-10-10 21:00:13 +02:00
4ee167d89b
[Glitch] Remove `lang` attribute from individual statuses
...
Port 538db85d3c
2019-10-10 21:00:13 +02:00
bd1eaad816
[Glitch] Add missing back button header for invalid account
...
Port 95f21ab87f
2019-10-10 21:00:13 +02:00
9ba67c6045
[Glitch] Fix performance of home feed regeneration
...
Port front-end changes from f665901e3c
2019-10-10 21:00:13 +02:00
c4118ba71b
New Crowdin translations ( #12144 )
...
* New translations activerecord.en.yml (Corsican)
[ci skip]
* New translations activerecord.en.yml (Czech)
[ci skip]
* New translations activerecord.en.yml (Danish)
[ci skip]
* New translations activerecord.en.yml (Dutch)
[ci skip]
* New translations activerecord.en.yml (Esperanto)
[ci skip]
* New translations activerecord.en.yml (Estonian)
[ci skip]
* New translations activerecord.en.yml (Finnish)
[ci skip]
* New translations activerecord.en.yml (French)
[ci skip]
* New translations activerecord.en.yml (Galician)
[ci skip]
* New translations activerecord.en.yml (Georgian)
[ci skip]
* New translations activerecord.en.yml (German)
[ci skip]
* New translations activerecord.en.yml (Greek)
[ci skip]
* New translations activerecord.en.yml (Hungarian)
[ci skip]
* New translations activerecord.en.yml (Chinese Simplified)
[ci skip]
* New translations activerecord.en.yml (Italian)
[ci skip]
* New translations activerecord.en.yml (Japanese)
[ci skip]
* New translations activerecord.en.yml (Kazakh)
[ci skip]
* New translations activerecord.en.yml (Korean)
[ci skip]
* New translations activerecord.en.yml (Norwegian)
[ci skip]
* New translations activerecord.en.yml (Occitan)
[ci skip]
* New translations activerecord.en.yml (Polish)
[ci skip]
* New translations activerecord.en.yml (Portuguese)
[ci skip]
* New translations activerecord.en.yml (Chinese Traditional, Hong Kong)
[ci skip]
* New translations activerecord.en.yml (Catalan)
[ci skip]
* New translations en.yml (Telugu)
[ci skip]
* New translations activerecord.en.yml (Chinese Traditional)
[ci skip]
* New translations en.json (Thai)
[ci skip]
* New translations en.yml (Thai)
[ci skip]
* New translations simple_form.en.yml (Thai)
[ci skip]
* New translations en.json (Turkish)
[ci skip]
* New translations en.yml (Turkish)
[ci skip]
* New translations simple_form.en.yml (Turkish)
[ci skip]
* New translations en.json (Welsh)
[ci skip]
* New translations en.yml (Welsh)
[ci skip]
* New translations simple_form.en.yml (Welsh)
[ci skip]
* New translations en.json (Spanish, Argentina)
[ci skip]
* New translations en.yml (Spanish, Argentina)
[ci skip]
* New translations en.json (Macedonian)
[ci skip]
* New translations activerecord.en.yml (Bulgarian)
[ci skip]
* New translations en.yml (Macedonian)
[ci skip]
* New translations activerecord.en.yml (Portuguese, Brazilian)
[ci skip]
* New translations activerecord.en.yml (Indonesian)
[ci skip]
* New translations activerecord.en.yml (Persian)
[ci skip]
* New translations activerecord.en.yml (Albanian)
[ci skip]
* New translations activerecord.en.yml (Arabic)
[ci skip]
* New translations activerecord.en.yml (Asturian)
[ci skip]
* New translations activerecord.en.yml (Basque)
[ci skip]
* New translations activerecord.en.yml (Bengali)
[ci skip]
* New translations activerecord.en.yml (Breton)
[ci skip]
* New translations simple_form.en.yml (Estonian)
[ci skip]
* New translations en.json (Persian)
[ci skip]
* New translations en.json (Estonian)
[ci skip]
* New translations en.yml (Serbian (Cyrillic))
[ci skip]
* New translations en.yml (Lithuanian)
[ci skip]
* New translations en.json (Malay)
[ci skip]
* New translations en.yml (Malay)
[ci skip]
* New translations en.json (Norwegian)
[ci skip]
* New translations en.yml (Norwegian)
[ci skip]
* New translations simple_form.en.yml (Norwegian)
[ci skip]
* New translations en.json (Russian)
[ci skip]
* New translations en.yml (Russian)
[ci skip]
* New translations simple_form.en.yml (Russian)
[ci skip]
* New translations en.json (Serbian (Cyrillic))
[ci skip]
* New translations simple_form.en.yml (Serbian (Cyrillic))
[ci skip]
* New translations en.json (Serbian (Latin))
[ci skip]
* New translations en.yml (Serbian (Latin))
[ci skip]
* New translations simple_form.en.yml (Serbian (Latin))
[ci skip]
* New translations en.json (Slovak)
[ci skip]
* New translations simple_form.en.yml (Chinese Traditional, Hong Kong)
[ci skip]
* New translations simple_form.en.yml (Slovak)
[ci skip]
* New translations en.json (Ukrainian)
[ci skip]
* New translations en.yml (Ukrainian)
[ci skip]
* New translations simple_form.en.yml (Ukrainian)
[ci skip]
* New translations en.json (Norwegian Nynorsk)
[ci skip]
* New translations en.json (Arabic)
[ci skip]
* New translations en.json (Lithuanian)
[ci skip]
* New translations en.json (Albanian)
[ci skip]
* New translations simple_form.en.yml (Ido)
[ci skip]
* New translations en.yml (Croatian)
[ci skip]
* New translations simple_form.en.yml (Croatian)
[ci skip]
* New translations en.yml (Chinese Traditional, Hong Kong)
[ci skip]
* New translations en.json (Georgian)
[ci skip]
* New translations en.yml (Georgian)
[ci skip]
* New translations simple_form.en.yml (Georgian)
[ci skip]
* New translations en.json (Chinese Traditional, Hong Kong)
[ci skip]
* New translations en.json (Hebrew)
[ci skip]
* New translations en.yml (Hebrew)
[ci skip]
* New translations simple_form.en.yml (Hebrew)
[ci skip]
* New translations en.json (Ido)
[ci skip]
* New translations en.yml (Ido)
[ci skip]
* New translations simple_form.en.yml (Bulgarian)
[ci skip]
* New translations en.yml (Latvian)
[ci skip]
* New translations en.json (Indonesian)
[ci skip]
* New translations en.yml (Indonesian)
[ci skip]
* New translations simple_form.en.yml (Indonesian)
[ci skip]
* New translations en.yml (Bulgarian)
[ci skip]
* New translations en.json (Bulgarian)
[ci skip]
* New translations en.json (Latvian)
[ci skip]
* New translations en.yml (Breton)
[ci skip]
* New translations en.json (Breton)
[ci skip]
* New translations simple_form.en.yml (Asturian)
[ci skip]
* New translations en.yml (Asturian)
[ci skip]
* New translations en.json (Asturian)
[ci skip]
* New translations en.yml (Arabic)
[ci skip]
* New translations en.yml (Slovak)
[ci skip]
* New translations en.yml (Albanian)
[ci skip]
* New translations en.json (Czech)
[ci skip]
* New translations simple_form.en.yml (Catalan)
[ci skip]
* New translations en.json (Chinese Simplified)
[ci skip]
* New translations en.yml (Chinese Simplified)
[ci skip]
* New translations simple_form.en.yml (Chinese Simplified)
[ci skip]
* New translations en.json (Chinese Traditional)
[ci skip]
* New translations en.yml (Chinese Traditional)
[ci skip]
* New translations simple_form.en.yml (Chinese Traditional)
[ci skip]
* New translations en.json (Corsican)
[ci skip]
* New translations en.yml (Corsican)
[ci skip]
* New translations simple_form.en.yml (Corsican)
[ci skip]
* New translations en.yml (Czech)
[ci skip]
* New translations en.json (Catalan)
[ci skip]
* New translations simple_form.en.yml (Czech)
[ci skip]
* New translations en.json (Danish)
[ci skip]
* New translations en.yml (Danish)
[ci skip]
* New translations simple_form.en.yml (Danish)
[ci skip]
* New translations en.json (Dutch)
[ci skip]
* New translations en.yml (Dutch)
[ci skip]
* New translations simple_form.en.yml (Dutch)
[ci skip]
* New translations en.json (Esperanto)
[ci skip]
* New translations en.yml (Esperanto)
[ci skip]
* New translations simple_form.en.yml (Esperanto)
[ci skip]
* New translations en.yml (Catalan)
[ci skip]
* New translations en.json (Croatian)
[ci skip]
* New translations en.yml (Bengali)
[ci skip]
* New translations simple_form.en.yml (Albanian)
[ci skip]
* New translations simple_form.en.yml (Basque)
[ci skip]
* New translations en.yml (Basque)
[ci skip]
* New translations en.json (Bengali)
[ci skip]
* New translations en.json (Basque)
[ci skip]
* New translations simple_form.en.yml (Arabic)
[ci skip]
* New translations devise.en.yml (Serbian (Cyrillic))
[ci skip]
* New translations devise.en.yml (Hungarian)
[ci skip]
* New translations devise.en.yml (Russian)
[ci skip]
* New translations devise.en.yml (Danish)
[ci skip]
* New translations devise.en.yml (Croatian)
[ci skip]
* New translations doorkeeper.en.yml (Asturian)
[ci skip]
* New translations devise.en.yml (Portuguese, Brazilian)
[ci skip]
* New translations devise.en.yml (Serbian (Latin))
[ci skip]
* New translations devise.en.yml (Slovak)
[ci skip]
* New translations devise.en.yml (Dutch)
[ci skip]
* New translations devise.en.yml (Portuguese)
[ci skip]
* New translations devise.en.yml (Estonian)
[ci skip]
* New translations devise.en.yml (Slovenian)
[ci skip]
* New translations doorkeeper.en.yml (Bulgarian)
[ci skip]
* New translations devise.en.yml (Hebrew)
[ci skip]
* New translations devise.en.yml (Spanish)
[ci skip]
* New translations devise.en.yml (Finnish)
[ci skip]
* New translations devise.en.yml (Swedish)
[ci skip]
* New translations devise.en.yml (German)
[ci skip]
* New translations devise.en.yml (Georgian)
[ci skip]
* New translations devise.en.yml (Ido)
[ci skip]
* New translations devise.en.yml (Polish)
[ci skip]
* New translations devise.en.yml (Corsican)
[ci skip]
* New translations devise.en.yml (Breton)
[ci skip]
* New translations devise.en.yml (Bengali)
[ci skip]
* New translations devise.en.yml (Asturian)
[ci skip]
* New translations devise.en.yml (Bulgarian)
[ci skip]
* New translations devise.en.yml (Albanian)
[ci skip]
* New translations devise.en.yml (Norwegian)
[ci skip]
* New translations activerecord.en.yml (Welsh)
[ci skip]
* New translations activerecord.en.yml (Ukrainian)
[ci skip]
* New translations activerecord.en.yml (Turkish)
[ci skip]
* New translations activerecord.en.yml (Thai)
[ci skip]
* New translations activerecord.en.yml (Spanish, Argentina)
[ci skip]
* New translations devise.en.yml (Galician)
[ci skip]
* New translations activerecord.en.yml (Slovenian)
[ci skip]
* New translations activerecord.en.yml (Slovak)
[ci skip]
* New translations devise.en.yml (Chinese Simplified)
[ci skip]
* New translations devise.en.yml (Occitan)
[ci skip]
* New translations activerecord.en.yml (Serbian (Latin))
[ci skip]
* New translations activerecord.en.yml (Serbian (Cyrillic))
[ci skip]
* New translations activerecord.en.yml (Russian)
[ci skip]
* New translations devise.en.yml (Persian)
[ci skip]
* New translations devise.en.yml (Chinese Traditional, Hong Kong)
[ci skip]
* New translations devise.en.yml (Kazakh)
[ci skip]
* New translations activerecord.en.yml (Spanish)
[ci skip]
* New translations doorkeeper.en.yml (Chinese Traditional, Hong Kong)
[ci skip]
* New translations doorkeeper.en.yml (Albanian)
[ci skip]
* New translations doorkeeper.en.yml (Occitan)
[ci skip]
* New translations doorkeeper.en.yml (Basque)
[ci skip]
* New translations doorkeeper.en.yml (Persian)
[ci skip]
* New translations doorkeeper.en.yml (Arabic)
[ci skip]
* New translations doorkeeper.en.yml (Polish)
[ci skip]
* New translations doorkeeper.en.yml (Portuguese)
[ci skip]
* New translations doorkeeper.en.yml (Korean)
[ci skip]
* New translations doorkeeper.en.yml (Portuguese, Brazilian)
[ci skip]
* New translations doorkeeper.en.yml (Ukrainian)
[ci skip]
* New translations doorkeeper.en.yml (Slovenian)
[ci skip]
* New translations doorkeeper.en.yml (Slovak)
[ci skip]
* New translations doorkeeper.en.yml (Spanish)
[ci skip]
* New translations doorkeeper.en.yml (Catalan)
[ci skip]
* New translations doorkeeper.en.yml (Swedish)
[ci skip]
* New translations doorkeeper.en.yml (Czech)
[ci skip]
* New translations doorkeeper.en.yml (Estonian)
[ci skip]
* New translations doorkeeper.en.yml (Dutch)
[ci skip]
* New translations doorkeeper.en.yml (Finnish)
[ci skip]
* New translations doorkeeper.en.yml (French)
[ci skip]
* New translations doorkeeper.en.yml (Danish)
[ci skip]
* New translations doorkeeper.en.yml (Galician)
[ci skip]
* New translations doorkeeper.en.yml (German)
[ci skip]
* New translations doorkeeper.en.yml (Kazakh)
[ci skip]
* New translations doorkeeper.en.yml (Greek)
[ci skip]
* New translations doorkeeper.en.yml (Corsican)
[ci skip]
* New translations doorkeeper.en.yml (Hungarian)
[ci skip]
* New translations doorkeeper.en.yml (Chinese Traditional)
[ci skip]
* New translations doorkeeper.en.yml (Italian)
[ci skip]
* New translations doorkeeper.en.yml (Chinese Simplified)
[ci skip]
* New translations doorkeeper.en.yml (Japanese)
[ci skip]
* New translations doorkeeper.en.yml (Serbian (Latin))
[ci skip]
* New translations doorkeeper.en.yml (Serbian (Cyrillic))
[ci skip]
* New translations doorkeeper.en.yml (Croatian)
[ci skip]
* New translations devise.en.yml (Esperanto)
[ci skip]
* New translations devise.en.yml (Ukrainian)
[ci skip]
* New translations devise.en.yml (Basque)
[ci skip]
* New translations devise.en.yml (Thai)
[ci skip]
* New translations devise.en.yml (French)
[ci skip]
* New translations devise.en.yml (Japanese)
[ci skip]
* New translations activerecord.en.yml (Swedish)
[ci skip]
* New translations devise.en.yml (Czech)
[ci skip]
* New translations doorkeeper.en.yml (Indonesian)
[ci skip]
* New translations devise.en.yml (Indonesian)
[ci skip]
* New translations doorkeeper.en.yml (Ido)
[ci skip]
* New translations doorkeeper.en.yml (Hebrew)
[ci skip]
* New translations doorkeeper.en.yml (Georgian)
[ci skip]
* New translations doorkeeper.en.yml (Welsh)
[ci skip]
* New translations doorkeeper.en.yml (Russian)
[ci skip]
* New translations doorkeeper.en.yml (Thai)
[ci skip]
* New translations doorkeeper.en.yml (Norwegian)
[ci skip]
* New translations doorkeeper.en.yml (Turkish)
[ci skip]
* New translations devise.en.yml (Arabic)
[ci skip]
* New translations doorkeeper.en.yml (Esperanto)
[ci skip]
* New translations devise.en.yml (Catalan)
[ci skip]
* New translations devise.en.yml (Chinese Traditional)
[ci skip]
* New translations devise.en.yml (Greek)
[ci skip]
* New translations devise.en.yml (Italian)
[ci skip]
* New translations devise.en.yml (Korean)
[ci skip]
* New translations devise.en.yml (Turkish)
[ci skip]
* New translations devise.en.yml (Spanish, Argentina)
[ci skip]
* New translations devise.en.yml (Welsh)
[ci skip]
* New translations en.yml (Swedish)
[ci skip]
* i18n-tasks normalize
* yarn manage:translations
2019-10-10 20:30:28 +02:00
b3dd0d276d
Increase poll option length limit to 100 chars, number of options to 5
2019-10-10 20:13:59 +02:00
de59e7e6a0
Remove unused translations in web UI ( #12143 )
2019-10-10 20:07:38 +02:00
1fc5b61351
New Crowdin translations ( #12072 )
...
* New translations en.yml (German)
[ci skip]
* New translations simple_form.en.yml (German)
[ci skip]
* New translations en.yml (Slovak)
[ci skip]
* New translations en.yml (Slovak)
[ci skip]
* New translations en.json (Arabic)
[ci skip]
* New translations en.json (Arabic)
[ci skip]
* New translations en.yml (Arabic)
[ci skip]
* New translations devise.en.yml (Arabic)
[ci skip]
* New translations en.yml (Arabic)
[ci skip]
* New translations en.yml (Arabic)
[ci skip]
* New translations devise.en.yml (Arabic)
[ci skip]
* New translations en.yml (Turkish)
[ci skip]
* New translations en.json (Norwegian Nynorsk)
[ci skip]
* New translations en.json (Norwegian Nynorsk)
[ci skip]
* New translations en.json (Norwegian Nynorsk)
[ci skip]
* New translations en.json (Basque)
[ci skip]
* New translations en.yml (Basque)
[ci skip]
* New translations en.json (Norwegian Nynorsk)
[ci skip]
* New translations en.json (Basque)
[ci skip]
* New translations en.yml (Basque)
[ci skip]
* New translations simple_form.en.yml (Basque)
[ci skip]
* New translations devise.en.yml (Basque)
[ci skip]
* New translations en.json (Basque)
[ci skip]
* New translations en.yml (Basque)
[ci skip]
* New translations en.json (Thai)
[ci skip]
* New translations en.yml (Thai)
[ci skip]
* New translations devise.en.yml (Thai)
[ci skip]
* New translations en.yml (Thai)
[ci skip]
* New translations en.yml (Thai)
[ci skip]
* New translations en.json (Thai)
[ci skip]
* New translations en.yml (Thai)
[ci skip]
* New translations en.yml (Thai)
[ci skip]
* New translations en.yml (Turkish)
[ci skip]
* New translations en.yml (Turkish)
[ci skip]
* New translations en.yml (Spanish, Argentina)
[ci skip]
* New translations en.yml (French)
[ci skip]
* New translations en.json (French)
[ci skip]
* New translations en.json (French)
[ci skip]
* New translations devise.en.yml (French)
[ci skip]
* New translations en.yml (French)
[ci skip]
* New translations simple_form.en.yml (French)
[ci skip]
* New translations en.json (French)
[ci skip]
* New translations en.json (French)
[ci skip]
* New translations en.json (French)
[ci skip]
* New translations en.yml (Thai)
[ci skip]
* New translations en.yml (Thai)
[ci skip]
* New translations simple_form.en.yml (Thai)
[ci skip]
* New translations en.yml (Thai)
[ci skip]
* New translations en.yml (Thai)
[ci skip]
* New translations en.json (Slovak)
[ci skip]
* New translations en.yml (Turkish)
[ci skip]
* New translations en.yml (French)
[ci skip]
* New translations en.yml (French)
[ci skip]
* New translations en.yml (French)
[ci skip]
* New translations en.yml (French)
[ci skip]
* New translations simple_form.en.yml (French)
[ci skip]
* New translations en.yml (French)
[ci skip]
* New translations en.yml (Basque)
[ci skip]
* New translations en.json (Basque)
[ci skip]
* New translations en.yml (Basque)
[ci skip]
* New translations simple_form.en.yml (Basque)
[ci skip]
* New translations en.json (Basque)
[ci skip]
* New translations en.yml (Basque)
[ci skip]
* New translations simple_form.en.yml (Basque)
[ci skip]
* New translations en.json (Basque)
[ci skip]
* New translations en.yml (Basque)
[ci skip]
* New translations simple_form.en.yml (Basque)
[ci skip]
* New translations en.json (Basque)
[ci skip]
* New translations en.yml (Basque)
[ci skip]
* New translations en.yml (Basque)
[ci skip]
* New translations en.yml (Basque)
[ci skip]
* New translations en.json (French)
[ci skip]
* New translations devise.en.yml (Japanese)
[ci skip]
* New translations en.json (Japanese)
[ci skip]
* New translations en.yml (Japanese)
[ci skip]
* New translations en.yml (Indonesian)
[ci skip]
* New translations en.yml (Turkish)
[ci skip]
* New translations en.yml (Indonesian)
[ci skip]
* New translations en.yml (Indonesian)
[ci skip]
* New translations en.yml (Spanish, Argentina)
[ci skip]
* New translations en.yml (Spanish, Argentina)
[ci skip]
* New translations en.yml (Turkish)
[ci skip]
* New translations en.json (Spanish, Argentina)
[ci skip]
* New translations en.yml (Turkish)
[ci skip]
* New translations en.yml (Korean)
[ci skip]
* New translations simple_form.en.yml (Greek)
[ci skip]
* New translations en.json (Hungarian)
[ci skip]
* New translations en.yml (Hungarian)
[ci skip]
* New translations en.yml (Spanish, Argentina)
[ci skip]
* New translations en.json (Catalan)
[ci skip]
* New translations en.json (Catalan)
[ci skip]
* New translations en.json (Greek)
[ci skip]
* New translations simple_form.en.yml (Greek)
[ci skip]
* New translations devise.en.yml (Greek)
[ci skip]
* New translations en.yml (Greek)
[ci skip]
* New translations devise.en.yml (Greek)
[ci skip]
* New translations en.yml (Greek)
[ci skip]
* New translations en.yml (Indonesian)
[ci skip]
* New translations en.yml (Indonesian)
[ci skip]
* New translations en.yml (Indonesian)
[ci skip]
* New translations en.yml (Indonesian)
[ci skip]
* New translations en.yml (Indonesian)
[ci skip]
* New translations en.yml (Indonesian)
[ci skip]
* New translations en.yml (Esperanto)
[ci skip]
* New translations en.yml (Estonian)
[ci skip]
* New translations en.yml (Dutch)
[ci skip]
* New translations en.yml (Finnish)
[ci skip]
* New translations en.yml (Galician)
[ci skip]
* New translations en.yml (Chinese Simplified)
[ci skip]
* New translations en.yml (Chinese Traditional)
[ci skip]
* New translations en.yml (Corsican)
[ci skip]
* New translations en.yml (Czech)
[ci skip]
* New translations en.yml (Danish)
[ci skip]
* New translations en.yml (German)
[ci skip]
* New translations en.yml (Catalan)
[ci skip]
* New translations en.yml (Persian)
[ci skip]
* New translations en.yml (Occitan)
[ci skip]
* New translations en.yml (Korean)
[ci skip]
* New translations en.yml (Polish)
[ci skip]
* New translations en.yml (Greek)
[ci skip]
* New translations en.yml (Hungarian)
[ci skip]
* New translations en.yml (Italian)
[ci skip]
* New translations en.yml (Japanese)
[ci skip]
* New translations en.yml (Kazakh)
[ci skip]
* New translations en.yml (Hebrew)
[ci skip]
* New translations en.yml (Ido)
[ci skip]
* New translations en.yml (Indonesian)
[ci skip]
* New translations en.yml (Georgian)
[ci skip]
* New translations en.yml (Asturian)
[ci skip]
* New translations en.yml (Bulgarian)
[ci skip]
* New translations en.yml (Chinese Traditional, Hong Kong)
[ci skip]
* New translations en.yml (Croatian)
[ci skip]
* New translations en.yml (Lithuanian)
[ci skip]
* New translations en.yml (Arabic)
[ci skip]
* New translations en.yml (Albanian)
[ci skip]
* New translations en.yml (French)
[ci skip]
* New translations en.yml (Basque)
[ci skip]
* New translations en.yml (Bengali)
[ci skip]
* New translations en.yml (Malay)
[ci skip]
* New translations en.yml (Norwegian)
[ci skip]
* New translations en.yml (Telugu)
[ci skip]
* New translations en.yml (Swedish)
[ci skip]
* New translations en.yml (Thai)
[ci skip]
* New translations en.yml (Turkish)
[ci skip]
* New translations en.yml (Welsh)
[ci skip]
* New translations en.yml (Spanish, Argentina)
[ci skip]
* New translations en.yml (Spanish)
[ci skip]
* New translations en.yml (Serbian (Cyrillic))
[ci skip]
* New translations en.yml (Serbian (Latin))
[ci skip]
* New translations en.yml (Ukrainian)
[ci skip]
* New translations en.yml (Slovak)
[ci skip]
* New translations en.yml (Russian)
[ci skip]
* New translations en.yml (Slovenian)
[ci skip]
* New translations en.yml (Portuguese)
[ci skip]
* New translations en.yml (Portuguese, Brazilian)
[ci skip]
* New translations en.json (Indonesian)
[ci skip]
* New translations en.yml (Indonesian)
[ci skip]
* New translations en.json (Indonesian)
[ci skip]
* New translations en.json (Indonesian)
[ci skip]
* New translations en.json (Galician)
[ci skip]
* New translations en.json (Galician)
[ci skip]
* New translations en.yml (Galician)
[ci skip]
* New translations en.yml (Japanese)
[ci skip]
* New translations en.yml (Spanish, Argentina)
[ci skip]
* New translations en.yml (Spanish, Argentina)
[ci skip]
* New translations en.yml (Corsican)
[ci skip]
* New translations en.yml (Spanish, Argentina)
[ci skip]
* New translations en.yml (Greek)
[ci skip]
* New translations en.yml (Greek)
[ci skip]
* New translations en.yml (French)
[ci skip]
* New translations en.yml (Czech)
[ci skip]
* New translations en.yml (Arabic)
[ci skip]
* New translations en.json (Spanish)
[ci skip]
* New translations en.json (Spanish)
[ci skip]
* New translations en.yml (Spanish)
[ci skip]
* New translations en.yml (Spanish)
[ci skip]
* New translations en.yml (Japanese)
[ci skip]
* New translations en.yml (Japanese)
[ci skip]
* New translations simple_form.en.yml (Arabic)
[ci skip]
* New translations simple_form.en.yml (Arabic)
[ci skip]
* New translations en.yml (Spanish)
[ci skip]
* New translations en.yml (Arabic)
[ci skip]
* New translations simple_form.en.yml (Arabic)
[ci skip]
* New translations en.yml (Spanish)
[ci skip]
* New translations en.yml (Spanish)
[ci skip]
* New translations en.yml (Spanish)
[ci skip]
* New translations en.yml (Spanish)
[ci skip]
* New translations en.json (Japanese)
[ci skip]
* New translations en.yml (Spanish, Argentina)
[ci skip]
* New translations en.yml (Japanese)
[ci skip]
* New translations en.json (Spanish, Argentina)
[ci skip]
* New translations en.yml (Spanish, Argentina)
[ci skip]
* New translations en.json (Esperanto)
[ci skip]
* New translations en.yml (Esperanto)
[ci skip]
* New translations en.yml (Korean)
[ci skip]
* New translations en.yml (Esperanto)
[ci skip]
* New translations en.yml (Esperanto)
[ci skip]
* New translations simple_form.en.yml (Esperanto)
[ci skip]
* New translations devise.en.yml (Esperanto)
[ci skip]
* New translations en.yml (Korean)
[ci skip]
* New translations en.yml (Dutch)
[ci skip]
* New translations en.yml (German)
[ci skip]
* New translations en.yml (Catalan)
[ci skip]
* New translations en.yml (Turkish)
[ci skip]
* New translations activerecord.en.yml (Swedish)
[ci skip]
* New translations activerecord.en.yml (Swedish)
[ci skip]
* New translations en.json (Czech)
[ci skip]
* New translations en.yml (Czech)
[ci skip]
* New translations devise.en.yml (Czech)
[ci skip]
* New translations en.yml (Italian)
[ci skip]
* New translations en.yml (Japanese)
[ci skip]
* New translations en.yml (Korean)
[ci skip]
* New translations en.yml (Hungarian)
[ci skip]
* New translations en.yml (Persian)
[ci skip]
* New translations en.yml (Estonian)
[ci skip]
* New translations en.yml (Galician)
[ci skip]
* New translations en.yml (German)
[ci skip]
* New translations en.yml (Greek)
[ci skip]
* New translations en.yml (Dutch)
[ci skip]
* New translations en.yml (Portuguese, Brazilian)
[ci skip]
* New translations en.yml (Slovenian)
[ci skip]
* New translations en.yml (Spanish)
[ci skip]
* New translations en.yml (Catalan)
[ci skip]
* New translations en.yml (Corsican)
[ci skip]
* New translations en.yml (Czech)
[ci skip]
* New translations en.yml (Ukrainian)
[ci skip]
* New translations en.yml (Basque)
[ci skip]
* New translations en.yml (French)
[ci skip]
* New translations en.json (Arabic)
[ci skip]
* New translations en.yml (Arabic)
[ci skip]
* New translations en.yml (Czech)
[ci skip]
* New translations en.yml (Japanese)
[ci skip]
* New translations en.json (Swedish)
[ci skip]
* New translations en.yml (Arabic)
[ci skip]
* New translations en.yml (Czech)
[ci skip]
* New translations en.yml (German)
[ci skip]
* New translations en.json (Polish)
[ci skip]
* New translations en.json (Swedish)
[ci skip]
* New translations devise.en.yml (Czech)
[ci skip]
* New translations en.json (Polish)
[ci skip]
* New translations en.json (Polish)
[ci skip]
* New translations en.json (Swedish)
[ci skip]
* New translations en.json (Polish)
[ci skip]
* i18n-tasks normalize
* yarn manage:translations
* New translations en.yml (French)
[ci skip]
* New translations en.json (Swedish)
[ci skip]
* New translations activerecord.en.yml (Persian)
[ci skip]
* i18n-tasks normalize
* yarn manage:translations
2019-10-10 19:59:27 +02:00
aa509a3d8a
Fix auto-report string saying the account has been auto-silenced ( #12142 )
2019-10-10 18:47:24 +02:00
61631f4751
Merge branch 'master' into glitch-soc/merge-upstream
...
Conflicts:
- README.md
- app/javascript/styles/mastodon/components.scss
conflicts caused by image URLs being different
- app/models/status.rb
as_home_timeline removed, kept glitch-soc-only as_direct_timeline
- app/views/statuses/_simple_status.html.haml
- config/locales/en.yml
some strings were changed upstream
- spec/models/status_spec.rb
as_home_timeline removed, kept glitch-soc-only as_direct_timeline
2019-10-10 17:26:08 +02:00
bc0399d54d
Ensure pack is set when rendering OTP prompt
...
Fixes #1230
2019-10-10 17:08:00 +02:00
6ebd74f4fa
Fix media editing modal changing dimensions when image loads ( #12131 )
2019-10-10 05:21:38 +02:00
915f3712ae
Fix admin setting to auto-approve hashtags not affecting query ( #12130 )
...
Follow-up to #12122
2019-10-10 02:22:04 +02:00
30a28a2eb7
Fix not showing if emoji has a local counterpart in admin UI ( #12135 )
...
Fix #12132
2019-10-10 02:21:52 +02:00
b5f7e12817
Remove auto-silence behaviour from spam check ( #12117 )
...
Fix #12113
2019-10-09 07:11:23 +02:00
Eugen Rochko