480d7c9478 
								
							 
						 
						
							
							
								
								Fix missing source strings and inconsistent lead text style in admin UI ( #16052 )  
							
							
							
						 
						
							2021-04-17 11:12:49 +02:00  
				
					
						
							
							
								 
						
							
								b3ceb3dcc4 
								
							 
						 
						
							
							
								
								Add canonical e-mail blocks for suspended accounts ( #16049 )  
							
							... 
							
							
							
							Prevent new accounts from being created using the same underlying
e-mail as a suspended account using extensions and period
permutations. Stores e-mails as a SHA256 hash 
							
						 
						
							2021-04-17 03:14:25 +02:00  
				
					
						
							
							
								 
						
							
								dde8739020 
								
							 
						 
						
							
							
								
								Fix reports of already suspended accounts being recorded ( #16047 )  
							
							
							
						 
						
							2021-04-16 22:01:05 +02:00  
				
					
						
							
							
								 
						
							
								baed52c2a7 
								
							 
						 
						
							
							
								
								Fix not to show follow button in global suggestion ( #16045 )  
							
							... 
							
							
							
							* Fix not to show follow button in global suggestion
* Fix style 
							
						 
						
							2021-04-16 10:06:42 +02:00  
				
					
						
							
							
								 
						
							
								9bb3341849 
								
							 
						 
						
							
							
								
								Fix to update suggestion list after dismiss ( #16044 )  
							
							... 
							
							
							
							* Fix to update suggestion list after dismiss
* Change to inline
* Fix style 
							
						 
						
							2021-04-16 10:06:16 +02:00  
				
					
						
							
							
								 
						
							
								3b8d085436 
								
							 
						 
						
							
							
								
								Fix app name, website and redirect URIs not having a maximum length ( #16042 )  
							
							... 
							
							
							
							Fix app scopes not being validated 
							
						 
						
							2021-04-15 16:28:43 +02:00  
				
					
						
							
							
								 
						
							
								ce2148c571 
								
							 
						 
						
							
							
								
								Add `policy` param to `POST /api/v1/push/subscriptions` ( #16040 )  
							
							... 
							
							
							
							With possible values `all`, `followed`, `follower`, and `none`,
control from whom notifications will generate a Web Push alert 
							
						 
						
							2021-04-15 05:00:25 +02:00  
				
					
						
							
							
								 
						
							
								c968d22ee9 
								
							 
						 
						
							
							
								
								Fix an error with 'multiple mentions with same username' ( #16038 )  
							
							
							
						 
						
							2021-04-14 15:48:49 +02:00  
				
					
						
							
							
								 
						
							
								e78d06eecf 
								
							 
						 
						
							
							
								
								Add border to  🚲  emoji ( #16035 )  
							
							
							
						 
						
							2021-04-13 23:43:51 +02:00  
				
					
						
							
							
								 
						
							
								120965eb0b 
								
							 
						 
						
							
							
								
								Change Web Push API deliveries to use request pooling ( #16014 )  
							
							
							
						 
						
							2021-04-12 14:25:34 +02:00  
				
					
						
							
							
								 
						
							
								f7117646af 
								
							 
						 
						
							
							
								
								Add cold-start follow recommendations ( #15945 )  
							
							
							
						 
						
							2021-04-12 12:37:14 +02:00  
				
					
						
							
							
								 
						
							
								619fad6cf8 
								
							 
						 
						
							
							
								
								Remove spam check and dependency on nilsimsa gem ( #16011 )  
							
							
							
						 
						
							2021-04-11 11:22:50 +02:00  
				
					
						
							
							
								 
						
							
								7183d9a113 
								
							 
						 
						
							
							
								
								Change multiple mentions with same username to render with domain ( #15718 )  
							
							... 
							
							
							
							Fix  #15506  
						
							2021-04-10 11:51:02 +02:00  
				
					
						
							
							
								 
						
							
								c5fe0864d1 
								
							 
						 
						
							
							
								
								Fix SidekiqProcessCheck checking for a queue name that isn't used in Mastodon ( #16002 )  
							
							
							
						 
						
							2021-04-05 23:41:37 +02:00  
				
					
						
							
							
								 
						
							
								2ae8c41e5d 
								
							 
						 
						
							
							
								
								[Glitch] Add system checks to dashboard in admin UI  
							
							... 
							
							
							
							Port SCSS changes from 487e37d6d4 
							
						 
						
							2021-04-05 14:34:36 +02:00  
				
					
						
							
							
								 
						
							
								6be0b4b014 
								
							 
						 
						
							
							
								
								[Glitch] Fix crash in old browsers  
							
							... 
							
							
							
							Port abad99fa10 
							
						 
						
							2021-04-05 14:33:42 +02:00  
				
					
						
							
							
								 
						
							
								c901ae77d4 
								
							 
						 
						
							
							
								
								Merge branch 'main' into glitch-soc/merge-upstream  
							
							
							
						 
						
							2021-04-05 14:31:07 +02:00  
				
					
						
							
							
								 
						
							
								39b9a0619a 
								
							 
						 
						
							
							
								
								Remove superfluous toot length check  
							
							
							
						 
						
							2021-04-05 14:30:43 +02:00  
				
					
						
							
							
								 
						
							
								117f6638d0 
								
							 
						 
						
							
							
								
								Fix SVG files not being correctly included in templates ( #16001 )  
							
							... 
							
							
							
							In Rails 6.1, raw file inclusion in templates have to be explicitly marked as
HTML-safe, otherwise it's rendered as text. 
							
						 
						
							2021-04-05 13:05:49 +02:00  
				
					
						
							
							
								 
						
							
								487e37d6d4 
								
							 
						 
						
							
							
								
								Add system checks to dashboard in admin UI ( #15989 )  
							
							
							
						 
						
							2021-04-03 14:12:30 +02:00  
				
					
						
							
							
								 
						
							
								82cce18227 
								
							 
						 
						
							
							
								
								Change health check ( #15988 )  
							
							
							
						 
						
							2021-04-03 02:39:04 +02:00  
				
					
						
							
							
								 
						
							
								abad99fa10 
								
							 
						 
						
							
							
								
								Fix crash in old browsers ( #15985 )  
							
							... 
							
							
							
							Fixes  #15984  
						
							2021-04-01 00:00:12 +02:00  
				
					
						
							
							
								 
						
							
								15efa32cca 
								
							 
						 
						
							
							
								
								Merge branch 'main' into glitch-soc/merge-upstream  
							
							
							
						 
						
							2021-03-31 10:34:29 +02:00  
				
					
						
							
							
								 
						
							
								a650a1157d 
								
							 
						 
						
							
							
								
								Fix /admin/tags/:id crashing since Rails 6.1 update ( #15953 )  
							
							... 
							
							
							
							Raw SQL passed to `pluck` now has to be explicitly marked as SQL via
Arel.sql, see https://github.com/rails/rails/pull/27947  
							
						 
						
							2021-03-26 18:36:16 +01:00  
				
					
						
							
							
								 
						
							
								59f94593d0 
								
							 
						 
						
							
							
								
								Add warning in admin dashboard if some required queues are not handled ( #15954 )  
							
							
							
						 
						
							2021-03-26 18:22:54 +01:00  
				
					
						
							
							
								 
						
							
								dd1eb9918a 
								
							 
						 
						
							
							
								
								Add `email` param to `POST /api/v1/emails/confirmations` ( #15949 )  
							
							... 
							
							
							
							Allow changing e-mail as long as the account is unconfirmed 
							
						 
						
							2021-03-25 02:46:13 +01:00  
				
					
						
							
							
								 
						
							
								f8e50eaea3 
								
							 
						 
						
							
							
								
								Add transition to media modal background ( #15843 )  
							
							... 
							
							
							
							* Add transition to media modal background
* use reduceMotion
* Move background color transition into css
Signed-off-by: marcin mikołajczak <me@mkljczk.pl> 
							
						 
						
							2021-03-24 13:51:32 +01:00  
				
					
						
							
							
								 
						
							
								5ea53b6158 
								
							 
						 
						
							
							
								
								[Glitch] Fix compose form behavior in mobile view  
							
							... 
							
							
							
							Port 034f37b85a 
							
						 
						
							2021-03-24 11:21:21 +01:00  
				
					
						
							
							
								 
						
							
								b61e44461c 
								
							 
						 
						
							
							
								
								[Glitch] Bump react-select from 3.2.0 to 4.0.2  
							
							... 
							
							
							
							Add cacheKey to NonceProvider for react-select
Port changes from c3aef491d6 
							
						 
						
							2021-03-24 11:01:57 +01:00  
				
					
						
							
							
								 
						
							
								f60c99a8fb 
								
							 
						 
						
							
							
								
								Merge branch 'main' into glitch-soc/merge-upstream  
							
							
							
						 
						
							2021-03-24 10:53:50 +01:00  
				
					
						
							
							
								 
						
							
								cbd0ee1d07 
								
							 
						 
						
							
							
								
								Update Mastodon to Rails 6.1 ( #15910 )  
							
							... 
							
							
							
							* Update devise-two-factor to unreleased fork for Rails 6 support
Update tests to match new `rotp` version.
* Update nsa gem to unreleased fork for Rails 6 support
* Update rails to 6.1.3 and rails-i18n to 6.0
* Update to unreleased fork of pluck_each for Ruby 6 support
* Run "rails app:update"
* Add missing ActiveStorage config file
* Use config.ssl_options instead of removed ApplicationController#force_ssl
Disabled force_ssl-related tests as they do not seem to be easily testable
anymore.
* Fix nonce directives by removing Rails 5 specific monkey-patching
* Fix fixture_file_upload deprecation warning
* Fix yield-based test failing with Rails 6
* Use Rails 6's index_with when possible
* Use ActiveRecord::Cache::Store#delete_multi from Rails 6
This will yield better performances when deleting an account
* Disable Rails 6.1's automatic preload link headers
Since Rails 6.1, ActionView adds preload links for javascript files
in the Links header per default.
In our case, that will bloat headers too much and potentially cause
issues with reverse proxies. Furhermore, we don't need those links,
as we already output them as HTML link tags.
* Switch to Rails 6.0 default config
* Switch to Rails 6.1 default config
* Do not include autoload paths in the load path 
							
						 
						
							2021-03-24 10:44:31 +01:00  
				
					
						
							
							
								 
						
							
								1c4dee4554 
								
							 
						 
						
							
							
								
								Fix Mastodon not understanding as:Public and Public ( #15948 )  
							
							... 
							
							
							
							Fixes  #5551  
						
							2021-03-24 10:19:40 +01:00  
				
					
						
							
							
								 
						
							
								034f37b85a 
								
							 
						 
						
							
							
								
								Fix compose form behavior in mobile view ( #15555 )  
							
							... 
							
							
							
							* Fix ComposeForm being mounted twice in mobile view
Fixes  #13094 
* Fix compose form focus and pre-selection behavior in mobile view
* Split _updateFocusAndSelection out of componentDidUpdate 
							
						 
						
							2021-03-24 10:19:07 +01:00  
				
					
						
							
							
								 
						
							
								c3aef491d6 
								
							 
						 
						
							
							
								
								Bump react-select from 3.2.0 to 4.0.2 ( #15624 )  
							
							... 
							
							
							
							* Bump react-select from 3.2.0 to 4.0.2
Bumps [react-select](https://github.com/JedWatson/react-select ) from 3.2.0 to 4.0.2.
- [Release notes](https://github.com/JedWatson/react-select/releases )
- [Changelog](https://github.com/JedWatson/react-select/blob/master/docs/CHANGELOG.md )
- [Commits](https://github.com/JedWatson/react-select/compare/react-select@3.2.0...react-select@4.0.2 )
Signed-off-by: dependabot[bot] <support@github.com>
* Add cacheKey to NonceProvider for react-select
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: Yamagishi Kazutoshi <ykzts@desire.sh> 
							
						 
						
							2021-03-22 15:41:47 +09:00  
				
					
						
							
							
								 
						
							
								876840e9ef 
								
							 
						 
						
							
							
								
								Fix brakeman warning ( #15870 )  
							
							... 
							
							
							
							As far as I understand, the brakeman warning was a false-positive as
`content_tag` properly escapes untrusted HTML. Furthermore, the interpolated
string values are built from the “username” part of accounts, which is
restricted to a small subset of ASCII that precludes any XML entity or HTML
code.
This proposed change should be functionally equivalent to the current code,
however it is slightly more robust, it's more idiomatic, and Brakeman will
stop complaining about it. 
							
						 
						
							2021-03-19 23:48:59 +01:00  
				
					
						
							
							
								 
						
							
								051efed5ed 
								
							 
						 
						
							
							
								
								Bypass MX validation for explicitly allowed domains ( #15930 )  
							
							... 
							
							
							
							* Bypass MX validation for explicitly allowed domains
This spares some lookups and prevent issues in some edge cases with
local domains.
* Add tests
* Fix test 
							
						 
						
							2021-03-19 23:48:47 +01:00  
				
					
						
							
							
								 
						
							
								5d48402be1 
								
							 
						 
						
							
							
								
								Fixing the hero widget ( #15926 )  
							
							... 
							
							
							
							* Removing last-child padding conflicts with light theme in hero widget
* Add missing background color to widget
* Reset widget.scss to default
* Hope this works
Co-authored-by: koyu <me@koyu.space> 
							
						 
						
							2021-03-19 20:23:32 +01:00  
				
					
						
							
							
								 
						
							
								39a490c70e 
								
							 
						 
						
							
							
								
								Fix custom CSS when CDN_HOST is set ( #15927 )  
							
							
							
						 
						
							2021-03-19 20:23:08 +01:00  
				
					
						
							
							
								 
						
							
								af8fe6e1e9 
								
							 
						 
						
							
							
								
								WIP ( #15222 )  
							
							
							
						 
						
							2021-03-19 17:15:36 +01:00  
				
					
						
							
							
								 
						
							
								2bb573d021 
								
							 
						 
						
							
							
								
								Messing around with box-shadow  
							
							... 
							
							
							
							Signed-off-by: Claire <claire.github-309c@sitedethib.com> 
							
						 
						
							2021-03-19 14:47:57 +01:00  
				
					
						
							
							
								 
						
							
								e71f4d468b 
								
							 
						 
						
							
							
								
								Add more button states?  
							
							... 
							
							
							
							Signed-off-by: Claire <claire.github-309c@sitedethib.com> 
							
						 
						
							2021-03-19 14:47:54 +01:00  
				
					
						
							
							
								 
						
							
								200d7a1708 
								
							 
						 
						
							
							
								
								Change notification settings UI to be more compact  
							
							... 
							
							
							
							Signed-off-by: Claire <claire.github-309c@sitedethib.com> 
							
						 
						
							2021-03-19 14:47:06 +01:00  
				
					
						
							
							
								 
						
							
								3b7b607300 
								
							 
						 
						
							
							
								
								Migrate glitch-soc local notification settings to upstream system  
							
							
							
						 
						
							2021-03-19 13:57:36 +01:00  
				
					
						
							
							
								 
						
							
								db6551ec09 
								
							 
						 
						
							
							
								
								Add option to opt out of unread notification markers  
							
							... 
							
							
							
							Port 55ac2b9c60 
							
						 
						
							2021-03-19 13:57:32 +01:00  
				
					
						
							
							
								 
						
							
								3ad6ef72cb 
								
							 
						 
						
							
							
								
								Merge branch 'main' into glitch-soc/merge-upstream  
							
							
							
						 
						
							2021-03-19 13:57:15 +01:00  
				
					
						
							
							
								 
						
							
								741d0952b1 
								
							 
						 
						
							
							
								
								Improve account counters handling ( #15913 )  
							
							... 
							
							
							
							* Improve account counters handling
* Use ActiveRecord::Base::sanitize_sql to pass values instead of interpolating them
Keep using string interpolation for `key` as it is safe and using
“ActiveRecord::Base::sanitize_sql_hash_for_assignment” would require stitching
bits of SQL in a way that is not more easily checked for safety.
* Add migration hook to catch PostgreSQL versions earlier than 9.5 
							
						 
						
							2021-03-19 13:14:57 +01:00  
				
					
						
							
							
								 
						
							
								b358229834 
								
							 
						 
						
							
							
								
								Further preparation for Rails 6 ( #15916 )  
							
							... 
							
							
							
							* Use ActiveRecord::Result#to_ary instead of deprecated to_hash
They do the same thing, and to_hash has been removed from Rails 6.1
* Explicitly name polymorphic indexes to workaround a bug in Rails 6.1
cf. https://github.com/rails/rails/issues/41693 
* Fix incorrect usage of “foreign_key” in migration script
* Use `ActiveModel::Errors#delete` instead of deprecated clear method
* Fix link headers tests on Rails 6.1
Rails 6.1 adds values to the Link header by default, thus it is not a
LinkHeader object anymore. Fix the test to parse the Link header instead
of assuming it is a LinkHeader. 
							
						 
						
							2021-03-19 02:45:34 +01:00  
				
					
						
							
							
								 
						
							
								55ac2b9c60 
								
							 
						 
						
							
							
								
								Add option to opt out of unread notification markers ( #15842 )  
							
							... 
							
							
							
							Fixes  #15133  
						
							2021-03-19 02:44:57 +01:00  
				
					
						
							
							
								 
						
							
								a4dcaef53b 
								
							 
						 
						
							
							
								
								Prepare Mastodon for zeitwerk autoloader ( #15917 )  
							
							... 
							
							
							
							* Prepare Mastodon for zeitwerk autoloader (Rails 6)
Add inflections and rename/move a few classes.
In particular, app/lib/exceptions.rb and app/lib/sanitize_config.rb
were manually loaded while still in autoload paths.
* Add inflection for Url → URL 
							
						 
						
							2021-03-19 02:42:43 +01:00  
				
					
						
							
							
								 
						
							
								5027abecd1 
								
							 
						 
						
							
							
								
								Fix cache_collection crashing when given an empty collection ( #15921 )  
							
							... 
							
							
							
							* Fix cache_collection crashing when given an empty collection
* Add tests 
							
						 
						
							2021-03-18 00:41:32 +01:00  
				
					
						
							
							
								 
						
							
								43eff898a0 
								
							 
						 
						
							
							
								
								Prepare Mastodon for Rails 6 ( #15911 )  
							
							... 
							
							
							
							* Fix misuse of foreign_type
* Fix use of removed "add_template_helper"
* Use response.media_type instead of response.content_type in tests
* Fix CSV export controller test on Rails 6
Rails 6 sets a "filename*" field in the Content-Disposition header to
explicitly encode the filename as UTF-8.
This changes checks the first part of the Content-Disposition header so
it matches in both Rails 5 and Rails 6.
* Fix emoji formatting with Rails 6
* Make emoji output more idiomatic and robust
* Switch from redis-rails gem to built-in Rails redis cache storage 
							
						 
						
							2021-03-17 10:09:55 +01:00  
				
					
						
							
							
								 
						
							
								eac4a3e9c8 
								
							 
						 
						
							
							
								
								Merge branch 'main' into glitch-soc/merge-upstream  
							
							
							
						 
						
							2021-03-15 11:26:59 +01:00  
				
					
						
							
							
								 
						
							
								e89e976e92 
								
							 
						 
						
							
							
								
								Fix configuration for sidekiq-unique-jobs after 7.x upgrade ( #15908 )  
							
							... 
							
							
							
							Remove locks from scheduled jobs 
							
						 
						
							2021-03-15 11:17:43 +01:00  
				
					
						
							
							
								 
						
							
								3dc94d9f91 
								
							 
						 
						
							
							
								
								Fix reference to non-existing translation in the exports page. ( #15894 )  
							
							... 
							
							
							
							The exports page showed a different "CSV" capitalisation in the
"Bookmarks" row ("Csv") compared to the other rows ("CSV").
This was due to a referece to a translation string that does not exist,
`bookmarks.csv`, defaulting to the key's last segment in title case.
This issue was introduced in commit dcd86204 (PR #14956 ).
(h/t @meqif for helping with figuring out the bug) 
							
						 
						
							2021-03-15 02:17:29 +01:00  
				
					
						
							
							
								 
						
							
								995ad2af30 
								
							 
						 
						
							
							
								
								Fix DM timeline failing to load from database  
							
							
							
						 
						
							2021-03-12 23:17:34 +01:00  
				
					
						
							
							
								 
						
							
								1b02d29be5 
								
							 
						 
						
							
							
								
								Fix not being able to change world filter expiration back to “Never” ( #15858 )  
							
							... 
							
							
							
							Fixes  #15849  
						
							2021-03-12 05:25:50 +01:00  
				
					
						
							
							
								 
						
							
								5cc45d22d3 
								
							 
						 
						
							
							
								
								Remove subscription_expires_at leftover from OStatus ( #15857 )  
							
							
							
						 
						
							2021-03-12 05:25:24 +01:00  
				
					
						
							
							
								 
						
							
								1b6a21e6bc 
								
							 
						 
						
							
							
								
								Merge branch 'main' into glitch-soc/merge-upstream  
							
							... 
							
							
							
							Conflicts:
- `app/validators/status_length_validator.rb`:
  Conflict due to glitch-soc's configurable maximum toot chars.
  Ported upstream changes. 
							
						 
						
							2021-03-11 16:08:15 +01:00  
				
					
						
							
							
								 
						
							
								67c5cdea40 
								
							 
						 
						
							
							
								
								Fix some ignored brakeman warnings ( #15829 )  
							
							
							
						 
						
							2021-03-07 07:06:56 +01:00  
				
					
						
							
							
								 
						
							
								318efa49de 
								
							 
						 
						
							
							
								
								Fix various CodeClimate warnings  
							
							
							
						 
						
							2021-03-06 14:51:53 +01:00  
				
					
						
							
							
								 
						
							
								5614e6724e 
								
							 
						 
						
							
							
								
								Fix URL scanning in note length validator and preview card fetching ( #15827 )  
							
							... 
							
							
							
							* Add tests
* Fix URL scanning in note length validator and preview card fetching 
							
						 
						
							2021-03-04 00:12:26 +01:00  
				
					
						
							
							
								 
						
							
								7336276252 
								
							 
						 
						
							
							
								
								[Glitch] Update twitter-text from 1.14 to 3.1.0 and fix toot character counting  
							
							... 
							
							
							
							Port 65db262550 
							
						 
						
							2021-03-02 12:37:23 +01:00  
				
					
						
							
							
								 
						
							
								7cffe8dca7 
								
							 
						 
						
							
							
								
								[Glitch] Add borders to  📱  and  📲  emojis  
							
							... 
							
							
							
							Port a8139ab016 
							
						 
						
							2021-03-02 12:27:29 +01:00  
				
					
						
							
							
								 
						
							
								974ddc28a3 
								
							 
						 
						
							
							
								
								[Glitch] Fix WebUI crashing when SVG support is disabled  
							
							... 
							
							
							
							Port 0635c8760d 
							
						 
						
							2021-03-02 12:26:12 +01:00  
				
					
						
							
							
								 
						
							
								d8fdbb054e 
								
							 
						 
						
							
							
								
								Merge branch 'main' into glitch-soc/merge-upstream  
							
							... 
							
							
							
							Conflicts:
- `app/validators/status_length_validator.rb`:
  Upstream changes too close to glitch-soc MAX_CHARS changes, but not a real
  conflict.
  Applied upstream changes.
- `package.json`:
  glitch-soc-only dependency textually too close to a dependency updated
  upstream, not a real conflict.
  Applied upstream changes. 
							
						 
						
							2021-03-02 12:06:58 +01:00  
				
					
						
							
							
								 
						
							
								65db262550 
								
							 
						 
						
							
							
								
								Update twitter-text from 1.14 to 3.1.0 and fix toot character counting ( #15382 )  
							
							... 
							
							
							
							* Update twitter-text from 1.14 to 3.1.0
* Disable emoji parsing
* Properly depend on twitter-text for url detection
* Fix some URLs being wrongly detected client-side
* Add test for server-side validation of non-autolinkable URLs
* Fix server-side status length counting 
							
						 
						
							2021-03-02 12:02:56 +01:00  
				
					
						
							
							
								 
						
							
								a8139ab016 
								
							 
						 
						
							
							
								
								Add borders to  📱  and  📲  emojis ( #15794 )  
							
							
							
						 
						
							2021-03-01 21:22:54 +01:00  
				
					
						
							
							
								 
						
							
								ee1119208c 
								
							 
						 
						
							
							
								
								Add `POST /api/v1/emails/confirmations` to REST API ( #15816 )  
							
							... 
							
							
							
							Only available to the application the user originally signed-up with 
							
						 
						
							2021-03-01 18:39:47 +01:00  
				
					
						
							
							
								 
						
							
								9aa37b32c3 
								
							 
						 
						
							
							
								
								Add `details` to error response for `POST /api/v1/accounts` in REST API ( #15803 )  
							
							
							
						 
						
							2021-03-01 04:59:13 +01:00  
				
					
						
							
							
								 
						
							
								0635c8760d 
								
							 
						 
						
							
							
								
								Fix WebUI crashing when SVG support is disabled ( #15809 )  
							
							... 
							
							
							
							Fixes  #14910  
						
							2021-02-28 01:01:34 +01:00  
				
					
						
							
							
								 
						
							
								75189af528 
								
							 
						 
						
							
							
								
								Fix crash on receiving requests with missing Digest header ( #15782 )  
							
							... 
							
							
							
							* Fix crash on receiving requests with missing Digest header
Return an error pointing out that Digest is missing, instead of crashing.
Fixes  #15743 
* Fix from review feedback 
							
						 
						
							2021-02-26 17:40:27 +01:00  
				
					
						
							
							
								 
						
							
								4f19504986 
								
							 
						 
						
							
							
								
								Add inline description of moderation actions in moderation interface ( #15792 )  
							
							
							
						 
						
							2021-02-24 16:53:16 +01:00  
				
					
						
							
							
								 
						
							
								5f4c0b79c2 
								
							 
						 
						
							
							
								
								Change ResolveAccountService's handling of skip_webfinger ( #15750 )  
							
							... 
							
							
							
							* Change ResolveAccountService's handling of skip_webfinger
Change it so it never makes any webfinger query, as the name would imply.
* Add tests
* Change FollowService to not take an URI for target_account
* Restore domain-block check in FollowService
* Fix tests 
							
						 
						
							2021-02-24 06:32:13 +01:00  
				
					
						
							
							
								 
						
							
								1b50ac08c1 
								
							 
						 
						
							
							
								
								Fix server rules not being displayed if extended server discription isn't set ( #15778 )  
							
							
							
						 
						
							2021-02-22 18:26:24 +01:00  
				
					
						
							
							
								 
						
							
								6ae04d990c 
								
							 
						 
						
							
							
								
								[Glitch] Fix default searchTokens  
							
							... 
							
							
							
							Port 2127f40e6b 
							
						 
						
							2021-02-22 15:47:17 +01:00  
				
					
						
							
							
								 
						
							
								24fb5d7572 
								
							 
						 
						
							
							
								
								[Glitch] Add server rules  
							
							... 
							
							
							
							Port SCSS changes from 8331fdf7e0 
							
						 
						
							2021-02-22 15:45:28 +01:00  
				
					
						
							
							
								 
						
							
								679642e26c 
								
							 
						 
						
							
							
								
								Merge branch 'main' into glitch-soc/merge-upstream  
							
							
							
						 
						
							2021-02-22 15:23:46 +01:00  
				
					
						
							
							
								 
						
							
								2127f40e6b 
								
							 
						 
						
							
							
								
								Fix default searchTokens ( #15775 )  
							
							
							
						 
						
							2021-02-22 11:26:08 +01:00  
				
					
						
							
							
								 
						
							
								8331fdf7e0 
								
							 
						 
						
							
							
								
								Add server rules ( #15769 )  
							
							
							
						 
						
							2021-02-21 19:50:12 +01:00  
				
					
						
							
							
								 
						
							
								c9e8e1739c 
								
							 
						 
						
							
							
								
								replace all instances of "ends_with?" with "end_with?" ( #15745 )  
							
							... 
							
							
							
							The "ends_with?" method is just a Rails alias of Ruby's "end_with?" method.
Using the latter makes the code less brittle. 
							
						 
						
							2021-02-19 09:56:14 +01:00  
				
					
						
							
							
								 
						
							
								e31ed27485 
								
							 
						 
						
							
							
								
								Add `GET /api/v1/accounts/lookup` REST API ( #15740 )  
							
							
							
						 
						
							2021-02-16 15:28:32 +01:00  
				
					
						
							
							
								 
						
							
								49eef466b8 
								
							 
						 
						
							
							
								
								[Glitch] Add dropdown for boost privacy in boost confirmation modal  
							
							... 
							
							
							
							Port 07b46cb332 
							
						 
						
							2021-02-12 12:31:49 +01:00  
				
					
						
							
							
								 
						
							
								9213b02656 
								
							 
						 
						
							
							
								
								Refactor privacy dropdown to have an interface closer to upstream's  
							
							
							
						 
						
							2021-02-12 12:04:04 +01:00  
				
					
						
							
							
								 
						
							
								847779b1e4 
								
							 
						 
						
							
							
								
								[Glitch] Fixed WebUI crash when a status opened in the media modal is deleted  
							
							... 
							
							
							
							Port 08ae116dc6 
							
						 
						
							2021-02-12 10:58:34 +01:00  
				
					
						
							
							
								 
						
							
								8f24f7626a 
								
							 
						 
						
							
							
								
								[Glitch] Use custom mascot on static share page  
							
							... 
							
							
							
							Port d499bb031f 
							
						 
						
							2021-02-12 10:57:09 +01:00  
				
					
						
							
							
								 
						
							
								0e7484209c 
								
							 
						 
						
							
							
								
								[Glitch] Slightly reorder three dots menu on toots to make it more intuitive  
							
							... 
							
							
							
							Port f5fefdc11a 
							
						 
						
							2021-02-12 10:55:37 +01:00  
				
					
						
							
							
								 
						
							
								28f533f370 
								
							 
						 
						
							
							
								
								[Glitch] Change max. image dimensions to 1920x1080px (1080p)  
							
							... 
							
							
							
							Port acf1842896 
							
						 
						
							2021-02-12 10:46:00 +01:00  
				
					
						
							
							
								 
						
							
								5e11f3a6e1 
								
							 
						 
						
							
							
								
								Merge branch 'main' into glitch-soc/merge-upstream  
							
							... 
							
							
							
							Conflicts:
- `app/javascript/styles/mastodon/modal.scss`:
  For some reason we changed the file loading path in glitch-soc,
  but now upstream has completely changed how the logo is loaded.
  Applied upstream changes. 
							
						 
						
							2021-02-12 10:28:32 +01:00  
				
					
						
							
							
								 
						
							
								15ced8728f 
								
							 
						 
						
							
							
								
								Refactor Api::Web::SettingsController ( #15717 )  
							
							
							
						 
						
							2021-02-12 07:19:15 +01:00  
				
					
						
							
							
								 
						
							
								f8972d4503 
								
							 
						 
						
							
							
								
								Fix YouTube embeds failing due to YouTube serving wrong OEmbed URLs ( #15716 )  
							
							
							
						 
						
							2021-02-12 05:45:38 +01:00  
				
					
						
							
							
								 
						
							
								08ae116dc6 
								
							 
						 
						
							
							
								
								Fixed WebUI crash when a status opened in the media modal is deleted ( #15701 )  
							
							... 
							
							
							
							* Fixed picture in picture compatibility error in WebUI when status is deleted
* Revert "Fixed picture in picture compatibility error in WebUI when status is deleted"
This reverts commit f003b7d9d88688e9504f7dfae1545d7522fcfd98.
* Close the modal display of the image when status is deleted
* Fixed the case statement before the default statement
* Removed unnecessary parts 
							
						 
						
							2021-02-11 19:59:47 +01:00  
				
					
						
							
							
								 
						
							
								7927959d8f 
								
							 
						 
						
							
							
								
								fix typo ( #15705 )  
							
							
							
						 
						
							2021-02-11 06:22:11 +01:00  
				
					
						
							
							
								 
						
							
								e79f8dd85c 
								
							 
						 
						
							
							
								
								Onion service related changes to HTTPS handling ( #15560 )  
							
							... 
							
							
							
							* Enable secure cookie flag for https only
* Disable force_ssl for .onion hosts only
Co-authored-by: Aiden McClelland <me@drbonez.dev> 
							
						 
						
							2021-02-11 04:40:13 +01:00  
				
					
						
							
							
								 
						
							
								d499bb031f 
								
							 
						 
						
							
							
								
								Use custom mascot on static share page ( #15687 )  
							
							... 
							
							
							
							* Use custom mascot on static share page
* Use full_asset_url 
							
						 
						
							2021-02-11 02:18:56 +01:00  
				
					
						
							
							
								 
						
							
								be3b9f8151 
								
							 
						 
						
							
							
								
								Fix URI of repeat follow requests not being recorded ( #15662 )  
							
							... 
							
							
							
							* Fix URI of repeat follow requests not being recorded
In case we receive a “repeat” or “duplicate” follow request, we automatically
fast-forward the accept with the latest received Activity `id`, but we don't
record it.
In general, a “repeat” or “duplicate” follow request may happen if for some
reason (e.g. inconsistent handling of Block or Undo Accept activities, an
instance being brought back up from the dead, etc.) the local instance thought
the remote actor were following them while the remote actor thought otherwise.
In those cases, the remote instance does not know about the older Follow
activity `id`, so keeping that record serves no purpose, but knowing the most
recent one is useful if the remote implementation at some point refers to it
by `id` without inlining it.
* Add tests 
							
						 
						
							2021-02-11 01:53:44 +01:00  
				
					
						
							
							
								 
						
							
								f5fefdc11a 
								
							 
						 
						
							
							
								
								Slightly reorder three dots menu on toots to make it more intuitive ( #15647 )  
							
							... 
							
							
							
							* Slightly reorder three dots menu on toots to make it more intuitive
- Make “Pin to profile” always appear at the same place
- Add separator to group “Bookmark” and “Pin to profile”
- Fix separator being the first item in some cases
* Fix missing semicolon and keep status_action_bar.js and action_bar.js in sync 
							
						 
						
							2021-02-11 01:05:04 +01:00  
				
					
						
							
							
								 
						
							
								07b46cb332 
								
							 
						 
						
							
							
								
								Add dropdown for boost privacy in boost confirmation modal ( #15704 )  
							
							... 
							
							
							
							* Various dropdown code quality fixes
* Prepare support for privacy selection in boost modal
* Add dropdown for boost privacy in boost confirmation modal 
							
						 
						
							2021-02-11 00:53:12 +01:00  
				
					
						
							
							
								 
						
							
								a30a40c437 
								
							 
						 
						
							
							
								
								Fix background color for favourite modal on DMs  
							
							
							
						 
						
							2021-02-10 19:27:18 +01:00  
				
					
						
							
							
								 
						
							
								acdeb162b8 
								
							 
						 
						
							
							
								
								Create instance actor if it hasn't been properly seeded ( #15693 )  
							
							... 
							
							
							
							An uncommon but somewhat difficult to digagnose issue is dealing with
improperly-seeded databases. In such cases, instance-signed fetches will
fail with a ActiveRecord::RecordNotFound error, usually caught and handled
as generic 404, leading people to think the remote resource itself has not
been found, while it's the local instance actor that does not exist.
This commit changes the code so that failure to find the instance actor
automatically creates a new one, so that improperly-seeded databases do
not cause any issue. 
							
						 
						
							2021-02-09 18:12:54 +01:00  
				
					
						
							
							
								 
						
							
								acf1842896 
								
							 
						 
						
							
							
								
								Change max. image dimensions to 1920x1080px (1080p) ( #15690 )  
							
							... 
							
							
							
							* Change max. image size to 1920x1080px
* Change it in web UI too 
							
						 
						
							2021-02-09 01:21:06 +01:00  
				
					
						
							
							
								 
						
							
								e1fa06c459 
								
							 
						 
						
							
							
								
								[Glitch] Change custom emoji to be animated when hovering container  
							
							... 
							
							
							
							Port 3efa0c54b6 
							
						 
						
							2021-02-03 17:16:22 +01:00  
				
					
						
							
							
								 
						
							
								4d40685850 
								
							 
						 
						
							
							
								
								Merge branch 'main' into glitch-soc/merge-upstream  
							
							
							
						 
						
							2021-02-03 17:02:48 +01:00  
				
					
						
							
							
								 
						
							
								a044ddac5b 
								
							 
						 
						
							
							
								
								Fix race conditions on account migration creation ( #15597 )  
							
							... 
							
							
							
							* Atomically check for processing lock in Move handler
* Prevent race condition when creating account migrations
Fixes  #15595 
* Add tests
Co-authored-by: Claire <claire.github-309c@sitedethib.com> 
							
						 
						
							2021-02-02 14:49:57 +01:00  
				
					
						
							
							
								 
						
							
								3efa0c54b6 
								
							 
						 
						
							
							
								
								Change custom emoji to be animated when hovering container ( #15637 )  
							
							... 
							
							
							
							Co-authored-by: Claire <claire.github-309c@sitedethib.com> 
							
						 
						
							2021-01-31 21:25:31 +01:00  
				
					
						
							
							
								 
						
							
								7ab53f221a 
								
							 
						 
						
							
							
								
								Improved performance of notification preloading ( #15640 )  
							
							... 
							
							
							
							* Improved performance of notification preloading
* Remove Cacheable from Notification
* Fix test 
							
						 
						
							2021-01-31 21:24:57 +01:00  
				
					
						
							
							
								 
						
							
								c8c764dd8b 
								
							 
						 
						
							
							
								
								Fix N+1 query when rendering with StatusSerializer ( #15641 )  
							
							
							
						 
						
							2021-01-31 21:24:17 +01:00  
				
					
						
							
							
								 
						
							
								2319e85a8a 
								
							 
						 
						
							
							
								
								Fix react/jsx-no-duplicate-props ( #15636 )  
							
							
							
						 
						
							2021-01-28 18:24:22 +01:00  
				
					
						
							
							
								 
						
							
								52ff3ca675 
								
							 
						 
						
							
							
								
								Merge pull request  #1491  from ThibG/glitch-soc/merge-upstream  
							
							... 
							
							
							
							Merge upstream changes 
							
						 
						
							2021-01-26 23:21:32 +01:00  
				
					
						
							
							
								 
						
							
								ca6c62068e 
								
							 
						 
						
							
							
								
								Support customizing poll option limits  
							
							
							
						 
						
							2021-01-26 14:07:31 +01:00  
				
					
						
							
							
								 
						
							
								00e55445b9 
								
							 
						 
						
							
							
								
								[Glitch] Add “translate” class to other user strings  
							
							... 
							
							
							
							Port 5fcac81302 
							
						 
						
							2021-01-26 14:05:24 +01:00  
				
					
						
							
							
								 
						
							
								b81710c02c 
								
							 
						 
						
							
							
								
								Merge branch 'main' into glitch-soc/merge-upstream  
							
							... 
							
							
							
							Conflicts:
- `CONTRIBUTING.md`:
  Not a real conflict, glitch-soc quotes the upstream file, which has been
  changed. Update the quote. 
							
						 
						
							2021-01-26 14:01:30 +01:00  
				
					
						
							
							
								 
						
							
								7f1c56954b 
								
							 
						 
						
							
							
								
								Fix first return value of FetchLinkCardService.html method ( #15630 )  
							
							
							
						 
						
							2021-01-25 09:22:41 +01:00  
				
					
						
							
							
								 
						
							
								7ea9588520 
								
							 
						 
						
							
							
								
								Use Enumerable#filter_map in more places ( #15527 )  
							
							
							
						 
						
							2021-01-22 16:28:15 +01:00  
				
					
						
							
							
								 
						
							
								5fcac81302 
								
							 
						 
						
							
							
								
								Add “translate” class to other user strings ( #15611 )  
							
							... 
							
							
							
							* Add “translate” class to other user strings
Follow-up to #15610 .
Allow Google Translate to work on more user content:
- poll options
- reply indicator (contents of the status being replied to)
- directory account cards
- account note in follow requests list
* Fix incorrect styling of account bio
Co-authored-by: Claire <claire.github-309c@sitedethib.com> 
							
						 
						
							2021-01-22 10:09:23 +01:00  
				
					
						
							
							
								 
						
							
								eb51e43fb4 
								
							 
						 
						
							
							
								
								Optimize some regex matching ( #15528 )  
							
							... 
							
							
							
							* Use Regex#match?
* Replace =~ too
* Avoid to call match? from Nil
* Keep value of Regexp.last_match 
							
						 
						
							2021-01-22 10:09:08 +01:00  
				
					
						
							
							
								 
						
							
								c48e2a48ba 
								
							 
						 
						
							
							
								
								[Glitch] Fix Google Translate breaking web interface  
							
							... 
							
							
							
							Port 7d0031a515 
							
						 
						
							2021-01-21 16:59:47 +01:00  
				
					
						
							
							
								 
						
							
								f90fa11db5 
								
							 
						 
						
							
							
								
								Merge branch 'main' into glitch-soc/merge-upstream  
							
							
							
						 
						
							2021-01-21 16:51:12 +01:00  
				
					
						
							
							
								 
						
							
								7d0031a515 
								
							 
						 
						
							
							
								
								Fix Google Translate breaking web interface ( #15610 )  
							
							... 
							
							
							
							- marks the page as a whole as untranslatable
- still marks user text as translatable
Co-authored-by: Claire <claire.github-309c@sitedethib.com> 
							
						 
						
							2021-01-21 14:29:54 +01:00  
				
					
						
							
							
								 
						
							
								e955ca5463 
								
							 
						 
						
							
							
								
								Fix sign-up restrictions based on IP addresses not being enforced ( #15607 )  
							
							... 
							
							
							
							Fixes  #15606 
Co-authored-by: Claire <claire.github-309c@sitedethib.com> 
						
							2021-01-21 06:18:30 +01:00  
				
					
						
							
							
								 
						
							
								2ff01f78f7 
								
							 
						 
						
							
							
								
								Fix /activity endpoint not require signature in authorized fetch mode ( #15592 )  
							
							... 
							
							
							
							Fixes  #15589 
Co-authored-by: Claire <claire.github-309c@sitedethib.com> 
						
							2021-01-19 06:47:36 +01:00  
				
					
						
							
							
								 
						
							
								e202314a75 
								
							 
						 
						
							
							
								
								Merge branch 'master' into glitch-soc/merge-upstream  
							
							
							
						 
						
							2021-01-18 13:57:12 +01:00  
				
					
						
							
							
								 
						
							
								54d4e5252b 
								
							 
						 
						
							
							
								
								Use Rails' index_by where it makes sense ( #15542 )  
							
							... 
							
							
							
							* Use Rails' index_by where it makes sense
* Fix tests
Co-authored-by: Claire <claire.github-309c@sitedethib.com> 
							
						 
						
							2021-01-12 09:27:38 +01:00  
				
					
						
							
							
								 
						
							
								7bed25f3ea 
								
							 
						 
						
							
							
								
								Fix processing of incoming Block activities ( #15546 )  
							
							... 
							
							
							
							Unlike locally-issued blocks, they weren't clearing follow
relationships in both directions, follow requests or notifications.
Co-authored-by: Claire <claire.github-309c@sitedethib.com> 
							
						 
						
							2021-01-12 09:25:01 +01:00  
				
					
						
							
							
								 
						
							
								31e68bf3d3 
								
							 
						 
						
							
							
								
								[Glitch] Fix OCR lang data failing to load  
							
							... 
							
							
							
							Port 73ddb60c32 
							
						 
						
							2021-01-11 12:00:26 +01:00  
				
					
						
							
							
								 
						
							
								33d30632fb 
								
							 
						 
						
							
							
								
								Merge branch 'master' into glitch-soc/merge-upstream  
							
							... 
							
							
							
							Conflicts:
- `app/models/public_feed.rb`:
  Upstream refactored a bit, glitch-soc had specific code for local-only
  statuses.
  Updated glitch-soc's specific code accordingly. 
							
						 
						
							2021-01-11 11:55:42 +01:00  
				
					
						
							
							
								 
						
							
								11d603101a 
								
							 
						 
						
							
							
								
								Fix muting users with duration via the REST api ( #15516 )  
							
							
							
						 
						
							2021-01-10 12:47:21 +01:00  
				
					
						
							
							
								 
						
							
								087ed84367 
								
							 
						 
						
							
							
								
								Optimize map { ... }.compact calls ( #15513 )  
							
							... 
							
							
							
							* Optimize map { ... }.compact
using Enumerable#filter_map, supported since Ruby 2.7
* Add poyfill for Enumerable#filter_map 
							
						 
						
							2021-01-10 00:32:01 +01:00  
				
					
						
							
							
								 
						
							
								73ddb60c32 
								
							 
						 
						
							
							
								
								Fix OCR lang data failing to load ( #15519 )  
							
							... 
							
							
							
							Fixes  #15472 
Co-authored-by: Claire <claire.github-309c@sitedethib.com> 
						
							2021-01-09 03:48:50 +01:00  
				
					
						
							
							
								 
						
							
								a1a8aa4a08 
								
							 
						 
						
							
							
								
								Skip processing Update activities on unknown accounts ( #15514 )  
							
							... 
							
							
							
							This also skips fetching the actor completely.
This will be useful if we end up distributing Update activities linked to
account suspensions more widely (they are currently only delivered to
the suspended account's followers), as currently, instances not knowing
about the suspended account would fetch it to then process the suspension.
Co-authored-by: Claire <claire.github-309c@sitedethib.com> 
							
						 
						
							2021-01-08 12:26:29 +01:00  
				
					
						
							
							
								 
						
							
								efffdd3778 
								
							 
						 
						
							
							
								
								Fix rubocop config and warnings ( #15503 )  
							
							... 
							
							
							
							* disable NewCops
* update TargetRubyVersion
* Fix Lint/MissingSuper for ActiveModelSerializers::Model
* Fix Lint/MissingSuper for feed
* Fix Lint/FloatComparison
* Do not use instance variables 
							
						 
						
							2021-01-07 09:40:55 +01:00  
				
					
						
							
							
								 
						
							
								55e84f9125 
								
							 
						 
						
							
							
								
								[Glitch] Fix logo button style more  
							
							... 
							
							
							
							Port 3f4b0dfd47 
							
						 
						
							2021-01-06 19:03:52 +01:00  
				
					
						
							
							
								 
						
							
								7710a6c4b1 
								
							 
						 
						
							
							
								
								[Glitch] Fix logo button style  
							
							... 
							
							
							
							Port ba748a83f2 
							
						 
						
							2021-01-06 19:03:21 +01:00  
				
					
						
							
							
								 
						
							
								f3aa085af5 
								
							 
						 
						
							
							
								
								[Glitch] Fix getting-started footer in single column mode not being clickable in Safari  
							
							... 
							
							
							
							Port e38874dcf7 
							
						 
						
							2021-01-06 18:38:10 +01:00  
				
					
						
							
							
								 
						
							
								98fd0cca55 
								
							 
						 
						
							
							
								
								[Glitch] Fix defaultProps of frameRate to string  
							
							... 
							
							
							
							Port a50fe47a77 
							
						 
						
							2021-01-06 18:32:37 +01:00  
				
					
						
							
							
								 
						
							
								f17ff99257 
								
							 
						 
						
							
							
								
								[Glitch] Fix missing key in list timeline policy  
							
							... 
							
							
							
							Port 71f0968887 
							
						 
						
							2021-01-06 18:23:44 +01:00  
				
					
						
							
							
								 
						
							
								90528f43bc 
								
							 
						 
						
							
							
								
								Merge branch 'master' into glitch-soc/merge-upstream  
							
							... 
							
							
							
							Conflicts:
- `config/webpack/configuration.js`:
  Upstream updated the `js-yaml` dependency, which changed how to call it.
  Those changes conflicted because that code is pretty different in glitch-soc
  which has to deal with its more complex theming system.
  Proceeded to the same compatibility changes in glitch-soc's code.
- `package.json` and `yarn.lock`:
  Not really a conflict, just glitch-soc-specific dependencies textually too
  close to some dependencies updated upstream. 
							
						 
						
							2021-01-06 18:08:06 +01:00  
				
					
						
							
							
								 
						
							
								a50fe47a77 
								
							 
						 
						
							
							
								
								Fix defaultProps of frameRate to string ( #15493 )  
							
							
							
						 
						
							2021-01-05 20:00:42 +01:00  
				
					
						
							
							
								 
						
							
								71f0968887 
								
							 
						 
						
							
							
								
								Fix missing key in list timeline policy ( #15494 )  
							
							
							
						 
						
							2021-01-05 19:57:50 +01:00  
				
					
						
							
							
								 
						
							
								e38874dcf7 
								
							 
						 
						
							
							
								
								Fix getting-started footer in single column mode not being clickable in Safari ( #15496 )  
							
							
							
						 
						
							2021-01-05 19:57:32 +01:00  
				
					
						
							
							
								 
						
							
								4552449c26 
								
							 
						 
						
							
							
								
								Fix profile update not being sent on profile/header picture deletion ( #15461 )  
							
							... 
							
							
							
							Fixes  #15460 
Co-authored-by: Claire <claire.github-309c@sitedethib.com> 
						
							2020-12-30 23:19:18 +01:00  
				
					
						
							
							
								 
						
							
								3f4b0dfd47 
								
							 
						 
						
							
							
								
								Fix logo button style more ( #15458 )  
							
							
							
						 
						
							2020-12-30 23:18:39 +01:00  
				
					
						
							
							
								 
						
							
								cb5bb2313b 
								
							 
						 
						
							
							
								
								Fix expand video on public page ( #15469 )  
							
							
							
						 
						
							2020-12-30 23:18:11 +01:00  
				
					
						
							
							
								 
						
							
								f1f96ebf02 
								
							 
						 
						
							
							
								
								Fix being able to import more than allowed number of follows ( #15384 )  
							
							... 
							
							
							
							* Fix being able to import more than allowed number of follows
Without this commit, if someone tries importing a second list of accounts to
follow before the first one has been processed, this will queue imports for
the two whole lists, even if they exceed the account's allowed number of
outgoing follows.
This commit changes it so the individual queued imports aren't exempt from
the follow limit check (they remain exempt from the rate-limiting check
though).
* Catch validation errors to not re-queue failed follows
Co-authored-by: Claire <claire.github-309c@sitedethib.com> 
							
						 
						
							2020-12-26 23:52:46 +01:00  
				
					
						
							
							
								 
						
							
								4580129c98 
								
							 
						 
						
							
							
								
								New Crowdin updates ( #15413 )  
							
							... 
							
							
							
							* New translations en.json (Vietnamese)
[ci skip]
* New translations en.yml (Vietnamese)
[ci skip]
* New translations en.json (Vietnamese)
[ci skip]
* New translations en.yml (Vietnamese)
[ci skip]
* New translations en.yml (Vietnamese)
[ci skip]
* New translations en.json (Malayalam)
[ci skip]
* New translations en.yml (Vietnamese)
[ci skip]
* New translations en.json (Malayalam)
[ci skip]
* New translations en.yml (Korean)
[ci skip]
* New translations en.yml (Japanese)
[ci skip]
* New translations simple_form.en.yml (Japanese)
[ci skip]
* New translations en.yml (Chinese Traditional, Hong Kong)
[ci skip]
* New translations en.yml (Occitan)
[ci skip]
* New translations en.yml (Occitan)
[ci skip]
* New translations en.json (Armenian)
[ci skip]
* New translations en.yml (Armenian)
[ci skip]
* New translations en.yml (Armenian)
[ci skip]
* New translations en.json (Armenian)
[ci skip]
* New translations en.yml (Armenian)
[ci skip]
* New translations en.json (Armenian)
[ci skip]
* New translations en.yml (Armenian)
[ci skip]
* New translations en.json (Armenian)
[ci skip]
* New translations en.json (Armenian)
[ci skip]
* New translations en.json (Armenian)
[ci skip]
* New translations en.yml (Armenian)
[ci skip]
* New translations en.json (Armenian)
[ci skip]
* New translations en.yml (Armenian)
[ci skip]
* New translations en.json (Armenian)
[ci skip]
* New translations en.json (Armenian)
[ci skip]
* New translations en.yml (Armenian)
[ci skip]
* New translations en.json (Armenian)
[ci skip]
* New translations en.json (Armenian)
[ci skip]
* New translations en.yml (Chinese Simplified)
[ci skip]
* New translations en.json (Armenian)
[ci skip]
* New translations en.json (Armenian)
[ci skip]
* New translations simple_form.en.yml (Armenian)
[ci skip]
* New translations devise.en.yml (Armenian)
[ci skip]
* New translations en.yml (Armenian)
[ci skip]
* New translations devise.en.yml (Armenian)
[ci skip]
* New translations en.yml (Armenian)
[ci skip]
* New translations en.yml (Armenian)
[ci skip]
* New translations en.yml (Armenian)
[ci skip]
* New translations en.yml (Armenian)
[ci skip]
* New translations en.yml (Armenian)
[ci skip]
* New translations en.yml (Armenian)
[ci skip]
* New translations en.yml (Armenian)
[ci skip]
* New translations en.yml (Armenian)
[ci skip]
* New translations en.yml (Armenian)
[ci skip]
* New translations en.yml (Armenian)
[ci skip]
* i18n-tasks normalize
* yarn manage:translations 
							
						 
						
							2020-12-26 23:51:46 +01:00  
				
					
						
							
							
								 
						
							
								ba748a83f2 
								
							 
						 
						
							
							
								
								Fix logo button style ( #15428 )  
							
							... 
							
							
							
							* Fix bell button rtl style
* Remove size and style props from button component
* Fix logo button style
* Update jest snapshot 
							
						 
						
							2020-12-26 23:50:34 +01:00  
				
					
						
							
							
								 
						
							
								e89648574f 
								
							 
						 
						
							
							
								
								Fix error when changing ACL on missing objects during suspension ( #15420 )  
							
							
							
						 
						
							2020-12-24 15:53:45 +01:00  
				
					
						
							
							
								 
						
							
								ba0b79fc5c 
								
							 
						 
						
							
							
								
								Fix undefined method error when batch-removing statuses with ElasticSearch on ( #15421 )  
							
							
							
						 
						
							2020-12-24 15:53:26 +01:00  
				
					
						
							
							
								 
						
							
								7e6d3a7d9a 
								
							 
						 
						
							
							
								
								Fix unfollow action button style ( #15418 )  
							
							
							
						 
						
							2020-12-23 23:47:50 +01:00  
				
					
						
							
							
								 
						
							
								b08d2d4f78 
								
							 
						 
						
							
							
								
								Fix media modal buttons not showing up on mobile ( #15417 )  
							
							... 
							
							
							
							Fixes  #15374 
When the pop-out player was introduced, it had tweaks for the mobile
view, but it's now disabled in mobile mode and the styling was reused
for modals, causing the footer to be hidden on mobile without a good
reason.
Co-authored-by: Claire <claire.github-309c@sitedethib.com> 
						
							2020-12-23 19:55:23 +01:00  
				
					
						
							
							
								 
						
							
								4950e59cdc 
								
							 
						 
						
							
							
								
								Use existing FeaturedTag serializer and delete AccountFeaturedTag serializer ( #15415 )  
							
							... 
							
							
							
							* Update featured_tags_controller.rb
* Update featured_tag_serializer.rb
* Update featured_tag_serializer.rb
* Delete account_featured_tag_serializer.rb
* please codeclimate
* please codeclimate 
							
						 
						
							2020-12-23 16:43:38 +01:00  
				
					
						
							
							
								 
						
							
								de57efd055 
								
							 
						 
						
							
							
								
								Fix mentions not being deleted efficiently ( #15416 )  
							
							... 
							
							
							
							As a regression from the recent optimizations, mentions were left untouched
until `account.destroy`, which would then delete them individually,
and executing queries to find and delete associated notifications, resulting
in a massive slowdown.
Co-authored-by: Claire <claire.github-309c@sitedethib.com> 
							
						 
						
							2020-12-23 16:43:11 +01:00  
				
					
						
							
							
								 
						
							
								473abc35a1 
								
							 
						 
						
							
							
								
								Fix trying to privatize empty media attachments ( #15414 )  
							
							
							
						 
						
							2020-12-23 15:47:03 +09:00  
				
					
						
							
							
								 
						
							
								537afa00f3 
								
							 
						 
						
							
							
								
								Merge branch 'master' into glitch-soc/merge-upstream  
							
							... 
							
							
							
							Conflicts:
- `app/lib/feed_manager.rb`:
  Not a real conflict, glitch-soc-only DM-related method
  too close to changed upstream stuff.
  Ported upstream changes.
- `app/services/batched_remove_status_service.rb`:
  Additional logic in glitch-soc to clear DMs from timelines.
  Ported upstream changes and fixed the DM TL clearing logic.
- `app/workers/scheduler/feed_cleanup_scheduler.rb`:
  Additional code in glitch-soc to clear DM timelines.
  Ported upstream changes. 
							
						 
						
							2020-12-23 01:47:45 +01:00  
				
					
						
							
							
								 
						
							
								814b7775fb 
								
							 
						 
						
							
							
								
								Improve performances of deleting favourites when deleting accounts ( #15412 )  
							
							... 
							
							
							
							Co-authored-by: Claire <claire.github-309c@sitedethib.com> 
							
						 
						
							2020-12-23 01:35:02 +01:00  
				
					
						
							
							
								 
						
							
								62e42bd15b 
								
							 
						 
						
							
							
								
								New Crowdin updates ( #15369 )  
							
							... 
							
							
							
							* New translations doorkeeper.en.yml (Esperanto)
[ci skip]
* New translations doorkeeper.en.yml (Albanian)
[ci skip]
* New translations en.yml (Albanian)
[ci skip]
* New translations en.yml (Greek)
[ci skip]
* New translations doorkeeper.en.yml (Standard Moroccan Tamazight)
[ci skip]
* New translations en.json (Romanian)
[ci skip]
* New translations en.yml (Icelandic)
[ci skip]
* New translations en.json (Esperanto)
[ci skip]
* New translations en.json (Thai)
[ci skip]
* New translations simple_form.en.yml (Thai)
[ci skip]
* New translations en.yml (Thai)
[ci skip]
* New translations simple_form.en.yml (Galician)
[ci skip]
* New translations simple_form.en.yml (Romanian)
[ci skip]
* New translations en.yml (Tatar)
[ci skip]
* New translations en.json (Tatar)
[ci skip]
* New translations en.yml (Standard Moroccan Tamazight)
[ci skip]
* New translations en.json (Standard Moroccan Tamazight)
[ci skip]
* New translations doorkeeper.en.yml (Sardinian)
[ci skip]
* New translations en.yml (Romanian)
[ci skip]
* New translations doorkeeper.en.yml (Romanian)
[ci skip]
* New translations doorkeeper.en.yml (Chinese Traditional, Hong Kong)
[ci skip]
* New translations en.json (Bulgarian)
[ci skip]
* New translations simple_form.en.yml (Catalan)
[ci skip]
* New translations en.yml (Catalan)
[ci skip]
* New translations doorkeeper.en.yml (Bulgarian)
[ci skip]
* New translations simple_form.en.yml (Bulgarian)
[ci skip]
* New translations en.yml (Bulgarian)
[ci skip]
* New translations doorkeeper.en.yml (Arabic)
[ci skip]
* New translations en.yml (French)
[ci skip]
* New translations simple_form.en.yml (Arabic)
[ci skip]
* New translations en.yml (Arabic)
[ci skip]
* New translations en.json (Arabic)
[ci skip]
* New translations doorkeeper.en.yml (Spanish)
[ci skip]
* New translations simple_form.en.yml (Spanish)
[ci skip]
* New translations en.yml (Spanish)
[ci skip]
* New translations doorkeeper.en.yml (French)
[ci skip]
* New translations doorkeeper.en.yml (Sorani (Kurdish))
[ci skip]
* New translations doorkeeper.en.yml (Vietnamese)
[ci skip]
* New translations en.yml (Czech)
[ci skip]
* New translations simple_form.en.yml (Greek)
[ci skip]
* New translations simple_form.en.yml (Dutch)
[ci skip]
* New translations en.yml (Dutch)
[ci skip]
* New translations en.json (Dutch)
[ci skip]
* New translations en.yml (Armenian)
[ci skip]
* New translations en.json (Armenian)
[ci skip]
* New translations en.json (German)
[ci skip]
* New translations en.yml (Chinese Simplified)
[ci skip]
* New translations en.json (Czech)
[ci skip]
* New translations en.json (Spanish)
[ci skip]
* New translations simple_form.en.yml (French)
[ci skip]
* New translations en.yml (Corsican)
[ci skip]
* New translations en.yml (Japanese)
[ci skip]
* New translations en.json (Swedish)
[ci skip]
* New translations simple_form.en.yml (Chinese Simplified)
[ci skip]
* New translations en.json (Kabyle)
[ci skip]
* New translations en.yml (Occitan)
[ci skip]
* New translations simple_form.en.yml (Sardinian)
[ci skip]
* New translations en.yml (Sardinian)
[ci skip]
* New translations en.json (Sardinian)
[ci skip]
* New translations simple_form.en.yml (Sorani (Kurdish))
[ci skip]
* New translations en.yml (Sorani (Kurdish))
[ci skip]
* New translations en.json (Sorani (Kurdish))
[ci skip]
* New translations simple_form.en.yml (Chinese Traditional, Hong Kong)
[ci skip]
* New translations en.json (Chinese Traditional)
[ci skip]
* New translations en.yml (Chinese Traditional, Hong Kong)
[ci skip]
* New translations simple_form.en.yml (Esperanto)
[ci skip]
* New translations en.yml (Esperanto)
[ci skip]
* New translations simple_form.en.yml (Chinese Traditional)
[ci skip]
* New translations en.yml (Chinese Traditional)
[ci skip]
* New translations doorkeeper.en.yml (Catalan)
[ci skip]
* New translations simple_form.en.yml (Czech)
[ci skip]
* New translations doorkeeper.en.yml (Norwegian)
[ci skip]
* New translations simple_form.en.yml (Norwegian)
[ci skip]
* New translations en.yml (Norwegian)
[ci skip]
* New translations en.json (Norwegian)
[ci skip]
* New translations doorkeeper.en.yml (Dutch)
[ci skip]
* New translations en.yml (Macedonian)
[ci skip]
* New translations simple_form.en.yml (Polish)
[ci skip]
* New translations en.json (Macedonian)
[ci skip]
* New translations en.yml (Lithuanian)
[ci skip]
* New translations en.json (Lithuanian)
[ci skip]
* New translations doorkeeper.en.yml (Korean)
[ci skip]
* New translations simple_form.en.yml (Korean)
[ci skip]
* New translations en.yml (Polish)
[ci skip]
* New translations doorkeeper.en.yml (Polish)
[ci skip]
* New translations doorkeeper.en.yml (Georgian)
[ci skip]
* New translations en.yml (Slovak)
[ci skip]
* New translations doorkeeper.en.yml (Slovenian)
[ci skip]
* New translations simple_form.en.yml (Slovenian)
[ci skip]
* New translations en.yml (Slovenian)
[ci skip]
* New translations en.json (Slovenian)
[ci skip]
* New translations doorkeeper.en.yml (Slovak)
[ci skip]
* New translations simple_form.en.yml (Slovak)
[ci skip]
* New translations en.json (Slovak)
[ci skip]
* New translations doorkeeper.en.yml (Russian)
[ci skip]
* New translations simple_form.en.yml (Russian)
[ci skip]
* New translations en.yml (Russian)
[ci skip]
* New translations doorkeeper.en.yml (Portuguese)
[ci skip]
* New translations simple_form.en.yml (Portuguese)
[ci skip]
* New translations en.yml (Portuguese)
[ci skip]
* New translations en.yml (Korean)
[ci skip]
* New translations simple_form.en.yml (Georgian)
[ci skip]
* New translations doorkeeper.en.yml (Czech)
[ci skip]
* New translations doorkeeper.en.yml (Greek)
[ci skip]
* New translations en.yml (Finnish)
[ci skip]
* New translations en.json (Finnish)
[ci skip]
* New translations doorkeeper.en.yml (Basque)
[ci skip]
* New translations simple_form.en.yml (Basque)
[ci skip]
* New translations en.yml (Basque)
[ci skip]
* New translations en.json (Basque)
[ci skip]
* New translations en.json (Greek)
[ci skip]
* New translations doorkeeper.en.yml (Finnish)
[ci skip]
* New translations doorkeeper.en.yml (German)
[ci skip]
* New translations simple_form.en.yml (German)
[ci skip]
* New translations en.yml (German)
[ci skip]
* New translations doorkeeper.en.yml (Danish)
[ci skip]
* New translations simple_form.en.yml (Danish)
[ci skip]
* New translations en.yml (Danish)
[ci skip]
* New translations en.json (Danish)
[ci skip]
* New translations simple_form.en.yml (Finnish)
[ci skip]
* New translations en.json (Hebrew)
[ci skip]
* New translations en.yml (Georgian)
[ci skip]
* New translations en.json (Georgian)
[ci skip]
* New translations doorkeeper.en.yml (Japanese)
[ci skip]
* New translations simple_form.en.yml (Japanese)
[ci skip]
* New translations doorkeeper.en.yml (Italian)
[ci skip]
* New translations simple_form.en.yml (Italian)
[ci skip]
* New translations en.yml (Italian)
[ci skip]
* New translations doorkeeper.en.yml (Armenian)
[ci skip]
* New translations en.yml (Hebrew)
[ci skip]
* New translations simple_form.en.yml (Armenian)
[ci skip]
* New translations doorkeeper.en.yml (Hungarian)
[ci skip]
* New translations simple_form.en.yml (Hungarian)
[ci skip]
* New translations en.yml (Hungarian)
[ci skip]
* New translations doorkeeper.en.yml (Hebrew)
[ci skip]
* New translations simple_form.en.yml (Hebrew)
[ci skip]
* New translations simple_form.en.yml (Vietnamese)
[ci skip]
* New translations en.json (Turkish)
[ci skip]
* New translations en.yml (French)
[ci skip]
* New translations en.json (Chinese Traditional)
[ci skip]
* New translations en.yml (Spanish, Argentina)
[ci skip]
* New translations en.json (French)
[ci skip]
* New translations en.yml (Vietnamese)
[ci skip]
* New translations en.json (French)
[ci skip]
* New translations en.yml (Galician)
[ci skip]
* New translations en.yml (Galician)
[ci skip]
* New translations en.yml (Catalan)
[ci skip]
* New translations en.yml (Occitan)
[ci skip]
* New translations en.json (Occitan)
[ci skip]
* New translations en.yml (Polish)
[ci skip]
* New translations en.yml (Greek)
[ci skip]
* New translations en.yml (Albanian)
[ci skip]
* New translations en.json (German)
[ci skip]
* New translations en.json (German)
[ci skip]
* New translations en.yml (Spanish)
[ci skip]
* New translations en.yml (German)
[ci skip]
* New translations devise.en.yml (German)
[ci skip]
* New translations en.yml (Icelandic)
[ci skip]
* New translations en.yml (Armenian)
[ci skip]
* New translations en.yml (Armenian)
[ci skip]
* New translations en.yml (Armenian)
[ci skip]
* New translations en.yml (Armenian)
[ci skip]
* New translations en.yml (Italian)
[ci skip]
* New translations en.yml (Portuguese)
[ci skip]
* New translations en.yml (Armenian)
[ci skip]
* New translations en.json (Armenian)
[ci skip]
* New translations en.yml (Armenian)
[ci skip]
* New translations simple_form.en.yml (Armenian)
[ci skip]
* New translations simple_form.en.yml (Armenian)
[ci skip]
* New translations en.json (Chinese Traditional)
[ci skip]
* New translations en.json (Chinese Traditional)
[ci skip]
* New translations en.json (Chinese Traditional)
[ci skip]
* New translations en.json (Chinese Traditional)
[ci skip]
* New translations en.yml (Korean)
[ci skip]
* New translations en.yml (Korean)
[ci skip]
* New translations en.json (Chinese Traditional)
[ci skip]
* New translations en.json (Chinese Traditional)
[ci skip]
* New translations en.json (Chinese Traditional)
[ci skip]
* New translations en.yml (Chinese Simplified)
[ci skip]
* New translations en.yml (Chinese Simplified)
[ci skip]
* New translations en.json (Chinese Simplified)
[ci skip]
* New translations en.json (Chinese Simplified)
[ci skip]
* New translations en.json (Armenian)
[ci skip]
* New translations en.yml (Armenian)
[ci skip]
* New translations en.yml (Armenian)
[ci skip]
* New translations en.yml (Hungarian)
[ci skip]
* New translations en.yml (Occitan)
[ci skip]
* New translations simple_form.en.yml (Occitan)
[ci skip]
* New translations en.json (Chinese Traditional)
[ci skip]
* New translations en.json (Chinese Traditional)
[ci skip]
* New translations en.json (Malayalam)
[ci skip]
* New translations en.yml (Malayalam)
[ci skip]
* New translations en.json (Chinese Traditional)
[ci skip]
* New translations en.json (Malayalam)
[ci skip]
* New translations en.json (Chinese Traditional)
[ci skip]
* New translations en.json (Malayalam)
[ci skip]
* New translations en.json (Chinese Traditional)
[ci skip]
* New translations en.json (Malayalam)
[ci skip]
* New translations en.json (Vietnamese)
[ci skip]
* New translations en.json (Chinese Traditional)
[ci skip]
* New translations en.yml (Malayalam)
[ci skip]
* New translations en.json (Chinese Traditional)
[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 en.json (Chinese Traditional)
[ci skip]
* New translations en.json (Malayalam)
[ci skip]
* New translations en.yml (Malayalam)
[ci skip]
* New translations devise.en.yml (Chinese Traditional)
[ci skip]
* New translations en.json (Malayalam)
[ci skip]
* New translations devise.en.yml (Chinese Traditional)
[ci skip]
* New translations en.json (Malayalam)
[ci skip]
* New translations devise.en.yml (Chinese Traditional)
[ci skip]
* New translations en.yml (Malayalam)
[ci skip]
* New translations devise.en.yml (Chinese Traditional)
[ci skip]
* New translations en.json (Dutch)
[ci skip]
* New translations en.yml (Dutch)
[ci skip]
* New translations en.yml (Dutch)
[ci skip]
* New translations simple_form.en.yml (Dutch)
[ci skip]
* New translations en.yml (Dutch)
[ci skip]
* New translations simple_form.en.yml (Dutch)
[ci skip]
* New translations en.yml (Dutch)
[ci skip]
* New translations en.yml (Chinese Traditional)
[ci skip]
* New translations en.yml (Chinese Traditional)
[ci skip]
* New translations en.yml (Chinese Traditional)
[ci skip]
* New translations en.json (Malayalam)
[ci skip]
* New translations en.yml (Malayalam)
[ci skip]
* New translations en.yml (Malayalam)
[ci skip]
* New translations en.json (Malayalam)
[ci skip]
* New translations en.json (Malayalam)
[ci skip]
* New translations en.yml (Indonesian)
[ci skip]
* New translations en.json (Malayalam)
[ci skip]
* New translations en.yml (Hungarian)
[ci skip]
* New translations en.yml (Hungarian)
[ci skip]
* New translations en.yml (Hungarian)
[ci skip]
* New translations en.yml (Hungarian)
[ci skip]
* New translations activerecord.en.yml (Kabyle)
[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.json (Croatian)
[ci skip]
* New translations en.json (Croatian)
[ci skip]
* New translations en.json (Armenian)
[ci skip]
* New translations en.yml (Armenian)
[ci skip]
* New translations en.yml (Armenian)
[ci skip]
* New translations en.json (Esperanto)
[ci skip]
* New translations en.json (Esperanto)
[ci skip]
* i18n-tasks normalize
* yarn manage:translations 
							
						 
						
							2020-12-23 00:10:58 +01:00  
				
					
						
							
							
								 
						
							
								2ab3e91eaf 
								
							 
						 
						
							
							
								
								Fix BatchedRemoveStatusService not working without ES in rails console ( #15408 )  
							
							... 
							
							
							
							Not a huge deal but may cause surprising failures in custom scripts and
development.
Co-authored-by: Claire <claire.github-309c@sitedethib.com> 
							
						 
						
							2020-12-23 00:04:52 +01:00  
				
					
						
							
							
								 
						
							
								3249d35bdc 
								
							 
						 
						
							
							
								
								Improve account deletion performances further ( #15407 )  
							
							... 
							
							
							
							* Delete status records by batches of 50
* Do not precompute values that are only used once
* Do not generate redis events for removal of public toots older than two weeks
* Filter reported toots a priori for polls and status deletion
* Do not process reblogs when cleaning up public timelines
As in Mastodon proper, reblogs don't appear in public TLs
* Clean the deleted account's own feed in one go
* Refactor Account#clean_feed_manager and List#clean_feed_manager
* Delete instead of destroy a few more associations
* Fix preloading
Co-authored-by: Claire <claire.github-309c@sitedethib.com> 
							
						 
						
							2020-12-22 23:57:46 +01:00  
				
					
						
							
							
								 
						
							
								f18349640b 
								
							 
						 
						
							
							
								
								Fix batch order warnings in BatchedRemoveStatusService ( #15409 )  
							
							... 
							
							
							
							Co-authored-by: Claire <claire.github-309c@sitedethib.com> 
							
						 
						
							2020-12-22 20:24:55 +01:00  
				
					
						
							
							
								 
						
							
								1cf2c3a810 
								
							 
						 
						
							
							
								
								Fix external user creation failing when invite request text is required ( #15405 )  
							
							... 
							
							
							
							* Fix external user creation failing when invite request text is required
Also fixes tootctl-based user creation.
* Add test about invites when invite request text is otherwise required
Co-authored-by: Claire <claire.github-309c@sitedethib.com> 
							
						 
						
							2020-12-22 17:14:32 +01:00  
				
					
						
							
							
								 
						
							
								9915d11c0d 
								
							 
						 
						
							
							
								
								Fix unnecessary queries when batch-removing statuses, 100x faster ( #15387 )  
							
							
							
						 
						
							2020-12-22 17:13:55 +01:00  
				
					
						
							
							
								 
						
							
								38bfaf8855 
								
							 
						 
						
							
							
								
								Merge branch 'master' into glitch-soc/merge-upstream  
							
							
							
						 
						
							2020-12-21 18:28:23 +01:00  
				
					
						
							
							
								 
						
							
								43961035a9 
								
							 
						 
						
							
							
								
								Fix some notifications not being deleted on poll/status deletion ( #15402 )  
							
							... 
							
							
							
							* Fix deleting polls not deleting notifications
* Fix fav notification deletion when deleting a toot
* Refactor DeleteAccountService spec
* Add DeleteAccountService tests for other associations and notifications
* Add favourite handling spec in status removal
Co-authored-by: Claire <claire.github-309c@sitedethib.com> 
							
						 
						
							2020-12-21 18:22:17 +01:00  
				
					
						
							
							
								 
						
							
								6f51fd7435 
								
							 
						 
						
							
							
								
								Fix invitation links not working when invite request text is required ( #15385 )  
							
							... 
							
							
							
							Fixes  #15383 
Co-authored-by: Claire <claire.github-309c@sitedethib.com> 
						
							2020-12-21 00:47:02 +01:00  
				
					
						
							
							
								 
						
							
								7bf3c6e57b 
								
							 
						 
						
							
							
								
								Fix AccountDeletionWorker crashing and clogging sidekiq queues ( #15380 )  
							
							... 
							
							
							
							* Fix account deletion workers being queued multiple times for a single account
* Fix poll votes being unnecessarily instantiated on poll deletion
* Fix favourites being unnecessarily instantiated on status deletion
* Remove inaccurate comments
* Delete polls instead of destroying them
Co-authored-by: Claire <claire.github-309c@sitedethib.com> 
							
						 
						
							2020-12-20 18:25:00 +01:00  
				
					
						
							
							
								 
						
							
								5c966bef8b 
								
							 
						 
						
							
							
								
								[Glitch] Fix styling issue on /about when server admin has a long username  
							
							... 
							
							
							
							Port 47c6c54d31 
							
						 
						
							2020-12-19 01:03:38 +01:00  
				
					
						
							
							
								 
						
							
								e0a253fb22 
								
							 
						 
						
							
							
								
								[Glitch] Change notification permission handling  
							
							... 
							
							
							
							Port 79efcf8aad 
							
						 
						
							2020-12-19 01:02:32 +01:00  
				
					
						
							
							
								 
						
							
								f9d000ebae 
								
							 
						 
						
							
							
								
								Merge branch 'master' into glitch-soc/merge-upstream  
							
							... 
							
							
							
							Conflicts:
- `app/services/resolve_url_service.rb`:
  The private toot search by URL hack has been revamped upstream.
  Took upstream's version. 
							
						 
						
							2020-12-19 00:55:12 +01:00  
				
					
						
							
							
								 
						
							
								1c41ce3217 
								
							 
						 
						
							
							
								
								New Crowdin updates ( #15353 )  
							
							... 
							
							
							
							* 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 doorkeeper.en.yml (Danish)
[ci skip]
* New translations en.yml (German)
[ci skip]
* New translations simple_form.en.yml (German)
[ci skip]
* New translations en.json (Greek)
[ci skip]
* New translations simple_form.en.yml (Czech)
[ci skip]
* New translations doorkeeper.en.yml (Greek)
[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 doorkeeper.en.yml (Basque)
[ci skip]
* New translations en.json (Finnish)
[ci skip]
* New translations doorkeeper.en.yml (Czech)
[ci skip]
* New translations en.yml (Czech)
[ci skip]
* New translations simple_form.en.yml (Spanish)
[ci skip]
* New translations en.json (Bulgarian)
[ci skip]
* New translations doorkeeper.en.yml (Spanish)
[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 doorkeeper.en.yml (Arabic)
[ci skip]
* New translations en.yml (Bulgarian)
[ci skip]
* New translations simple_form.en.yml (Bulgarian)
[ci skip]
* New translations doorkeeper.en.yml (Bulgarian)
[ci skip]
* New translations en.json (Catalan)
[ci skip]
* New translations en.yml (Catalan)
[ci skip]
* New translations simple_form.en.yml (Catalan)
[ci skip]
* New translations doorkeeper.en.yml (Catalan)
[ci skip]
* New translations en.yml (Chinese Traditional)
[ci skip]
* New translations doorkeeper.en.yml (Breton)
[ci skip]
* New translations simple_form.en.yml (Breton)
[ci skip]
* New translations en.json (Kannada)
[ci skip]
* New translations en.yml (Breton)
[ci skip]
* New translations en.json (Hindi)
[ci skip]
* New translations en.yml (Hindi)
[ci skip]
* New translations doorkeeper.en.yml (Hindi)
[ci skip]
* New translations en.json (Malay)
[ci skip]
* New translations en.yml (Malay)
[ci skip]
* New translations en.json (Telugu)
[ci skip]
* New translations en.yml (Telugu)
[ci skip]
* New translations en.json (Welsh)
[ci skip]
* New translations en.json (Breton)
[ci skip]
* New translations en.yml (Welsh)
[ci skip]
* New translations simple_form.en.yml (Welsh)
[ci skip]
* New translations doorkeeper.en.yml (Welsh)
[ci skip]
* New translations doorkeeper.en.yml (Esperanto)
[ci skip]
* New translations en.json (Uyghur)
[ci skip]
* New translations en.yml (Uyghur)
[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 doorkeeper.en.yml (Malayalam)
[ci skip]
* New translations en.yml (Kannada)
[ci skip]
* New translations en.yml (Serbian (Latin))
[ci skip]
* New translations en.json (Taigi)
[ci skip]
* New translations simple_form.en.yml (Kabyle)
[ci skip]
* New translations doorkeeper.en.yml (Kabyle)
[ci skip]
* New translations en.json (Ido)
[ci skip]
* New translations en.yml (Ido)
[ci skip]
* New translations simple_form.en.yml (Ido)
[ci skip]
* New translations doorkeeper.en.yml (Ido)
[ci skip]
* New translations en.yml (Taigi)
[ci skip]
* New translations en.json (Silesian)
[ci skip]
* New translations en.yml (Silesian)
[ci skip]
* New translations en.yml (Kabyle)
[ci skip]
* New translations en.json (Asturian)
[ci skip]
* New translations en.json (Serbian (Latin))
[ci skip]
* New translations en.yml (Asturian)
[ci skip]
* New translations simple_form.en.yml (Asturian)
[ci skip]
* New translations doorkeeper.en.yml (Asturian)
[ci skip]
* New translations en.json (Occitan)
[ci skip]
* New translations simple_form.en.yml (Occitan)
[ci skip]
* New translations doorkeeper.en.yml (Occitan)
[ci skip]
* New translations en.yml (Latvian)
[ci skip]
* New translations en.yml (Sanskrit)
[ci skip]
* New translations simple_form.en.yml (Serbian (Latin))
[ci skip]
* New translations doorkeeper.en.yml (Serbian (Latin))
[ci skip]
* New translations en.json (Corsican)
[ci skip]
* New translations simple_form.en.yml (Corsican)
[ci skip]
* New translations doorkeeper.en.yml (Corsican)
[ci skip]
* New translations en.json (Sanskrit)
[ci skip]
* New translations en.json (Spanish, Argentina)
[ci skip]
* New translations en.json (Latvian)
[ci skip]
* New translations en.json (Chinese Traditional, Hong Kong)
[ci skip]
* New translations simple_form.en.yml (Sorani (Kurdish))
[ci skip]
* New translations en.yml (Sorani (Kurdish))
[ci skip]
* New translations en.json (Sorani (Kurdish))
[ci skip]
* New translations en.yml (Occitan)
[ci skip]
* New translations simple_form.en.yml (Chinese Traditional, Hong Kong)
[ci skip]
* New translations en.yml (Chinese Traditional, Hong Kong)
[ci skip]
* New translations simple_form.en.yml (Esperanto)
[ci skip]
* New translations en.yml (Sardinian)
[ci skip]
* New translations en.yml (Esperanto)
[ci skip]
* New translations en.json (Persian)
[ci skip]
* New translations en.yml (Corsican)
[ci skip]
* New translations doorkeeper.en.yml (Indonesian)
[ci skip]
* New translations en.yml (Persian)
[ci skip]
* New translations simple_form.en.yml (Persian)
[ci skip]
* New translations en.json (Sardinian)
[ci skip]
* New translations simple_form.en.yml (Sardinian)
[ci skip]
* New translations en.json (Tamil)
[ci skip]
* New translations en.json (Esperanto)
[ci skip]
* New translations en.json (Thai)
[ci skip]
* New translations simple_form.en.yml (Thai)
[ci skip]
* New translations en.yml (Thai)
[ci skip]
* New translations doorkeeper.en.yml (Standard Moroccan Tamazight)
[ci skip]
* New translations en.yml (Tatar)
[ci skip]
* New translations en.json (Kabyle)
[ci skip]
* New translations en.json (Tatar)
[ci skip]
* New translations en.yml (Standard Moroccan Tamazight)
[ci skip]
* New translations en.json (Standard Moroccan Tamazight)
[ci skip]
* New translations doorkeeper.en.yml (Sardinian)
[ci skip]
* New translations doorkeeper.en.yml (Sorani (Kurdish))
[ci skip]
* New translations doorkeeper.en.yml (Chinese Traditional, Hong Kong)
[ci skip]
* New translations doorkeeper.en.yml (Persian)
[ci skip]
* New translations en.yml (Tamil)
[ci skip]
* New translations doorkeeper.en.yml (Estonian)
[ci skip]
* New translations doorkeeper.en.yml (Norwegian Nynorsk)
[ci skip]
* New translations en.yml (Croatian)
[ci skip]
* New translations simple_form.en.yml (Croatian)
[ci skip]
* New translations doorkeeper.en.yml (Croatian)
[ci skip]
* New translations en.json (Norwegian Nynorsk)
[ci skip]
* New translations en.yml (Norwegian Nynorsk)
[ci skip]
* New translations simple_form.en.yml (Norwegian Nynorsk)
[ci skip]
* New translations en.json (Kazakh)
[ci skip]
* New translations doorkeeper.en.yml (Thai)
[ci skip]
* New translations en.yml (Kazakh)
[ci skip]
* New translations simple_form.en.yml (Kazakh)
[ci skip]
* New translations doorkeeper.en.yml (Kazakh)
[ci skip]
* New translations en.json (Estonian)
[ci skip]
* New translations en.yml (Estonian)
[ci skip]
* New translations simple_form.en.yml (Estonian)
[ci skip]
* New translations en.json (Croatian)
[ci skip]
* New translations doorkeeper.en.yml (Marathi)
[ci skip]
* New translations simple_form.en.yml (Tamil)
[ci skip]
* New translations simple_form.en.yml (Spanish, Mexico)
[ci skip]
* New translations doorkeeper.en.yml (Tamil)
[ci skip]
* New translations en.yml (Spanish, Argentina)
[ci skip]
* New translations simple_form.en.yml (Spanish, Argentina)
[ci skip]
* New translations doorkeeper.en.yml (Spanish, Argentina)
[ci skip]
* New translations en.json (Spanish, Mexico)
[ci skip]
* New translations en.yml (Spanish, Mexico)
[ci skip]
* New translations doorkeeper.en.yml (Spanish, Mexico)
[ci skip]
* New translations en.json (Bengali)
[ci skip]
* New translations en.yml (Bengali)
[ci skip]
* New translations simple_form.en.yml (Bengali)
[ci skip]
* New translations en.json (Marathi)
[ci skip]
* New translations en.yml (Marathi)
[ci skip]
* New translations simple_form.en.yml (Standard Moroccan Tamazight)
[ci skip]
* New translations en.json (French)
[ci skip]
* New translations en.json (Korean)
[ci skip]
* New translations en.json (Spanish, Argentina)
[ci skip]
* New translations en.json (Spanish, Argentina)
[ci skip]
* New translations en.json (Catalan)
[ci skip]
* New translations en.json (Galician)
[ci skip]
* New translations en.yml (Galician)
[ci skip]
* New translations en.json (Vietnamese)
[ci skip]
* New translations en.json (Russian)
[ci skip]
* New translations en.json (Russian)
[ci skip]
* New translations en.json (Polish)
[ci skip]
* New translations en.json (Albanian)
[ci skip]
* New translations en.yml (Albanian)
[ci skip]
* New translations en.json (Greek)
[ci skip]
* New translations en.json (Albanian)
[ci skip]
* New translations en.json (Spanish)
[ci skip]
* New translations en.yml (Spanish)
[ci skip]
* New translations en.json (Persian)
[ci skip]
* New translations en.json (Icelandic)
[ci skip]
* New translations en.yml (Icelandic)
[ci skip]
* New translations en.json (Icelandic)
[ci skip]
* New translations en.json (Hungarian)
[ci skip]
* New translations en.yml (Hungarian)
[ci skip]
* New translations en.yml (Portuguese, Brazilian)
[ci skip]
* New translations simple_form.en.yml (Portuguese, Brazilian)
[ci skip]
* New translations en.json (Portuguese, Brazilian)
[ci skip]
* New translations en.yml (Portuguese, Brazilian)
[ci skip]
* New translations simple_form.en.yml (Portuguese, Brazilian)
[ci skip]
* New translations en.yml (Portuguese, Brazilian)
[ci skip]
* New translations en.yml (Vietnamese)
[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 (Corsican)
[ci skip]
* New translations en.json (Corsican)
[ci skip]
* New translations simple_form.en.yml (Corsican)
[ci skip]
* New translations en.yml (Chinese Traditional, Hong Kong)
[ci skip]
* New translations en.json (Chinese Traditional, Hong Kong)
[ci skip]
* New translations en.yml (Chinese Traditional, Hong Kong)
[ci skip]
* New translations en.yml (Portuguese)
[ci skip]
* New translations en.json (Portuguese)
[ci skip]
* New translations en.yml (Portuguese)
[ci skip]
* New translations en.json (Portuguese)
[ci skip]
* New translations en.json (Japanese)
[ci skip]
* New translations en.json (Galician)
[ci skip]
* New translations en.yml (Galician)
[ci skip]
* New translations en.json (Italian)
[ci skip]
* New translations en.yml (Kabyle)
[ci skip]
* New translations en.json (Spanish, Mexico)
[ci skip]
* New translations doorkeeper.en.yml (Spanish, Mexico)
[ci skip]
* New translations doorkeeper.en.yml (Spanish)
[ci skip]
* New translations simple_form.en.yml (Spanish)
[ci skip]
* New translations en.json (Spanish)
[ci skip]
* New translations en.json (Spanish, Mexico)
[ci skip]
* New translations en.yml (Spanish, Mexico)
[ci skip]
* New translations simple_form.en.yml (Spanish, Mexico)
[ci skip]
* New translations doorkeeper.en.yml (Spanish, Mexico)
[ci skip]
* New translations en.yml (Vietnamese)
[ci skip]
* New translations en.json (Spanish)
[ci skip]
* New translations en.yml (Spanish)
[ci skip]
* New translations doorkeeper.en.yml (Spanish)
[ci skip]
* New translations simple_form.en.yml (Spanish)
[ci skip]
* New translations en.yml (Vietnamese)
[ci skip]
* New translations simple_form.en.yml (Spanish, Mexico)
[ci skip]
* New translations en.yml (Spanish, Argentina)
[ci skip]
* New translations en.json (Spanish, Mexico)
[ci skip]
* New translations en.yml (Spanish, Mexico)
[ci skip]
* New translations doorkeeper.en.yml (Spanish, Mexico)
[ci skip]
* New translations en.yml (Vietnamese)
[ci skip]
* New translations en.yml (Greek)
[ci skip]
* New translations en.yml (Catalan)
[ci skip]
* New translations en.yml (Hungarian)
[ci skip]
* New translations doorkeeper.en.yml (Spanish)
[ci skip]
* New translations simple_form.en.yml (Spanish)
[ci skip]
* New translations en.yml (Spanish)
[ci skip]
* New translations en.json (Spanish)
[ci skip]
* New translations en.yml (Spanish, Argentina)
[ci skip]
* New translations en.yml (Icelandic)
[ci skip]
* New translations en.yml (Swedish)
[ci skip]
* New translations en.yml (Portuguese)
[ci skip]
* New translations en.yml (Portuguese)
[ci skip]
* New translations en.yml (Italian)
[ci skip]
* New translations en.yml (Italian)
[ci skip]
* New translations en.yml (Spanish)
[ci skip]
* New translations en.yml (Polish)
[ci skip]
* New translations en.yml (Polish)
[ci skip]
* New translations en.yml (Hungarian)
[ci skip]
* New translations en.json (Indonesian)
[ci skip]
* New translations en.yml (Hungarian)
[ci skip]
* New translations en.json (Indonesian)
[ci skip]
* New translations en.yml (Indonesian)
[ci skip]
* New translations en.yml (French)
[ci skip]
* New translations en.yml (Indonesian)
[ci skip]
* New translations simple_form.en.yml (Indonesian)
[ci skip]
* New translations en.yml (Albanian)
[ci skip]
* New translations en.yml (Thai)
[ci skip]
* i18n-tasks normalize
* yarn manage:translations 
							
						 
						
							2020-12-19 00:21:01 +01:00  
				
					
						
							
							
								 
						
							
								59343ef4d1 
								
							 
						 
						
							
							
								
								Fix missing description on enable bootstrap timeline accounts toggle in admin UI ( #15367 )  
							
							
							
						 
						
							2020-12-19 00:19:15 +01:00  
				
					
						
							
							
								 
						
							
								a60d9335d8 
								
							 
						 
						
							
							
								
								Fix resolving accounts sometimes creating duplicate records for a given AP id ( #15364 )  
							
							... 
							
							
							
							* Fix ResolveAccountService accepting mismatching acct: URI
* Set attributes that should be updated regardless of suspension
* Fix key fetching
* Automatically merge remote accounts with duplicate `uri`
* Add tests
* Add "tootctl accounts fix-duplicates"
Finds duplicate accounts sharing a same ActivityPub `id`, re-fetch them and
merge them under the canonical `acct:` URI.
Co-authored-by: Claire <claire.github-309c@sitedethib.com> 
							
						 
						
							2020-12-18 23:26:26 +01:00  
				
					
						
							
							
								 
						
							
								47c6c54d31 
								
							 
						 
						
							
							
								
								Fix styling issue on /about when server admin has a long username ( #15357 )  
							
							... 
							
							
							
							Co-authored-by: Claire <claire.github-309c@sitedethib.com> 
							
						 
						
							2020-12-18 09:43:33 +01:00  
				
					
						
							
							
								 
						
							
								eb35be0431 
								
							 
						 
						
							
							
								
								Fix follow limit preventing re-following of a moved account ( #14207 )  
							
							
							
						 
						
							2020-12-18 09:18:31 +01:00  
				
					
						
							
							
								 
						
							
								941ff04b03 
								
							 
						 
						
							
							
								
								Fix styles for RTL languages and the light theme ( #15356 )  
							
							
							
						 
						
							2020-12-18 08:47:36 +01:00  
				
					
						
							
							
								 
						
							
								8a95867693 
								
							 
						 
						
							
							
								
								Add option to obfuscate domain name in public list of domain blocks ( #15355 )  
							
							... 
							
							
							
							- Replace the middle of the domain with * characters (except for periods)
- Add SHA-256 digest of the domain name in tooltip 
							
						 
						
							2020-12-18 08:30:41 +01:00  
				
					
						
							
							
								 
						
							
								b1feb47055 
								
							 
						 
						
							
							
								
								Improve searching for private toots from URL ( #14856 )  
							
							... 
							
							
							
							* Improve searching for private toots from URL
Most of the time, when sharing toots, people use the toot URL rather than
the toot URI, which makes sense since it is the user-facing URL.
In Mastodon's case, the URL and URI are different, and Mastodon does not
have an index on URL, which means searching a private toot by URL is done
with a slow query that will only succeed for very recent toots.
This change gets rid of the slow query, and attempts to guess the URI from
URL instead, as Mastodon's are predictable.
* Add tests
* Only return status with guessed uri if url matches
Co-authored-by: Claire <claire.github-309c@sitedethib.com> 
							
						 
						
							2020-12-17 06:51:49 +01:00  
				
					
						
							
							
								 
						
							
								2032748050 
								
							 
						 
						
							
							
								
								New Crowdin updates ( #15220 )  
							
							... 
							
							
							
							* New translations doorkeeper.en.yml (Slovak)
[ci skip]
* New translations simple_form.en.yml (Slovak)
[ci skip]
* New translations en.yml (Slovak)
[ci skip]
* New translations en.json (Slovak)
[ci skip]
* New translations doorkeeper.en.yml (Russian)
[ci skip]
* New translations en.yml (Russian)
[ci skip]
* New translations en.yml (Polish)
[ci skip]
* New translations doorkeeper.en.yml (Portuguese)
[ci skip]
* New translations simple_form.en.yml (Portuguese)
[ci skip]
* New translations en.yml (Portuguese)
[ci skip]
* New translations doorkeeper.en.yml (Polish)
[ci skip]
* New translations simple_form.en.yml (Polish)
[ci skip]
* New translations en.yml (Georgian)
[ci skip]
* New translations doorkeeper.en.yml (Japanese)
[ci skip]
* New translations doorkeeper.en.yml (Catalan)
[ci skip]
* New translations simple_form.en.yml (German)
[ci skip]
* New translations simple_form.en.yml (Basque)
[ci skip]
* New translations en.yml (Basque)
[ci skip]
* New translations en.json (Basque)
[ci skip]
* New translations doorkeeper.en.yml (Greek)
[ci skip]
* New translations en.json (Greek)
[ci skip]
* New translations doorkeeper.en.yml (German)
[ci skip]
* New translations en.yml (German)
[ci skip]
* New translations en.json (Finnish)
[ci skip]
* New translations doorkeeper.en.yml (Danish)
[ci skip]
* New translations simple_form.en.yml (Danish)
[ci skip]
* New translations en.yml (Danish)
[ci skip]
* New translations en.json (Danish)
[ci skip]
* New translations doorkeeper.en.yml (Czech)
[ci skip]
* New translations simple_form.en.yml (Czech)
[ci skip]
* New translations en.yml (Czech)
[ci skip]
* New translations doorkeeper.en.yml (Basque)
[ci skip]
* New translations en.yml (Finnish)
[ci skip]
* New translations simple_form.en.yml (Japanese)
[ci skip]
* New translations doorkeeper.en.yml (Hungarian)
[ci skip]
* New translations en.json (Japanese)
[ci skip]
* New translations doorkeeper.en.yml (Italian)
[ci skip]
* New translations simple_form.en.yml (Italian)
[ci skip]
* New translations en.yml (Italian)
[ci skip]
* New translations doorkeeper.en.yml (Armenian)
[ci skip]
* New translations simple_form.en.yml (Armenian)
[ci skip]
* New translations simple_form.en.yml (Hungarian)
[ci skip]
* New translations simple_form.en.yml (Finnish)
[ci skip]
* New translations en.yml (Hungarian)
[ci skip]
* New translations doorkeeper.en.yml (Hebrew)
[ci skip]
* New translations simple_form.en.yml (Hebrew)
[ci skip]
* New translations en.yml (Hebrew)
[ci skip]
* New translations en.json (Hebrew)
[ci skip]
* New translations doorkeeper.en.yml (Finnish)
[ci skip]
* New translations simple_form.en.yml (Standard Moroccan Tamazight)
[ci skip]
* New translations en.yml (Galician)
[ci skip]
* New translations simple_form.en.yml (Galician)
[ci skip]
* New translations en.yml (Catalan)
[ci skip]
* New translations simple_form.en.yml (Catalan)
[ci skip]
* New translations en.yml (Korean)
[ci skip]
* New translations simple_form.en.yml (Korean)
[ci skip]
* New translations en.yml (Korean)
[ci skip]
* New translations en.yml (Vietnamese)
[ci skip]
* New translations simple_form.en.yml (Vietnamese)
[ci skip]
* New translations en.yml (Portuguese)
[ci skip]
* New translations simple_form.en.yml (Portuguese)
[ci skip]
* New translations en.json (Standard Moroccan Tamazight)
[ci skip]
* New translations en.json (Standard Moroccan Tamazight)
[ci skip]
* New translations en.json (Standard Moroccan Tamazight)
[ci skip]
* New translations en.yml (Italian)
[ci skip]
* New translations simple_form.en.yml (Italian)
[ci skip]
* New translations en.yml (Hungarian)
[ci skip]
* New translations simple_form.en.yml (Hungarian)
[ci skip]
* New translations en.yml (Chinese Traditional, Hong Kong)
[ci skip]
* New translations simple_form.en.yml (Chinese Traditional, Hong Kong)
[ci skip]
* New translations en.yml (Swedish)
[ci skip]
* New translations simple_form.en.yml (Swedish)
[ci skip]
* New translations en.yml (Polish)
[ci skip]
* New translations simple_form.en.yml (Polish)
[ci skip]
* New translations simple_form.en.yml (Russian)
[ci skip]
* New translations en.yml (Sardinian)
[ci skip]
* New translations simple_form.en.yml (Sardinian)
[ci skip]
* New translations en.yml (Spanish)
[ci skip]
* New translations simple_form.en.yml (Spanish)
[ci skip]
* New translations en.yml (Icelandic)
[ci skip]
* New translations simple_form.en.yml (Icelandic)
[ci skip]
* New translations en.yml (Spanish, Argentina)
[ci skip]
* New translations simple_form.en.yml (Spanish, Argentina)
[ci skip]
* New translations en.yml (German)
[ci skip]
* New translations simple_form.en.yml (German)
[ci skip]
* New translations en.yml (Esperanto)
[ci skip]
* New translations simple_form.en.yml (French)
[ci skip]
* New translations en.yml (Esperanto)
[ci skip]
* New translations simple_form.en.yml (Esperanto)
[ci skip]
* New translations simple_form.en.yml (French)
[ci skip]
* New translations en.yml (Esperanto)
[ci skip]
* New translations simple_form.en.yml (Esperanto)
[ci skip]
* New translations en.yml (Esperanto)
[ci skip]
* New translations en.yml (French)
[ci skip]
* New translations en.yml (Esperanto)
[ci skip]
* New translations simple_form.en.yml (Esperanto)
[ci skip]
* New translations en.yml (Vietnamese)
[ci skip]
* New translations en.yml (Chinese Traditional, Hong Kong)
[ci skip]
* New translations en.yml (Chinese Traditional, Hong Kong)
[ci skip]
* New translations en.yml (Chinese Traditional, Hong Kong)
[ci skip]
* New translations en.yml (Chinese Traditional, Hong Kong)
[ci skip]
* New translations en.yml (Chinese Traditional, Hong Kong)
[ci skip]
* New translations en.yml (Chinese Traditional, Hong Kong)
[ci skip]
* New translations en.yml (Chinese Traditional, Hong Kong)
[ci skip]
* New translations en.yml (Albanian)
[ci skip]
* New translations simple_form.en.yml (Albanian)
[ci skip]
* New translations en.json (Vietnamese)
[ci skip]
* New translations en.yml (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.yml (Chinese Traditional)
[ci skip]
* New translations simple_form.en.yml (Chinese Traditional)
[ci skip]
* New translations en.yml (Vietnamese)
[ci skip]
* New translations en.yml (Esperanto)
[ci skip]
* New translations simple_form.en.yml (Greek)
[ci skip]
* New translations en.yml (Esperanto)
[ci skip]
* New translations en.json (Esperanto)
[ci skip]
* New translations en.yml (Esperanto)
[ci skip]
* New translations en.yml (Esperanto)
[ci skip]
* New translations en.yml (Esperanto)
[ci skip]
* New translations doorkeeper.en.yml (Spanish, Mexico)
[ci skip]
* New translations simple_form.en.yml (Spanish, Mexico)
[ci skip]
* New translations en.yml (Spanish, Mexico)
[ci skip]
* New translations en.json (Spanish, Mexico)
[ci skip]
* New translations doorkeeper.en.yml (Spanish)
[ci skip]
* New translations simple_form.en.yml (Spanish)
[ci skip]
* New translations en.yml (Spanish)
[ci skip]
* New translations en.json (Spanish)
[ci skip]
* New translations en.yml (Vietnamese)
[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.yml (Korean)
[ci skip]
* New translations doorkeeper.en.yml (Spanish, Mexico)
[ci skip]
* New translations simple_form.en.yml (Spanish, Mexico)
[ci skip]
* New translations en.yml (Spanish, Mexico)
[ci skip]
* New translations en.json (Spanish, Mexico)
[ci skip]
* New translations en.yml (Swedish)
[ci skip]
* New translations doorkeeper.en.yml (Spanish)
[ci skip]
* New translations simple_form.en.yml (Spanish)
[ci skip]
* New translations en.yml (Spanish)
[ci skip]
* New translations en.json (Spanish)
[ci skip]
* New translations en.yml (Japanese)
[ci skip]
* New translations en.yml (Chinese Traditional)
[ci skip]
* New translations en.json (Japanese)
[ci skip]
* New translations en.yml (Persian)
[ci skip]
* New translations en.yml (Catalan)
[ci skip]
* New translations en.yml (Italian)
[ci skip]
* New translations en.yml (Catalan)
[ci skip]
* New translations en.yml (Korean)
[ci skip]
* New translations en.yml (Vietnamese)
[ci skip]
* New translations en.yml (Albanian)
[ci skip]
* New translations en.yml (Swedish)
[ci skip]
* New translations en.yml (Spanish, Argentina)
[ci skip]
* New translations en.yml (Icelandic)
[ci skip]
* New translations en.yml (Spanish, Argentina)
[ci skip]
* New translations en.yml (Corsican)
[ci skip]
* New translations en.yml (Icelandic)
[ci skip]
* New translations en.yml (Spanish)
[ci skip]
* New translations en.yml (Hungarian)
[ci skip]
* New translations en.yml (Spanish)
[ci skip]
* New translations en.yml (Polish)
[ci skip]
* New translations en.yml (Polish)
[ci skip]
* New translations en.yml (Chinese Simplified)
[ci skip]
* New translations en.yml (Chinese Simplified)
[ci skip]
* New translations en.yml (Kabyle)
[ci skip]
* New translations en.yml (Indonesian)
[ci skip]
* New translations en.yml (French)
[ci skip]
* New translations en.yml (Turkish)
[ci skip]
* New translations simple_form.en.yml (Turkish)
[ci skip]
* New translations simple_form.en.yml (Sardinian)
[ci skip]
* New translations en.yml (Hungarian)
[ci skip]
* New translations devise.en.yml (Hungarian)
[ci skip]
* New translations simple_form.en.yml (Sardinian)
[ci skip]
* New translations doorkeeper.en.yml (Spanish, Mexico)
[ci skip]
* New translations simple_form.en.yml (Spanish, Mexico)
[ci skip]
* New translations en.yml (Spanish, Mexico)
[ci skip]
* New translations en.json (Spanish, Mexico)
[ci skip]
* New translations doorkeeper.en.yml (Spanish)
[ci skip]
* New translations simple_form.en.yml (Spanish)
[ci skip]
* New translations en.yml (Spanish)
[ci skip]
* New translations en.json (Spanish)
[ci skip]
* New translations en.yml (French)
[ci skip]
* New translations en.yml (Korean)
[ci skip]
* New translations en.yml (Esperanto)
[ci skip]
* New translations en.yml (Swedish)
[ci skip]
* New translations en.yml (Greek)
[ci skip]
* New translations en.yml (Galician)
[ci skip]
* New translations doorkeeper.en.yml (Spanish, Mexico)
[ci skip]
* New translations simple_form.en.yml (Spanish, Mexico)
[ci skip]
* New translations en.yml (Spanish, Mexico)
[ci skip]
* New translations en.json (Spanish, Mexico)
[ci skip]
* New translations doorkeeper.en.yml (Spanish)
[ci skip]
* New translations simple_form.en.yml (Spanish)
[ci skip]
* New translations en.yml (Spanish)
[ci skip]
* New translations en.json (Spanish)
[ci skip]
* New translations en.yml (German)
[ci skip]
* New translations en.yml (Catalan)
[ci skip]
* New translations en.yml (Vietnamese)
[ci skip]
* New translations en.yml (Chinese Simplified)
[ci skip]
* New translations en.yml (Esperanto)
[ci skip]
* New translations en.yml (Greek)
[ci skip]
* New translations en.yml (Spanish)
[ci skip]
* New translations en.yml (Hungarian)
[ci skip]
* New translations en.yml (Italian)
[ci skip]
* New translations en.json (Standard Moroccan Tamazight)
[ci skip]
* New translations en.yml (Standard Moroccan Tamazight)
[ci skip]
* New translations en.yml (Icelandic)
[ci skip]
* New translations en.yml (Icelandic)
[ci skip]
* New translations en.yml (Albanian)
[ci skip]
* New translations en.yml (Polish)
[ci skip]
* New translations en.yml (Polish)
[ci skip]
* New translations en.yml (Spanish, Argentina)
[ci skip]
* New translations doorkeeper.en.yml (Spanish, Mexico)
[ci skip]
* New translations simple_form.en.yml (Spanish, Mexico)
[ci skip]
* New translations en.yml (Spanish, Mexico)
[ci skip]
* New translations en.json (Spanish, Mexico)
[ci skip]
* New translations doorkeeper.en.yml (Spanish)
[ci skip]
* New translations simple_form.en.yml (Spanish)
[ci skip]
* New translations en.yml (Spanish)
[ci skip]
* New translations en.json (Spanish)
[ci skip]
* New translations en.yml (Japanese)
[ci skip]
* New translations en.yml (Japanese)
[ci skip]
* New translations en.yml (Spanish)
[ci skip]
* New translations en.yml (Hungarian)
[ci skip]
* New translations en.yml (Polish)
[ci skip]
* New translations en.yml (French)
[ci skip]
* New translations en.yml (Catalan)
[ci skip]
* New translations en.yml (French)
[ci skip]
* New translations en.yml (Spanish, Argentina)
[ci skip]
* New translations en.yml (Swedish)
[ci skip]
* New translations en.yml (Armenian)
[ci skip]
* New translations en.yml (Armenian)
[ci skip]
* New translations simple_form.en.yml (Armenian)
[ci skip]
* New translations en.yml (German)
[ci skip]
* New translations en.yml (Russian)
[ci skip]
* New translations en.yml (Russian)
[ci skip]
* New translations en.json (Persian)
[ci skip]
* New translations en.yml (Italian)
[ci skip]
* New translations en.yml (Persian)
[ci skip]
* New translations simple_form.en.yml (Persian)
[ci skip]
* New translations en.yml (Persian)
[ci skip]
* New translations en.yml (Persian)
[ci skip]
* ran `yarn manage:translations`
* ran `i18n-tasks normalize`
* Ran `yarn manage:translations`
* New translations en.yml (Vietnamese)
[ci skip]
* New translations en.yml (Korean)
[ci skip]
* Ran `i18n-tasks normalize`
Co-authored-by: Yamagishi Kazutoshi <ykzts@desire.sh> 
							
						 
						
							2020-12-16 03:24:55 +01:00  
				
					
						
							
							
								 
						
							
								79efcf8aad 
								
							 
						 
						
							
							
								
								Change notification permission handling ( #15176 )  
							
							... 
							
							
							
							* Change notification permission handling
- allow changing individual alert settings even if permission is not explicitly
  enabled (asks for permission on toggle)
- persist permission request banner dismissal across sessions through settings
* Add additional, more discrete message to grant permissions
* Change permission granting button design according to reviews
Co-authored-by: Claire <claire.github-309c@sitedethib.com> 
							
						 
						
							2020-12-15 18:43:54 +01:00  
				
					
						
							
							
								 
						
							
								8357969559 
								
							 
						 
						
							
							
								
								Fix admins being able to suspend their instance actor ( #14567 )  
							
							... 
							
							
							
							* Fix admin being able to suspend their own instance account
* Add text about the instance's own actor in admin view
* Change instance actor notice from flash message to template
* Do not list local instance actor in account moderation list 
							
						 
						
							2020-12-15 17:23:58 +01:00  
				
					
						
							
							
								 
						
							
								b0722fbc14 
								
							 
						 
						
							
							
								
								[Glitch] Change RTL detection to rely on unicode-bidi paragraph by paragraph  
							
							... 
							
							
							
							Port 1f564051b6 
							
						 
						
							2020-12-15 16:42:39 +01:00  
				
					
						
							
							
								 
						
							
								6205107229 
								
							 
						 
						
							
							
								
								[Glitch] Add ability to require invite request text  
							
							... 
							
							
							
							Port CSS changes from 47e507fa61 
							
						 
						
							2020-12-15 16:22:36 +01:00  
				
					
						
							
							
								 
						
							
								5ca7bc2bed 
								
							 
						 
						
							
							
								
								[Glitch] Change "Profile unavailable" string to "Account suspended" in web UI  
							
							... 
							
							
							
							Port 4fd3062003 
							
						 
						
							2020-12-15 16:19:28 +01:00  
				
					
						
							
							
								 
						
							
								e4f8679eae 
								
							 
						 
						
							
							
								
								Merge branch 'master' into glitch-soc/merge-upstream  
							
							... 
							
							
							
							Conflicts:
- `app/models/form/admin_settings.rb`:
  New setting added upstream. Ported it.
- `app/views/statuses/_simple_status.html.haml`:
  Upstream removed RTL classes. Did the same.
- `config/settings.yml`:
  New setting added upstream. Ported it. 
							
						 
						
							2020-12-15 14:27:06 +01:00  
				
					
						
							
							
								 
						
							
								1f564051b6 
								
							 
						 
						
							
							
								
								Change RTL detection to rely on unicode-bidi paragraph by paragraph ( #14573 )  
							
							
							
						 
						
							2020-12-15 12:56:43 +01:00  
				
					
						
							
							
								 
						
							
								1045549f85 
								
							 
						 
						
							
							
								
								Add stoplight for object storage failures, return HTTP 503 ( #13043 )  
							
							
							
						 
						
							2020-12-15 12:55:29 +01:00  
				
					
						
							
							
								 
						
							
								75d2762fdf 
								
							 
						 
						
							
							
								
								Add "invite request content" display in user account admin page ( #15265 )  
							
							... 
							
							
							
							* feat: display `invite_request_text` in admin's user account page
* fix: move invite_request to the bottom of accounts page
* fix: remove time display, remove formate, change code terminology
* fix: remove escape 
							
						 
						
							2020-12-15 06:28:14 +01:00  
				
					
						
							
							
								 
						
							
								1390cc194b 
								
							 
						 
						
							
							
								
								Add indication to admin UI of whether a report has been forwarded ( #13237 )  
							
							... 
							
							
							
							* Add indication to admin UI of whether a report has been forwarded
* Rework how forwarded status is displayed
Co-authored-by: Claire <claire.github-309c@sitedethib.com> 
							
						 
						
							2020-12-15 04:30:15 +01:00  
				
					
						
							
							
								 
						
							
								9342705e6b 
								
							 
						 
						
							
							
								
								Add app shortcuts ( #15234 )  
							
							... 
							
							
							
							* Add app shortcuts
Signed-off-by: mkljczk <me@mkljczk.pl>
* Fix codeclimate issues
Signed-off-by: mkljczk <me@mkljczk.pl>
* Change shortcuts
Signed-off-by: mkljczk <me@mkljczk.pl>
* More consistent new-status icon
Signed-off-by: mkljczk <me@mkljczk.pl> 
							
						 
						
							2020-12-15 02:04:56 +01:00  
				
					
						
							
							
								 
						
							
								1978f7265e 
								
							 
						 
						
							
							
								
								Fix processing of Delete activities on direct messages  
							
							
							
						 
						
							2020-12-14 23:05:32 +01:00  
				
					
						
							
							
								 
						
							
								47e507fa61 
								
							 
						 
						
							
							
								
								Add ability to require invite request text ( #15326 )  
							
							... 
							
							
							
							Fixes  #15273 
Co-authored-by: Claire <claire.github-309c@sitedethib.com> 
						
							2020-12-14 10:03:09 +01:00  
				
					
						
							
							
								 
						
							
								a7e819b8a8 
								
							 
						 
						
							
							
								
								Fix dynamic updating of “Bootstrap timeline accounts” admin setting ( #15325 )  
							
							... 
							
							
							
							Co-authored-by: Claire <claire.github-309c@sitedethib.com> 
							
						 
						
							2020-12-14 09:37:58 +01:00  
				
					
						
							
							
								 
						
							
								4fd3062003 
								
							 
						 
						
							
							
								
								Change "Profile unavailable" string to "Account suspended" in web UI ( #15345 )  
							
							
							
						 
						
							2020-12-14 09:08:09 +01:00  
				
					
						
							
							
								 
						
							
								216b85b053 
								
							 
						 
						
							
							
								
								Fix performance on instances list in admin UI ( #15282 )  
							
							... 
							
							
							
							- Reduce duplicate queries
- Remove n+1 queries
- Add accounts count to detailed view
- Add separate action log entry for updating existing domain blocks 
							
						 
						
							2020-12-14 09:06:34 +01:00  
				
					
						
							
							
								 
						
							
								a3b5675aa8 
								
							 
						 
						
							
							
								
								Change number format on about page from full to shortened ( #15327 )  
							
							
							
						 
						
							2020-12-14 05:09:14 +01:00  
				
					
						
							
							
								 
						
							
								4acb5c90a2 
								
							 
						 
						
							
							
								
								Use “public.js” pack for auth pages for form validation helpers  
							
							
							
						 
						
							2020-12-10 13:01:51 +01:00  
				
					
						
							
							
								 
						
							
								9a5825f864 
								
							 
						 
						
							
							
								
								[Glitch] Add honeypot fields and minimum fill-out time for sign-up form  
							
							... 
							
							
							
							Port 49eb4d4ddf 
							
						 
						
							2020-12-10 09:44:16 +01:00  
				
					
						
							
							
								 
						
							
								237025b5ef 
								
							 
						 
						
							
							
								
								[Glitch] Fix notifications being unnecessarily redrawn on state change  
							
							... 
							
							
							
							Port 9669167aae 
							
						 
						
							2020-12-10 09:42:32 +01:00  
				
					
						
							
							
								 
						
							
								7782e4dc0d 
								
							 
						 
						
							
							
								
								Merge branch 'master' into glitch-soc/merge-upstream  
							
							... 
							
							
							
							Conflicts:
- `app/controllers/about_controller.rb`:
  Minor conflict caused by glitch-soc's theming system.
  Ported upstream changes. 
							
						 
						
							2020-12-10 09:41:49 +01:00  
				
					
						
							
							
								 
						
							
								49eb4d4ddf 
								
							 
						 
						
							
							
								
								Add honeypot fields and minimum fill-out time for sign-up form ( #15276 )  
							
							... 
							
							
							
							* Add honeypot fields to limit non-specialized spam
Add two honeypot fields: a fake website input and a fake password confirmation
one. The label/placeholder/aria-label tells not to fill them, and they are
hidden in CSS, so legitimate users should not fall into these.
This should cut down on some non-Mastodon-specific spambots.
* Require a 3 seconds delay before submitting the registration form
* Fix tests
* Move registration form time check to model validation
* Give people a chance to clear the honeypot fields
* Refactor honeypot translation strings
Co-authored-by: Claire <claire.github-309c@sitedethib.com> 
							
						 
						
							2020-12-10 06:27:26 +01:00  
				
					
						
							
							
								 
						
							
								9669167aae 
								
							 
						 
						
							
							
								
								Fix notifications being unnecessarily redrawn on state change ( #15312 )  
							
							... 
							
							
							
							Co-authored-by: Claire <claire.github-309c@sitedethib.com> 
							
						 
						
							2020-12-09 19:16:30 +01:00  
				
					
						
							
							
								 
						
							
								7d0e45a3be 
								
							 
						 
						
							
							
								
								[Glitch] Fix column swiping animation logic  
							
							... 
							
							
							
							Port 0b437325dc 
							
						 
						
							2020-12-09 15:12:28 +01:00  
				
					
						
							
							
								 
						
							
								e18f9f8228 
								
							 
						 
						
							
							
								
								[Glitch] Fix unnecessary re-rendering of various components when typing in web UI  
							
							... 
							
							
							
							Partially port 9620ee90be 
							
						 
						
							2020-12-09 15:11:38 +01:00  
				
					
						
							
							
								 
						
							
								3449ffa133 
								
							 
						 
						
							
							
								
								[Glitch] rename replies_policy enumerables  
							
							... 
							
							
							
							Port front-end changes from 127c543a6e 
							
						 
						
							2020-12-09 14:58:09 +01:00  
				
					
						
							
							
								 
						
							
								b5134595d8 
								
							 
						 
						
							
							
								
								[Glitch] Fix alert when failing to save timeline markers in web UI  
							
							... 
							
							
							
							Port 59d943e152 
							
						 
						
							2020-12-09 14:57:17 +01:00  
				
					
						
							
							
								 
						
							
								a16175645d 
								
							 
						 
						
							
							
								
								Merge branch 'master' into glitch-soc/merge-upstream  
							
							
							
						 
						
							2020-12-09 14:42:33 +01:00  
				
					
						
							
							
								 
						
							
								127c543a6e 
								
							 
						 
						
							
							
								
								rename replies_policy enumerables ( #15304 )  
							
							
							
						 
						
							2020-12-09 04:34:17 +01:00  
				
					
						
							
							
								 
						
							
								f379a52d74 
								
							 
						 
						
							
							
								
								Fix missing pictureInPicture prop in detailed status container ( #15309 )  
							
							
							
						 
						
							2020-12-09 04:33:33 +01:00  
				
					
						
							
							
								 
						
							
								7aee364795 
								
							 
						 
						
							
							
								
								Fix open media hotkey ( #15308 )  
							
							... 
							
							
							
							* Fix open media hotkey
* Update status.js
Co-authored-by: Eugen Rochko <eugen@zeonfederated.com> 
							
						 
						
							2020-12-09 00:24:13 +01:00  
				
					
						
							
							
								 
						
							
								765626a3a7 
								
							 
						 
						
							
							
								
								Fix the Open handler for PreviewCard ( #15305 )  
							
							
							
						 
						
							2020-12-08 12:07:54 +01:00  
				
					
						
							
							
								 
						
							
								0b437325dc 
								
							 
						 
						
							
							
								
								Fix column swiping animation logic ( #15301 )  
							
							... 
							
							
							
							From the start, swiping columns was highly unreliable because the logic
could change `ReactSwipeableViews`'s `animateTransitions` property
mid-swipe.
PR #11200  partially fixed this, but at the unintended cost of disabling the
swipe animation altogether.
This PR changes the logic behind `shouldAnimate` to only disable the swiping
animation at the end of a column change not initiated by `ReactSwipeableViews`.
Co-authored-by: Claire <claire.github-309c@sitedethib.com> 
							
						 
						
							2020-12-07 20:07:24 +01:00  
				
					
						
							
							
								 
						
							
								9620ee90be 
								
							 
						 
						
							
							
								
								Fix unnecessary re-rendering of various components when typing in web UI ( #15286 )  
							
							
							
						 
						
							2020-12-07 19:36:36 +01:00  
				
					
						
							
							
								 
						
							
								48bef17cc9 
								
							 
						 
						
							
							
								
								Fix slow distinct queries where grouped queries are faster ( #15287 )  
							
							... 
							
							
							
							About 2x speed-up on inboxes query 
							
						 
						
							2020-12-07 12:08:30 +01:00  
				
					
						
							
							
								 
						
							
								a8c471fcc0 
								
							 
						 
						
							
							
								
								Fix not being able to open audio modal in web UI ( #15283 )  
							
							... 
							
							
							
							Fix  #15280 
Also adds the new action bar and blurhash-based background
color to audio and video modals 
						
							2020-12-07 04:29:37 +01:00  
				
					
						
							
							
								 
						
							
								59d943e152 
								
							 
						 
						
							
							
								
								Fix alert when failing to save timeline markers in web UI ( #15285 )  
							
							... 
							
							
							
							Fix  #15267  
						
							2020-12-07 03:23:43 +01:00  
				
					
						
							
							
								 
						
							
								014733d1e4 
								
							 
						 
						
							
							
								
								Fix too low contrast on new media modal background in web UI ( #15284 )  
							
							... 
							
							
							
							Fix  #15258  
						
							2020-12-07 02:32:27 +01:00  
				
					
						
							
							
								 
						
							
								17a2e27641 
								
							 
						 
						
							
							
								
								Fix remove number sign from account_featured_tags ( #15277 )  
							
							
							
						 
						
							2020-12-06 05:55:35 +01:00  
				
					
						
							
							
								 
						
							
								40e2de3904 
								
							 
						 
						
							
							
								
								[Glitch] Fix character count not ignoring hidden CW field  
							
							... 
							
							
							
							Port 68775b6039 
							
						 
						
							2020-12-05 21:15:18 +01:00  
				
					
						
							
							
								 
						
							
								f8d867bac4 
								
							 
						 
						
							
							
								
								Merge branch 'master' into glitch-soc/merge-upstream  
							
							... 
							
							
							
							Conflicts:
- `app/services/remove_status_service.rb`:
  Conflict caused by us having a distinc Direct timeline.
  Ported upstream changes.
- `app/javascript/mastodon/features/compose/components/compose_form.js`:
  Conflict between glitch-soc's variable character limit and upstream
  refactoring that part of the code.
  Ported upstream changes. 
							
						 
						
							2020-12-05 17:33:37 +01:00  
				
					
						
							
							
								 
						
							
								13df125b6c 
								
							 
						 
						
							
							
								
								Add favourite modal to light theme CSS  
							
							
							
						 
						
							2020-12-05 13:23:39 +01:00  
				
					
						
							
							
								 
						
							
								44d5c6bc8f 
								
							 
						 
						
							
							
								
								Fix incorrect conditions for suspended accounts in Get API for account featured tags ( #15270 )  
							
							
							
						 
						
							2020-12-04 04:22:35 +01:00  
				
					
						
							
							
								 
						
							
								fbe7519243 
								
							 
						 
						
							
							
								
								Fix account merging in maintenance script ( #15264 )  
							
							... 
							
							
							
							Also include AccountNote and AccountDeletionRequest to the list of classes
needing to be reassigned the merged account. 
							
						 
						
							2020-12-04 02:23:51 +01:00  
				
					
						
							
							
								 
						
							
								d849aad852 
								
							 
						 
						
							
							
								
								Change public thread view to hide "Show thread" link ( #15266 )  
							
							... 
							
							
							
							Fixes  #15262  
						
							2020-12-02 21:21:44 +01:00  
				
					
						
							
							
								 
						
							
								9136be480f 
								
							 
						 
						
							
							
								
								Fix followers hash cache not being invalidated on account merge ( #15256 )  
							
							... 
							
							
							
							Also clear relationships cache. 
							
						 
						
							2020-12-02 21:20:00 +01:00  
				
					
						
							
							
								 
						
							
								a55e6e99c0 
								
							 
						 
						
							
							
								
								Fix `ku` locale not being right-to-left ( #15252 )  
							
							
							
						 
						
							2020-11-30 23:02:32 +01:00  
				
					
						
							
							
								 
						
							
								68775b6039 
								
							 
						 
						
							
							
								
								Fix character count not ignoring hidden CW field ( #15236 )  
							
							
							
						 
						
							2020-11-30 12:09:34 +01:00  
				
					
						
							
							
								 
						
							
								13b07b88f1 
								
							 
						 
						
							
							
								
								Fix omniauth (SAML/CAS) sign-in routes not having CSRF protection ( #15228 )  
							
							
							
						 
						
							2020-11-28 05:17:53 +01:00  
				
					
						
							
							
								 
						
							
								13206fcfb8 
								
							 
						 
						
							
							
								
								Fix media modal crashing when media has no blurhash ( #15229 )  
							
							
							
						 
						
							2020-11-28 03:37:01 +01:00  
				
					
						
							
							
								 
						
							
								e7e099d1a0 
								
							 
						 
						
							
							
								
								Fix deletes not reaching every server that interacted with status ( #15200 )  
							
							... 
							
							
							
							Extract logic for determining ActivityPub inboxes to send deletes
to to its own class and explicitly include the person the status
replied to (even if not mentioned), people who favourited it, and
people who replied to it (though that one is still not recursive) 
							
						 
						
							2020-11-27 15:48:31 +01:00  
				
					
						
							
							
								 
						
							
								e1a6526c8d 
								
							 
						 
						
							
							
								
								Fix media modal regression on public pages ( #15221 )  
							
							
							
						 
						
							2020-11-27 15:41:58 +01:00  
				
					
						
							
							
								 
						
							
								1e89e2ed98 
								
							 
						 
						
							
							
								
								Change media modals look in web UI ( #15217 )  
							
							... 
							
							
							
							- Change overlay background to match color of viewed image
- Add interactive reply/boost/favourite buttons to footer of modal
- Change ugly "View context" link to button among the action bar 
							
						 
						
							2020-11-27 03:24:11 +01:00  
				
					
						
							
							
								 
						
							
								cb7bd8ee03 
								
							 
						 
						
							
							
								
								New Crowdin updates ( #15137 )  
							
							... 
							
							
							
							* New translations en.yml (Kabyle)
[ci skip]
* New translations en.json (Kabyle)
[ci skip]
* New translations en.yml (Sanskrit)
[ci skip]
* New translations en.json (Sanskrit)
[ci skip]
* New translations en.yml (Sardinian)
[ci skip]
* New translations en.json (Sardinian)
[ci skip]
* New translations simple_form.en.yml (Corsican)
[ci skip]
* New translations simple_form.en.yml (Sorani (Kurdish))
[ci skip]
* New translations en.yml (Welsh)
[ci skip]
* New translations simple_form.en.yml (Swedish)
[ci skip]
* New translations en.json (Tamil)
[ci skip]
* New translations simple_form.en.yml (Persian)
[ci skip]
* New translations en.yml (Persian)
[ci skip]
* New translations en.json (Persian)
[ci skip]
* New translations simple_form.en.yml (Indonesian)
[ci skip]
* New translations en.yml (Indonesian)
[ci skip]
* New translations simple_form.en.yml (Portuguese, Brazilian)
[ci skip]
* New translations en.yml (Portuguese, Brazilian)
[ci skip]
* New translations simple_form.en.yml (Galician)
[ci skip]
* New translations simple_form.en.yml (Tamil)
[ci skip]
* New translations en.yml (Urdu (Pakistan))
[ci skip]
* New translations en.json (Urdu (Pakistan))
[ci skip]
* New translations simple_form.en.yml (Chinese Traditional)
[ci skip]
* New translations en.yml (Chinese Traditional)
[ci skip]
* New translations en.json (Chinese Traditional)
[ci skip]
* New translations simple_form.en.yml (Chinese Simplified)
[ci skip]
* New translations en.yml (Chinese Simplified)
[ci skip]
* New translations simple_form.en.yml (Ukrainian)
[ci skip]
* New translations en.yml (Ukrainian)
[ci skip]
* New translations en.json (Ukrainian)
[ci skip]
* New translations en.yml (Tamil)
[ci skip]
* New translations en.yml (Telugu)
[ci skip]
* New translations en.yml (Estonian)
[ci skip]
* New translations en.json (Telugu)
[ci skip]
* New translations en.yml (Malay)
[ci skip]
* New translations en.json (Malay)
[ci skip]
* New translations en.yml (Hindi)
[ci skip]
* New translations en.json (Hindi)
[ci skip]
* New translations en.yml (Latvian)
[ci skip]
* New translations en.json (Latvian)
[ci skip]
* New translations simple_form.en.yml (Estonian)
[ci skip]
* New translations en.json (Estonian)
[ci skip]
* New translations en.json (Bengali)
[ci skip]
* New translations simple_form.en.yml (Kazakh)
[ci skip]
* New translations en.yml (Kazakh)
[ci skip]
* New translations en.json (Kazakh)
[ci skip]
* New translations simple_form.en.yml (Norwegian Nynorsk)
[ci skip]
* New translations en.yml (Norwegian Nynorsk)
[ci skip]
* New translations en.json (Norwegian Nynorsk)
[ci skip]
* New translations en.json (Thai)
[ci skip]
* New translations en.yml (Marathi)
[ci skip]
* New translations en.json (Marathi)
[ci skip]
* New translations simple_form.en.yml (Bengali)
[ci skip]
* New translations en.yml (Bengali)
[ci skip]
* New translations en.json (Chinese Traditional)
[ci skip]
* New translations en.json (Chinese Traditional)
[ci skip]
* New translations en.yml (Vietnamese)
[ci skip]
* New translations en.json (Vietnamese)
[ci skip]
* New translations en.yml (Vietnamese)
[ci skip]
* New translations en.json (Vietnamese)
[ci skip]
* New translations en.yml (Vietnamese)
[ci skip]
* New translations en.json (Vietnamese)
[ci skip]
* New translations en.json (Spanish, Mexico)
[ci skip]
* New translations doorkeeper.en.yml (Spanish, Mexico)
[ci skip]
* New translations simple_form.en.yml (Spanish, Mexico)
[ci skip]
* New translations en.yml (Spanish, Mexico)
[ci skip]
* New translations simple_form.en.yml (Spanish)
[ci skip]
* New translations en.json (Spanish)
[ci skip]
* New translations en.yml (Spanish)
[ci skip]
* New translations en.yml (French)
[ci skip]
* New translations en.json (French)
[ci skip]
* New translations en.yml (French)
[ci skip]
* New translations en.yml (Esperanto)
[ci skip]
* New translations en.yml (Japanese)
[ci skip]
* New translations devise.en.yml (Japanese)
[ci skip]
* New translations en.yml (Japanese)
[ci skip]
* New translations en.yml (Vietnamese)
[ci skip]
* New translations en.yml (Japanese)
[ci skip]
* New translations en.yml (French)
[ci skip]
* New translations en.yml (Occitan)
[ci skip]
* New translations simple_form.en.yml (Occitan)
[ci skip]
* New translations en.yml (Occitan)
[ci skip]
* New translations en.yml (Vietnamese)
[ci skip]
* New translations en.yml (Standard Moroccan Tamazight)
[ci skip]
* New translations en.json (Vietnamese)
[ci skip]
* New translations en.yml (Standard Moroccan Tamazight)
[ci skip]
* New translations en.json (Standard Moroccan Tamazight)
[ci skip]
* New translations en.yml (Standard Moroccan Tamazight)
[ci skip]
* New translations doorkeeper.en.yml (Standard Moroccan Tamazight)
[ci skip]
* New translations en.json (Standard Moroccan Tamazight)
[ci skip]
* New translations en.json (Standard Moroccan Tamazight)
[ci skip]
* New translations en.json (Kannada)
[ci skip]
* New translations en.yml (French)
[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 doorkeeper.en.yml (Esperanto)
[ci skip]
* New translations doorkeeper.en.yml (Esperanto)
[ci skip]
* New translations en.json (Esperanto)
[ci skip]
* New translations en.json (Esperanto)
[ci skip]
* New translations en.json (Vietnamese)
[ci skip]
* New translations doorkeeper.en.yml (Spanish)
[ci skip]
* New translations en.json (Spanish, Mexico)
[ci skip]
* New translations doorkeeper.en.yml (Spanish, Mexico)
[ci skip]
* New translations simple_form.en.yml (Spanish, Mexico)
[ci skip]
* New translations en.yml (Spanish, Mexico)
[ci skip]
* New translations simple_form.en.yml (Spanish)
[ci skip]
* New translations en.json (Spanish)
[ci skip]
* New translations en.yml (Spanish)
[ci skip]
* New translations en.yml (Portuguese)
[ci skip]
* New translations en.yml (Hungarian)
[ci skip]
* New translations en.yml (Turkish)
[ci skip]
* New translations en.yml (Swedish)
[ci skip]
* New translations en.yml (Icelandic)
[ci skip]
* New translations en.yml (Spanish, Argentina)
[ci skip]
* New translations en.yml (Spanish, Argentina)
[ci skip]
* New translations en.yml (Esperanto)
[ci skip]
* New translations en.yml (Catalan)
[ci skip]
* New translations en.yml (Italian)
[ci skip]
* New translations en.yml (Corsican)
[ci skip]
* New translations en.yml (Spanish)
[ci skip]
* New translations en.yml (Russian)
[ci skip]
* New translations en.yml (French)
[ci skip]
* New translations en.yml (Danish)
[ci skip]
* New translations en.yml (Korean)
[ci skip]
* New translations en.yml (Chinese Simplified)
[ci skip]
* New translations en.yml (Vietnamese)
[ci skip]
* New translations en.json (Chinese Traditional)
[ci skip]
* New translations en.json (Japanese)
[ci skip]
* New translations en.yml (Galician)
[ci skip]
* New translations en.yml (Japanese)
[ci skip]
* New translations en.yml (Albanian)
[ci skip]
* New translations en.yml (Vietnamese)
[ci skip]
* New translations en.yml (Galician)
[ci skip]
* New translations en.yml (Vietnamese)
[ci skip]
* New translations en.yml (Vietnamese)
[ci skip]
* New translations en.yml (Vietnamese)
[ci skip]
* New translations en.yml (Vietnamese)
[ci skip]
* New translations simple_form.en.yml (Vietnamese)
[ci skip]
* New translations en.yml (Indonesian)
[ci skip]
* New translations devise.en.yml (Vietnamese)
[ci skip]
* New translations en.json (Vietnamese)
[ci skip]
* New translations en.yml (Vietnamese)
[ci skip]
* New translations doorkeeper.en.yml (Vietnamese)
[ci skip]
* New translations en.yml (Vietnamese)
[ci skip]
* New translations simple_form.en.yml (Vietnamese)
[ci skip]
* New translations doorkeeper.en.yml (Vietnamese)
[ci skip]
* New translations en.yml (Vietnamese)
[ci skip]
* New translations en.json (Vietnamese)
[ci skip]
* New translations en.yml (Vietnamese)
[ci skip]
* New translations en.yml (Vietnamese)
[ci skip]
* New translations en.json (Persian)
[ci skip]
* New translations en.yml (Esperanto)
[ci skip]
* New translations en.json (Standard Moroccan Tamazight)
[ci skip]
* New translations en.yml (Turkish)
[ci skip]
* New translations en.yml (Turkish)
[ci skip]
* New translations en.json (Vietnamese)
[ci skip]
* New translations en.yml (Vietnamese)
[ci skip]
* New translations devise.en.yml (Czech)
[ci skip]
* New translations devise.en.yml (Czech)
[ci skip]
* New translations en.json (Czech)
[ci skip]
* New translations en.json (Polish)
[ci skip]
* New translations en.yml (Polish)
[ci skip]
* New translations simple_form.en.yml (Polish)
[ci skip]
* New translations en.yml (Thai)
[ci skip]
* New translations en.yml (Thai)
[ci skip]
* New translations en.json (Czech)
[ci skip]
* New translations en.json (Vietnamese)
[ci skip]
* New translations en.json (Galician)
[ci skip]
* New translations en.json (Armenian)
[ci skip]
* New translations en.json (Armenian)
[ci skip]
* New translations simple_form.en.yml (Armenian)
[ci skip]
* New translations en.yml (Armenian)
[ci skip]
* New translations doorkeeper.en.yml (Spanish)
[ci skip]
* New translations en.json (Spanish, Mexico)
[ci skip]
* New translations doorkeeper.en.yml (Spanish, Mexico)
[ci skip]
* New translations simple_form.en.yml (Spanish, Mexico)
[ci skip]
* New translations en.yml (Spanish, Mexico)
[ci skip]
* New translations simple_form.en.yml (Spanish)
[ci skip]
* New translations en.json (Spanish)
[ci skip]
* New translations en.yml (Spanish)
[ci skip]
* New translations en.yml (Portuguese)
[ci skip]
* New translations en.yml (Russian)
[ci skip]
* New translations en.json (Russian)
[ci skip]
* New translations en.yml (Swedish)
[ci skip]
* New translations en.yml (Spanish)
[ci skip]
* New translations en.yml (Spanish, Argentina)
[ci skip]
* New translations en.yml (Albanian)
[ci skip]
* New translations en.yml (Hungarian)
[ci skip]
* New translations en.yml (Italian)
[ci skip]
* New translations en.yml (Persian)
[ci skip]
* New translations en.yml (Portuguese, Brazilian)
[ci skip]
* New translations simple_form.en.yml (Portuguese, Brazilian)
[ci skip]
* New translations en.yml (French)
[ci skip]
* New translations en.yml (Catalan)
[ci skip]
* New translations en.yml (Turkish)
[ci skip]
* New translations en.yml (Armenian)
[ci skip]
* New translations en.yml (Armenian)
[ci skip]
* New translations simple_form.en.yml (Armenian)
[ci skip]
* New translations en.yml (Armenian)
[ci skip]
* New translations en.yml (Korean)
[ci skip]
* New translations en.yml (Vietnamese)
[ci skip]
* New translations en.yml (Danish)
[ci skip]
* New translations en.yml (Polish)
[ci skip]
* New translations en.yml (Thai)
[ci skip]
* New translations en.yml (Galician)
[ci skip]
* New translations en.yml (Indonesian)
[ci skip]
* New translations en.json (Vietnamese)
[ci skip]
* New translations en.json (Vietnamese)
[ci skip]
* New translations en.yml (Japanese)
[ci skip]
* New translations en.json (Japanese)
[ci skip]
* New translations en.json (Vietnamese)
[ci skip]
* New translations en.yml (Vietnamese)
[ci skip]
* New translations en.json (Chinese Traditional, Hong Kong)
[ci skip]
* New translations en.json (Chinese Traditional, Hong Kong)
[ci skip]
* New translations en.yml (Chinese Traditional, Hong Kong)
[ci skip]
* New translations simple_form.en.yml (Chinese Traditional, Hong Kong)
[ci skip]
* New translations simple_form.en.yml (French)
[ci skip]
* New translations en.json (Chinese Traditional, Hong Kong)
[ci skip]
* New translations en.json (Chinese Traditional, Hong Kong)
[ci skip]
* New translations en.json (Chinese Traditional, Hong Kong)
[ci skip]
* New translations en.json (Chinese Traditional, Hong Kong)
[ci skip]
* New translations en.json (Chinese Traditional, Hong Kong)
[ci skip]
* New translations devise.en.yml (Chinese Traditional, Hong Kong)
[ci skip]
* New translations devise.en.yml (Chinese Traditional, Hong Kong)
[ci skip]
* New translations devise.en.yml (Chinese Traditional, Hong Kong)
[ci skip]
* New translations en.yml (Chinese Simplified)
[ci skip]
* New translations en.json (Turkish)
[ci skip]
* New translations en.yml (German)
[ci skip]
* New translations en.yml (Galician)
[ci skip]
* New translations en.json (Galician)
[ci skip]
* New translations devise.en.yml (Galician)
[ci skip]
* New translations en.json (Armenian)
[ci skip]
* New translations en.yml (Armenian)
[ci skip]
* New translations en.json (Armenian)
[ci skip]
* New translations en.yml (Armenian)
[ci skip]
* New translations en.json (Sardinian)
[ci skip]
* New translations en.json (Sardinian)
[ci skip]
* New translations en.json (Sardinian)
[ci skip]
* New translations en.json (Vietnamese)
[ci skip]
* New translations en.json (Vietnamese)
[ci skip]
* New translations en.json (Vietnamese)
[ci skip]
* New translations en.yml (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.yml (Sorani (Kurdish))
[ci skip]
* New translations doorkeeper.en.yml (Sorani (Kurdish))
[ci skip]
* Ran `i18n-tasks normalize`
* Ran `yarn manage:translations`
Co-authored-by: Yamagishi Kazutoshi <ykzts@desire.sh> 
							
						 
						
							2020-11-26 22:42:12 +09:00  
				
					
						
							
							
								 
						
							
								b9fc807115 
								
							 
						 
						
							
							
								
								[Glitch] Fixed ESLint error  
							
							... 
							
							
							
							Port a2da02626e 
							
						 
						
							2020-11-25 15:56:43 +01:00  
				
					
						
							
							
								 
						
							
								3d970faeb1 
								
							 
						 
						
							
							
								
								[Glitch] Remove fade-in animation from modals in web UI  
							
							... 
							
							
							
							Signed-off-by: Thibaut Girka <thib@sitedethib.com> 
							
						 
						
							2020-11-25 15:50:22 +01:00  
				
					
						
							
							
								 
						
							
								4dab236690 
								
							 
						 
						
							
							
								
								Default to 25 fps for frame seeking if framerate information isn't known  
							
							
							
						 
						
							2020-11-25 15:47:23 +01:00  
				
					
						
							
							
								 
						
							
								51d0e1c7b4 
								
							 
						 
						
							
							
								
								[Glitch] Fix hardcoded frame rate for frame by frame video navigation in web UI  
							
							... 
							
							
							
							Port f970e1fab6 
							
						 
						
							2020-11-25 15:46:09 +01:00  
				
					
						
							
							
								 
						
							
								e71b16ae2b 
								
							 
						 
						
							
							
								
								Merge branch 'master' into glitch-soc/merge-upstream  
							
							... 
							
							
							
							Conflicts:
- `Gemfile.lock`:
  glitch-soc-only dependency textually too close to updated upstream
  dependencies. Updated to upsteam dependencies. 
							
						 
						
							2020-11-25 15:31:45 +01:00  
				
					
						
							
							
								 
						
							
								f844386809 
								
							 
						 
						
							
							
								
								Add `tootctl accounts merge` ( #15201 )  
							
							... 
							
							
							
							* Add `tootctl accounts merge`
* Update lib/mastodon/accounts_cli.rb
Co-authored-by: Yamagishi Kazutoshi <ykzts@desire.sh>
Co-authored-by: Yamagishi Kazutoshi <ykzts@desire.sh> 
							
						 
						
							2020-11-23 17:50:16 +01:00  
				
					
						
							
							
								 
						
							
								a2da02626e 
								
							 
						 
						
							
							
								
								Fixed ESLint error ( #15214 )  
							
							... 
							
							
							
							* eslint --fix
* fix consistent-return
* fix promise/catch-or-return
* ignore import rule 
							
						 
						
							2020-11-23 17:35:14 +01:00  
				
					
						
							
							
								 
						
							
								272566043a 
								
							 
						 
						
							
							
								
								Remove fade-in animation from modals in web UI ( #15199 )  
							
							
							
						 
						
							2020-11-21 23:54:36 +01:00  
				
					
						
							
							
								 
						
							
								f970e1fab6 
								
							 
						 
						
							
							
								
								Fix hardcoded frame rate for frame by frame video navigation in web UI ( #15198 )  
							
							
							
						 
						
							2020-11-21 23:19:04 +01:00  
				
					
						
							
							
								 
						
							
								66832cbf33 
								
							 
						 
						
							
							
								
								Undo outgoing follows when suspending a remote account ( #15188 )  
							
							
							
						 
						
							2020-11-21 21:27:00 +01:00  
				
					
						
							
							
								 
						
							
								c43f4cd3bb 
								
							 
						 
						
							
							
								
								Fix not being able to unfavorite toots one has lost access to ( #15192 )  
							
							... 
							
							
							
							Fixes  #15191  
						
							2020-11-21 06:18:09 +01:00  
				
					
						
							
							
								 
						
							
								3281c9b4c0 
								
							 
						 
						
							
							
								
								Fix video not taking focus on interaction  
							
							... 
							
							
							
							Revert part of #737  to restore hotkey functionality 
							
						 
						
							2020-11-20 14:20:17 +01:00  
				
					
						
							
							
								 
						
							
								15be0bde8a 
								
							 
						 
						
							
							
								
								[Glitch] Fix image uploads being random data when canvas read access is blocked  
							
							... 
							
							
							
							Port d8d43a427a 
							
						 
						
							2020-11-20 13:41:07 +01:00  
				
					
						
							
							
								 
						
							
								b82aa33dea 
								
							 
						 
						
							
							
								
								[Glitch] Add hotkeys for audio/video control  
							
							... 
							
							
							
							Port 04a079e723 
							
						 
						
							2020-11-20 13:40:05 +01:00  
				
					
						
							
							
								 
						
							
								48f0f3ffee 
								
							 
						 
						
							
							
								
								Merge branch 'master' into glitch-soc/merge-upstream  
							
							... 
							
							
							
							Conflicts:
- `.github/ISSUE_TEMPLATE/bug_report.md`:
  Upstream added the `bug` label to bug reports.
  Did the same.
- `app/services/fan_out_on_write_service.rb`:
  Upstream put DMs back into timelines, glitch-soc was already doing it.
  Ignored upstream changes. 
							
						 
						
							2020-11-20 13:27:48 +01:00  
				
					
						
							
							
								 
						
							
								8b8004a962 
								
							 
						 
						
							
							
								
								Fix webfinger redirect handling in ResolveAccountService ( #15187 )  
							
							... 
							
							
							
							* Fix webfinger redirect handling in ResolveAccountService
ResolveAccountService#process_webfinger! handled a one-step webfinger
redirection, but only accepting the result if it matched the exact URI passed
as input, defeating the point of a redirection check.
Instead, use the same logic as in `ActivityPub::FetchRemoteAccountService`,
updating the resulting `acct:` URI with the result of the first webfinger
query.
* Add tests 
							
						 
						
							2020-11-19 19:52:06 +01:00  
				
					
						
							
							
								 
						
							
								96c1e71329 
								
							 
						 
						
							
							
								
								Add import/export feature for bookmarks ( #14956 )  
							
							... 
							
							
							
							* Add ability to export bookmarks
* Add support for importing bookmarks
* Add bookmark import tests
* Add bookmarks export test 
							
						 
						
							2020-11-19 17:48:13 +01:00  
				
					
						
							
							
								 
						
							
								8e2530ea16 
								
							 
						 
						
							
							
								
								Mark correctly as read reverse-order announcements ( #15070 )  
							
							... 
							
							
							
							This fixes a bug in #15065  where the "read" indicator was not getting correctly set. The ID of a dismissed announcement is now correct. 
							
						 
						
							2020-11-19 17:40:18 +01:00  
				
					
						
							
							
								 
						
							
								2f6831f318 
								
							 
						 
						
							
							
								
								Fix sending spurious Rejects when processing remote account deletion ( #15104 )  
							
							... 
							
							
							
							* Fix sending spurious Rejects when processing remote account deletion
* Make skip_side_effects imply skip_activitypub 
							
						 
						
							2020-11-19 17:39:47 +01:00  
				
					
						
							
							
								 
						
							
								df1653174b 
								
							 
						 
						
							
							
								
								Add cache buster feature for media files ( #15155 )  
							
							... 
							
							
							
							Nginx can be configured to bypass proxy cache when a special header
is in the request. If the response is cacheable, it will replace
the cache for that request. Proxy caching of media files is
desirable when using object storage as a way of minimizing bandwidth
costs, but has the drawback of leaving deleted media files for
a configured amount of cache time. A cache buster can make those
media files immediately unavailable. This especially makes sense
when suspending and unsuspending an account. 
							
						 
						
							2020-11-19 17:38:06 +01:00  
				
					
						
							
							
								 
						
							
								966593393e 
								
							 
						 
						
							
							
								
								Fix DMs not appearing into timelines ( #15182 )  
							
							... 
							
							
							
							Fixes  #15179  
						
							2020-11-19 00:23:46 +01:00  
				
					
						
							
							
								 
						
							
								d8d43a427a 
								
							 
						 
						
							
							
								
								Fix image uploads being random data when canvas read access is blocked ( #15180 )  
							
							... 
							
							
							
							Fixes  #15178 
PR #11499  introduced a way to deal with all-white canvas, but newer
Firefox versions set random data instead.
This PR detects whether canvas operations are reliable by comparing
the results on a hardcoded 2×2 pixels image, and memoizing the result.
This should be both more reliable and faster than the previous check. 
						
							2020-11-18 18:01:58 +01:00  
				
					
						
							
							
								 
						
							
								18ca4e0e9a 
								
							 
						 
						
							
							
								
								Fix pop-out player appearing on mobile screens in web UI ( #15157 )  
							
							... 
							
							
							
							Fix  #15092  
						
							2020-11-16 05:16:39 +01:00  
				
					
						
							
							
								 
						
							
								04a079e723 
								
							 
						 
						
							
							
								
								Add hotkeys for audio/video control ( #15158 )  
							
							... 
							
							
							
							Fix  #14515  
						
							2020-11-15 14:24:54 +01:00  
				
					
						
							
							
								 
						
							
								de5cc20dd8 
								
							 
						 
						
							
							
								
								Merge branch 'master' into glitch-soc/merge-upstream  
							
							... 
							
							
							
							Conflicts:
- `app/controllers/concerns/sign_in_token_authentication_concern.rb`:
  Conflict caused because of glitch-soc's theming system.
  Took upstream's new code and applied the theming system changes on top
  of it.
- `app/controllers/concerns/two_factor_authentication_concern.rb`:
  Conflict caused because of glitch-soc's theming system.
  Took upstream's new code and applied the theming system changes on top
  of it. 
							
						 
						
							2020-11-14 00:30:36 +01:00  
				
					
						
							
							
								 
						
							
								0a4d0e8320 
								
							 
						 
						
							
							
								
								Fix AccountDeletionWorker not accepting keyword arguments ( #15152 )  
							
							
							
						 
						
							2020-11-13 22:17:04 +01:00  
				
					
						
							
							
								 
						
							
								8ffae82fa6 
								
							 
						 
						
							
							
								
								Fix minor design issues with fav confirmation modal  
							
							
							
						 
						
							2020-11-13 01:14:52 +01:00  
				
					
						
							
							
								 
						
							
								339f78fb63 
								
							 
						 
						
							
							
								
								Fix media not being marked sensitive when outgoing CW is set  
							
							... 
							
							
							
							Fixes  #1461 
Fixes a regression from a recent merge 
						
							2020-11-13 01:05:55 +01:00  
				
					
						
							
							
								 
						
							
								265b26489a 
								
							 
						 
						
							
							
								
								Fix “Show boosts/replies in public timelines” only affecting streaming  
							
							... 
							
							
							
							Fixes  #1456  
						
							2020-11-12 23:44:53 +01:00  
				
					
						
							
							
								 
						
							
								10bd6f415d 
								
							 
						 
						
							
							
								
								Improve searching for private toots from URL  
							
							... 
							
							
							
							Most of the time, when sharing toots, people use the toot URL rather than
the toot URI, which makes sense since it is the user-facing URL.
In Mastodon's case, the URL and URI are different, and Mastodon does not
have an index on URL, which means searching a private toot by URL is done
with a slow query that will only succeed for very recent toots.
This change gets rid of the slow query, and attempts to guess the URI from
URL instead, as Mastodon's are predictable. 
							
						 
						
							2020-11-12 23:44:30 +01:00  
				
					
						
							
							
								 
						
							
								aa10200e58 
								
							 
						 
						
							
							
								
								Fix streaming API allowing connections to persist after access token invalidation ( #15111 )  
							
							... 
							
							
							
							Fix  #14816  
						
							2020-11-12 23:05:24 +01:00  
				
					
						
							
							
								 
						
							
								8532429af7 
								
							 
						 
						
							
							
								
								Fix 2FA/sign-in token sessions being valid after password change ( #14802 )  
							
							... 
							
							
							
							If someone tries logging in to an account and is prompted for a 2FA
code or sign-in token, even if the account's password or e-mail is
updated in the meantime, the session will show the prompt and allow
the login process to complete with a valid 2FA code or sign-in token 
							
						 
						
							2020-11-12 23:05:01 +01:00  
				
					
						
							
							
								 
						
							
								3f09d4ca03 
								
							 
						 
						
							
							
								
								Add missing locales to glitch flavor  
							
							
							
						 
						
							2020-11-12 22:27:44 +01:00  
				
					
						
							
							
								 
						
							
								412fe2ebb0 
								
							 
						 
						
							
							
								
								[Glitch] Add interrelationship icon  
							
							... 
							
							
							
							Port SCSS changes from 148ce97e21 
							
						 
						
							2020-11-12 22:24:24 +01:00  
				
					
						
							
							
								 
						
							
								0aeb833317 
								
							 
						 
						
							
							
								
								[Glitch] Add button to dismiss desktop notifications permissions banner  
							
							... 
							
							
							
							Port 4790a126be 
							
						 
						
							2020-11-12 22:23:06 +01:00  
				
					
						
							
							
								 
						
							
								c077cdaba7 
								
							 
						 
						
							
							
								
								Merge branch 'master' into glitch-soc/merge-upstream  
							
							... 
							
							
							
							Conflicts:
- `app/controllers/relationships_controller.rb`:
  Upstream changed a line too close to a glitch-soc only line related to
  glitch-soc's theming system.
  Applied upstream changes accordingly. 
							
						 
						
							2020-11-12 22:13:57 +01:00  
				
					
						
							
							
								 
						
							
								9870b175b4 
								
							 
						 
						
							
							
								
								Fix possible inconsistencies in tag search ( #14906 )  
							
							... 
							
							
							
							Do not downcase the queried tag before passing it to postgres when searching:
- tags are not downcased on creation
- `arel_table[:name].lower.matches(pattern)` generates an ILIKE anyway
- if Postgres and Rails happen to use different case-folding rules,
  downcasing before query but not before insertion may mean that some
  tags with some casings are not searchable 
							
						 
						
							2020-11-12 18:35:23 +01:00  
				
					
						
							
							
								 
						
							
								148ce97e21 
								
							 
						 
						
							
							
								
								Add interrelationship icon ( #15149 )  
							
							... 
							
							
							
							* Add interrelationship icon
* Fix arrow for rtl
* Fix to predefined color 
							
						 
						
							2020-11-12 17:43:12 +01:00  
				
					
						
							
							
								 
						
							
								2b1a6e734f 
								
							 
						 
						
							
							
								
								Add follow selected followers button ( #15148 )  
							
							... 
							
							
							
							* Add follow selected followers button
* Fix unused variable
* Fix i18n normalize 
							
						 
						
							2020-11-12 16:58:00 +01:00  
				
					
						
							
							
								 
						
							
								4790a126be 
								
							 
						 
						
							
							
								
								Add button to dismiss desktop notifications permissions banner ( #15141 )  
							
							
							
						 
						
							2020-11-11 05:36:29 +01:00  
				
					
						
							
							
								 
						
							
								f1858f08c2 
								
							 
						 
						
							
							
								
								Remove auto-redirect to direct messages in web UI ( #15142 )  
							
							
							
						 
						
							2020-11-11 05:36:22 +01:00  
				
					
						
							
							
								 
						
							
								5206ede9c9 
								
							 
						 
						
							
							
								
								Add missing locales ( #15138 )  
							
							
							
						 
						
							2020-11-10 14:44:17 +01:00  
				
					
						
							
							
								 
						
							
								880fc9baaf 
								
							 
						 
						
							
							
								
								New Crowdin updates ( #15110 )  
							
							... 
							
							
							
							* New translations doorkeeper.en.yml (Hungarian)
[ci skip]
* New translations doorkeeper.en.yml (Korean)
[ci skip]
* New translations doorkeeper.en.yml (Georgian)
[ci skip]
* New translations doorkeeper.en.yml (Japanese)
[ci skip]
* New translations doorkeeper.en.yml (Italian)
[ci skip]
* New translations doorkeeper.en.yml (Armenian)
[ci skip]
* New translations doorkeeper.en.yml (Hebrew)
[ci skip]
* New translations doorkeeper.en.yml (Dutch)
[ci skip]
* New translations doorkeeper.en.yml (Finnish)
[ci skip]
* New translations doorkeeper.en.yml (Basque)
[ci skip]
* New translations doorkeeper.en.yml (Greek)
[ci skip]
* New translations doorkeeper.en.yml (German)
[ci skip]
* New translations doorkeeper.en.yml (Danish)
[ci skip]
* New translations doorkeeper.en.yml (Czech)
[ci skip]
* New translations doorkeeper.en.yml (Catalan)
[ci skip]
* New translations doorkeeper.en.yml (Norwegian)
[ci skip]
* New translations doorkeeper.en.yml (Persian)
[ci skip]
* New translations doorkeeper.en.yml (Ukrainian)
[ci skip]
* New translations doorkeeper.en.yml (Indonesian)
[ci skip]
* New translations doorkeeper.en.yml (Portuguese, Brazilian)
[ci skip]
* New translations doorkeeper.en.yml (Galician)
[ci skip]
* New translations doorkeeper.en.yml (Vietnamese)
[ci skip]
* New translations doorkeeper.en.yml (Chinese Traditional)
[ci skip]
* New translations doorkeeper.en.yml (Turkish)
[ci skip]
* New translations doorkeeper.en.yml (Polish)
[ci skip]
* New translations doorkeeper.en.yml (Swedish)
[ci skip]
* New translations doorkeeper.en.yml (Serbian (Cyrillic))
[ci skip]
* New translations doorkeeper.en.yml (Albanian)
[ci skip]
* New translations doorkeeper.en.yml (Slovenian)
[ci skip]
* New translations doorkeeper.en.yml (Slovak)
[ci skip]
* New translations doorkeeper.en.yml (Russian)
[ci skip]
* New translations doorkeeper.en.yml (Portuguese)
[ci skip]
* New translations en.json (Kazakh)
[ci skip]
* New translations en.yml (Norwegian Nynorsk)
[ci skip]
* New translations en.yml (Vietnamese)
[ci skip]
* New translations simple_form.en.yml (Bulgarian)
[ci skip]
* New translations simple_form.en.yml (Czech)
[ci skip]
* New translations en.yml (Czech)
[ci skip]
* New translations en.json (Czech)
[ci skip]
* New translations simple_form.en.yml (Catalan)
[ci skip]
* New translations en.yml (Catalan)
[ci skip]
* New translations en.json (Catalan)
[ci skip]
* New translations en.yml (Bulgarian)
[ci skip]
* New translations en.yml (Danish)
[ci skip]
* New translations en.json (Bulgarian)
[ci skip]
* New translations simple_form.en.yml (Arabic)
[ci skip]
* New translations en.yml (Arabic)
[ci skip]
* New translations en.json (Arabic)
[ci skip]
* New translations simple_form.en.yml (Spanish)
[ci skip]
* New translations en.json (Spanish)
[ci skip]
* New translations en.json (Danish)
[ci skip]
* New translations simple_form.en.yml (Danish)
[ci skip]
* New translations en.yml (French)
[ci skip]
* New translations en.json (Hebrew)
[ci skip]
* New translations en.json (Armenian)
[ci skip]
* New translations simple_form.en.yml (Hungarian)
[ci skip]
* New translations en.yml (Hungarian)
[ci skip]
* New translations en.json (Hungarian)
[ci skip]
* New translations simple_form.en.yml (Hebrew)
[ci skip]
* New translations en.yml (Hebrew)
[ci skip]
* New translations simple_form.en.yml (Finnish)
[ci skip]
* New translations en.json (German)
[ci skip]
* New translations en.yml (Finnish)
[ci skip]
* New translations en.json (Finnish)
[ci skip]
* New translations simple_form.en.yml (Basque)
[ci skip]
* New translations en.yml (Basque)
[ci skip]
* New translations en.json (Basque)
[ci skip]
* New translations simple_form.en.yml (Greek)
[ci skip]
* New translations simple_form.en.yml (German)
[ci skip]
* New translations simple_form.en.yml (French)
[ci skip]
* New translations en.json (French)
[ci skip]
* New translations simple_form.en.yml (Armenian)
[ci skip]
* New translations en.json (Italian)
[ci skip]
* New translations en.yml (Russian)
[ci skip]
* New translations en.yml (Portuguese)
[ci skip]
* New translations en.yml (Korean)
[ci skip]
* New translations en.json (Korean)
[ci skip]
* New translations simple_form.en.yml (Japanese)
[ci skip]
* New translations en.yml (Japanese)
[ci skip]
* New translations en.yml (Greek)
[ci skip]
* New translations en.yml (Galician)
[ci skip]
* New translations en.json (Greek)
[ci skip]
* New translations en.yml (German)
[ci skip]
* New translations en.yml (Spanish)
[ci skip]
* New translations en.yml (Turkish)
[ci skip]
* New translations simple_form.en.yml (Turkish)
[ci skip]
* New translations en.json (Turkish)
[ci skip]
* New translations simple_form.en.yml (Vietnamese)
[ci skip]
* New translations en.yml (Albanian)
[ci skip]
* New translations en.json (Icelandic)
[ci skip]
* New translations simple_form.en.yml (Romanian)
[ci skip]
* New translations simple_form.en.yml (Croatian)
[ci skip]
* New translations en.yml (Romanian)
[ci skip]
* New translations en.json (Romanian)
[ci skip]
* New translations en.yml (Corsican)
[ci skip]
* New translations simple_form.en.yml (Breton)
[ci skip]
* New translations en.yml (Breton)
[ci skip]
* New translations doorkeeper.en.yml (Croatian)
[ci skip]
* New translations en.yml (Croatian)
[ci skip]
* New translations en.yml (Icelandic)
[ci skip]
* New translations en.json (Croatian)
[ci skip]
* New translations simple_form.en.yml (Thai)
[ci skip]
* New translations en.yml (Thai)
[ci skip]
* New translations simple_form.en.yml (Spanish, Argentina)
[ci skip]
* New translations en.yml (Spanish, Argentina)
[ci skip]
* New translations doorkeeper.en.yml (Icelandic)
[ci skip]
* New translations simple_form.en.yml (Icelandic)
[ci skip]
* New translations en.yml (Armenian)
[ci skip]
* New translations en.yml (Italian)
[ci skip]
* New translations en.json (Norwegian Nynorsk)
[ci skip]
* New translations simple_form.en.yml (Chinese Traditional)
[ci skip]
* New translations en.json (Portuguese, Brazilian)
[ci skip]
* New translations simple_form.en.yml (Galician)
[ci skip]
* New translations en.json (Galician)
[ci skip]
* New translations en.yml (Urdu (Pakistan))
[ci skip]
* New translations en.json (Urdu (Pakistan))
[ci skip]
* New translations en.yml (Chinese Traditional)
[ci skip]
* New translations simple_form.en.yml (Portuguese, Brazilian)
[ci skip]
* New translations en.json (Chinese Traditional)
[ci skip]
* New translations simple_form.en.yml (Chinese Simplified)
[ci skip]
* New translations en.yml (Chinese Simplified)
[ci skip]
* New translations en.json (Chinese Simplified)
[ci skip]
* New translations simple_form.en.yml (Ukrainian)
[ci skip]
* New translations en.yml (Ukrainian)
[ci skip]
* New translations en.json (Ukrainian)
[ci skip]
* New translations en.yml (Portuguese, Brazilian)
[ci skip]
* New translations en.json (Indonesian)
[ci skip]
* New translations en.yml (Swedish)
[ci skip]
* New translations en.json (Bengali)
[ci skip]
* New translations en.json (Thai)
[ci skip]
* New translations en.yml (Marathi)
[ci skip]
* New translations en.json (Marathi)
[ci skip]
* New translations simple_form.en.yml (Bengali)
[ci skip]
* New translations en.yml (Bengali)
[ci skip]
* New translations en.json (Spanish, Argentina)
[ci skip]
* New translations en.yml (Indonesian)
[ci skip]
* New translations simple_form.en.yml (Tamil)
[ci skip]
* New translations en.yml (Tamil)
[ci skip]
* New translations en.json (Tamil)
[ci skip]
* New translations simple_form.en.yml (Persian)
[ci skip]
* New translations en.yml (Persian)
[ci skip]
* New translations en.json (Persian)
[ci skip]
* New translations simple_form.en.yml (Indonesian)
[ci skip]
* New translations simple_form.en.yml (Swedish)
[ci skip]
* New translations en.json (Swedish)
[ci skip]
* New translations simple_form.en.yml (Italian)
[ci skip]
* New translations en.json (Macedonian)
[ci skip]
* New translations en.json (Norwegian)
[ci skip]
* New translations simple_form.en.yml (Dutch)
[ci skip]
* New translations en.yml (Dutch)
[ci skip]
* New translations en.json (Dutch)
[ci skip]
* New translations en.yml (Macedonian)
[ci skip]
* New translations simple_form.en.yml (Norwegian)
[ci skip]
* New translations en.yml (Lithuanian)
[ci skip]
* New translations en.json (Lithuanian)
[ci skip]
* New translations simple_form.en.yml (Korean)
[ci skip]
* New translations simple_form.en.yml (Georgian)
[ci skip]
* New translations en.yml (Georgian)
[ci skip]
* New translations en.json (Georgian)
[ci skip]
* New translations en.json (Japanese)
[ci skip]
* New translations en.yml (Norwegian)
[ci skip]
* New translations en.json (Polish)
[ci skip]
* New translations simple_form.en.yml (Serbian (Cyrillic))
[ci skip]
* New translations en.json (Slovenian)
[ci skip]
* New translations en.yml (Serbian (Cyrillic))
[ci skip]
* New translations en.json (Serbian (Cyrillic))
[ci skip]
* New translations simple_form.en.yml (Albanian)
[ci skip]
* New translations en.json (Albanian)
[ci skip]
* New translations simple_form.en.yml (Slovenian)
[ci skip]
* New translations en.yml (Slovenian)
[ci skip]
* New translations simple_form.en.yml (Slovak)
[ci skip]
* New translations en.yml (Polish)
[ci skip]
* New translations en.yml (Slovak)
[ci skip]
* New translations en.json (Slovak)
[ci skip]
* New translations simple_form.en.yml (Russian)
[ci skip]
* New translations en.json (Russian)
[ci skip]
* New translations simple_form.en.yml (Portuguese)
[ci skip]
* New translations en.json (Portuguese)
[ci skip]
* New translations simple_form.en.yml (Polish)
[ci skip]
* New translations en.json (Turkish)
[ci skip]
* New translations en.yml (Turkish)
[ci skip]
* New translations en.json (Korean)
[ci skip]
* New translations en.json (Corsican)
[ci skip]
* New translations devise.en.yml (Turkish)
[ci skip]
* New translations en.json (Corsican)
[ci skip]
* New translations en.yml (Kabyle)
[ci skip]
* New translations doorkeeper.en.yml (Spanish)
[ci skip]
* New translations en.json (Spanish, Mexico)
[ci skip]
* New translations doorkeeper.en.yml (Spanish, Mexico)
[ci skip]
* New translations simple_form.en.yml (Spanish, Mexico)
[ci skip]
* New translations en.yml (Spanish, Mexico)
[ci skip]
* New translations simple_form.en.yml (Spanish)
[ci skip]
* New translations en.json (Spanish)
[ci skip]
* New translations en.json (Korean)
[ci skip]
* New translations en.yml (Japanese)
[ci skip]
* New translations en.yml (Spanish)
[ci skip]
* New translations en.json (Turkish)
[ci skip]
* New translations en.yml (Japanese)
[ci skip]
* New translations simple_form.en.yml (Japanese)
[ci skip]
* New translations en.yml (Kabyle)
[ci skip]
* New translations devise.en.yml (Japanese)
[ci skip]
* New translations en.json (Standard Moroccan Tamazight)
[ci skip]
* New translations en.json (Standard Moroccan Tamazight)
[ci skip]
* New translations en.yml (Standard Moroccan Tamazight)
[ci skip]
* New translations en.yml (Standard Moroccan Tamazight)
[ci skip]
* New translations simple_form.en.yml (Icelandic)
[ci skip]
* New translations simple_form.en.yml (Standard Moroccan Tamazight)
[ci skip]
* New translations doorkeeper.en.yml (Standard Moroccan Tamazight)
[ci skip]
* New translations simple_form.en.yml (Standard Moroccan Tamazight)
[ci skip]
* New translations en.yml (Icelandic)
[ci skip]
* New translations en.yml (Standard Moroccan Tamazight)
[ci skip]
* New translations simple_form.en.yml (Standard Moroccan Tamazight)
[ci skip]
* New translations devise.en.yml (Standard Moroccan Tamazight)
[ci skip]
* New translations activerecord.en.yml (Icelandic)
[ci skip]
* New translations devise.en.yml (Icelandic)
[ci skip]
* New translations en.yml (Russian)
[ci skip]
* New translations en.json (Russian)
[ci skip]
* New translations simple_form.en.yml (Russian)
[ci skip]
* New translations en.json (Chinese Simplified)
[ci skip]
* New translations devise.en.yml (Chinese Simplified)
[ci skip]
* New translations devise.en.yml (Chinese Simplified)
[ci skip]
* New translations en.yml (Vietnamese)
[ci skip]
* New translations en.yml (Vietnamese)
[ci skip]
* New translations en.yml (Vietnamese)
[ci skip]
* New translations simple_form.en.yml (Vietnamese)
[ci skip]
* New translations en.json (Vietnamese)
[ci skip]
* New translations simple_form.en.yml (Vietnamese)
[ci skip]
* New translations doorkeeper.en.yml (Turkish)
[ci skip]
* New translations simple_form.en.yml (Turkish)
[ci skip]
* New translations doorkeeper.en.yml (Turkish)
[ci skip]
* New translations simple_form.en.yml (Turkish)
[ci skip]
* New translations en.json (Turkish)
[ci skip]
* New translations simple_form.en.yml (Turkish)
[ci skip]
* New translations activerecord.en.yml (Turkish)
[ci skip]
* New translations en.json (Turkish)
[ci skip]
* New translations en.yml (Vietnamese)
[ci skip]
* New translations simple_form.en.yml (Vietnamese)
[ci skip]
* New translations en.yml (Vietnamese)
[ci skip]
* Fix invalid syntax
* New translations en.yml (Vietnamese)
[ci skip]
* New translations simple_form.en.yml (Vietnamese)
[ci skip]
* bundle exec i18n-tasks normalize
* New translations en.yml (Vietnamese)
[ci skip]
* New translations simple_form.en.yml (Vietnamese)
[ci skip]
* New translations en.yml (Icelandic)
[ci skip]
* bundle exec i18n-tasks normalize
* New translations simple_form.en.yml (Vietnamese)
[ci skip]
* bundle exec i18n-tasks normalize [ci skip]
Co-authored-by: Yamagishi Kazutoshi <ykzts@desire.sh> 
							
						 
						
							2020-11-10 16:53:54 +09:00  
				
					
						
							
							
								 
						
							
								337dc6e0ad 
								
							 
						 
						
							
							
								
								Fix updating account counters when account_stat is not yet created ( #15108 )  
							
							
							
						 
						
							2020-11-09 16:00:23 +01:00  
				
					
						
							
							
								 
						
							
								ecd83f495c 
								
							 
						 
						
							
							
								
								Merge branch 'master' into glitch-soc/merge-upstream  
							
							
							
						 
						
							2020-11-09 10:53:53 +01:00  
				
					
						
							
							
								 
						
							
								2b63c62c57 
								
							 
						 
						
							
							
								
								Remove unnecessary messages ( #15109 )  
							
							... 
							
							
							
							* Remove unnecessary messages
* ran `i18n-tasks normalize` 
							
						 
						
							2020-11-09 01:43:16 +01:00  
				
					
						
							
							
								 
						
							
								b0893291ef 
								
							 
						 
						
							
							
								
								Fix Move handler not being triggered when failing to fetch target ( #15107 )  
							
							... 
							
							
							
							When failing to fetch the target account, the ProcessingWorker fails
as expected, but since it hasn't cleared the `move_in_progress` flag,
the next attempt at processing skips the `Move` activity altogether.
This commit changes it to clear the flag when encountering any
unexpected error on fetching the target account. This is likely to
occur because, of, e.g., a timeout, when many instances query the
same actor at the same time. 
							
						 
						
							2020-11-09 01:41:52 +01:00  
				
					
						
							
							
								 
						
							
								cc98f967b1 
								
							 
						 
						
							
							
								
								New Crowdin updates ( #14388 )  
							
							... 
							
							
							
							* New translations en.yml (Indonesian)
[ci skip]
* New translations en.yml (Indonesian)
[ci skip]
* New translations en.json (Indonesian)
[ci skip]
* New translations en.json (Catalan)
[ci skip]
* New translations en.json (Indonesian)
[ci skip]
* New translations en.json (Indonesian)
[ci skip]
* New translations simple_form.en.yml (Vietnamese)
[ci skip]
* New translations simple_form.en.yml (Vietnamese)
[ci skip]
* New translations en.json (Sardinian)
[ci skip]
* New translations en.json (Esperanto)
[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 en.json (Japanese)
[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 devise.en.yml (Norwegian)
[ci skip]
* New translations en.json (French)
[ci skip]
* New translations en.json (Esperanto)
[ci skip]
* New translations simple_form.en.yml (Arabic)
[ci skip]
* New translations en.yml (Indonesian)
[ci skip]
* New translations en.json (Vietnamese)
[ci skip]
* New translations en.yml (Vietnamese)
[ci skip]
* New translations en.yml (Vietnamese)
[ci skip]
* New translations en.json (Vietnamese)
[ci skip]
* New translations en.json (Chinese Simplified)
[ci skip]
* New translations en.json (Chinese Simplified)
[ci skip]
* New translations en.json (Chinese Simplified)
[ci skip]
* New translations en.json (Chinese Simplified)
[ci skip]
* New translations en.json (Chinese Simplified)
[ci skip]
* New translations devise.en.yml (Chinese Simplified)
[ci skip]
* New translations en.json (Danish)
[ci skip]
* New translations en.yml (Danish)
[ci skip]
* New translations en.json (Vietnamese)
[ci skip]
* New translations en.json (Vietnamese)
[ci skip]
* New translations en.yml (Vietnamese)
[ci skip]
* New translations en.yml (Vietnamese)
[ci skip]
* New translations en.json (Vietnamese)
[ci skip]
* New translations en.yml (Vietnamese)
[ci skip]
* New translations en.json (Vietnamese)
[ci skip]
* New translations en.json (Icelandic)
[ci skip]
* New translations en.yml (Icelandic)
[ci skip]
* New translations en.json (Occitan)
[ci skip]
* New translations en.yml (Japanese)
[ci skip]
* New translations en.json (Spanish, Argentina)
[ci skip]
* New translations en.json (Japanese)
[ci skip]
* New translations en.json (Japanese)
[ci skip]
* New translations en.yml (Japanese)
[ci skip]
* New translations en.yml (Japanese)
[ci skip]
* New translations en.yml (Japanese)
[ci skip]
* New translations simple_form.en.yml (Norwegian Nynorsk)
[ci skip]
* New translations en.json (Norwegian Nynorsk)
[ci skip]
* New translations simple_form.en.yml (Spanish, Mexico)
[ci skip]
* New translations en.yml (Spanish, Mexico)
[ci skip]
* New translations en.json (Spanish, Mexico)
[ci skip]
* New translations doorkeeper.en.yml (Spanish)
[ci skip]
* New translations en.yml (Norwegian Nynorsk)
[ci skip]
* New translations simple_form.en.yml (Spanish)
[ci skip]
* New translations en.json (Spanish)
[ci skip]
* New translations en.yml (Spanish)
[ci skip]
* New translations doorkeeper.en.yml (Spanish, Mexico)
[ci skip]
* New translations en.json (Turkish)
[ci skip]
* New translations en.json (French)
[ci skip]
* New translations en.json (Catalan)
[ci skip]
* New translations en.json (Spanish)
[ci skip]
* New translations en.json (Icelandic)
[ci skip]
* New translations en.json (Spanish, Argentina)
[ci skip]
* New translations en.json (Vietnamese)
[ci skip]
* New translations en.json (Chinese Simplified)
[ci skip]
* New translations en.json (Chinese Simplified)
[ci skip]
* New translations en.json (Galician)
[ci skip]
* New translations en.json (Galician)
[ci skip]
* New translations en.json (Albanian)
[ci skip]
* New translations en.json (Indonesian)
[ci skip]
* New translations en.json (Italian)
[ci skip]
* New translations en.json (Chinese Simplified)
[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 (Greek)
[ci skip]
* New translations en.json (Czech)
[ci skip]
* New translations en.json (German)
[ci skip]
* New translations en.json (Hungarian)
[ci skip]
* New translations en.json (Portuguese)
[ci skip]
* New translations en.json (Chinese Simplified)
[ci skip]
* New translations en.json (Persian)
[ci skip]
* New translations en.json (Norwegian Nynorsk)
[ci skip]
* New translations en.json (Corsican)
[ci skip]
* New translations en.json (Kabyle)
[ci skip]
* New translations en.json (Arabic)
[ci skip]
* New translations en.json (Slovenian)
[ci skip]
* New translations en.json (Ukrainian)
[ci skip]
* New translations en.json (Portuguese, Brazilian)
[ci skip]
* New translations en.json (Breton)
[ci skip]
* New translations en.json (Sardinian)
[ci skip]
* New translations en.json (Hungarian)
[ci skip]
* New translations en.json (Corsican)
[ci skip]
* New translations en.json (Corsican)
[ci skip]
* New translations en.json (Corsican)
[ci skip]
* New translations en.json (Portuguese, Brazilian)
[ci skip]
* New translations en.json (Kabyle)
[ci skip]
* New translations en.json (Dutch)
[ci skip]
* New translations en.json (Dutch)
[ci skip]
* New translations en.json (Sardinian)
[ci skip]
* New translations en.json (Portuguese)
[ci skip]
* New translations doorkeeper.en.yml (Spanish)
[ci skip]
* New translations en.yml (Spanish, Mexico)
[ci skip]
* New translations simple_form.en.yml (Spanish, Mexico)
[ci skip]
* New translations en.json (Spanish, Mexico)
[ci skip]
* New translations doorkeeper.en.yml (Spanish, Mexico)
[ci skip]
* New translations en.yml (French)
[ci skip]
* New translations doorkeeper.en.yml (Spanish)
[ci skip]
* New translations simple_form.en.yml (Spanish)
[ci skip]
* New translations en.json (Spanish)
[ci skip]
* New translations en.yml (Spanish)
[ci skip]
* New translations simple_form.en.yml (French)
[ci skip]
* New translations en.yml (French)
[ci skip]
* New translations en.yml (Catalan)
[ci skip]
* New translations en.yml (Spanish, Mexico)
[ci skip]
* New translations simple_form.en.yml (Spanish, Mexico)
[ci skip]
* New translations en.json (Spanish, Mexico)
[ci skip]
* New translations doorkeeper.en.yml (Spanish, Mexico)
[ci skip]
* New translations en.yml (French)
[ci skip]
* New translations en.yml (Catalan)
[ci skip]
* New translations simple_form.en.yml (Catalan)
[ci skip]
* New translations en.yml (Spanish)
[ci skip]
* New translations en.json (Greek)
[ci skip]
* New translations en.yml (Greek)
[ci skip]
* New translations simple_form.en.yml (Spanish)
[ci skip]
* New translations en.yml (Catalan)
[ci skip]
* New translations en.yml (Portuguese)
[ci skip]
* New translations en.yml (Portuguese)
[ci skip]
* New translations simple_form.en.yml (Portuguese)
[ci skip]
* New translations en.yml (Turkish)
[ci skip]
* New translations simple_form.en.yml (Turkish)
[ci skip]
* New translations en.yml (Turkish)
[ci skip]
* New translations en.yml (Korean)
[ci skip]
* New translations en.json (German)
[ci skip]
* New translations en.yml (Italian)
[ci skip]
* New translations en.yml (German)
[ci skip]
* New translations en.json (German)
[ci skip]
* New translations simple_form.en.yml (German)
[ci skip]
* New translations en.yml (Italian)
[ci skip]
* New translations simple_form.en.yml (Italian)
[ci skip]
* New translations en.yml (Korean)
[ci skip]
* New translations simple_form.en.yml (Korean)
[ci skip]
* New translations en.yml (Vietnamese)
[ci skip]
* New translations en.yml (Chinese Simplified)
[ci skip]
* New translations en.yml (Vietnamese)
[ci skip]
* New translations en.yml (Chinese Simplified)
[ci skip]
* New translations simple_form.en.yml (Chinese Simplified)
[ci skip]
* New translations en.yml (Vietnamese)
[ci skip]
* New translations simple_form.en.yml (Vietnamese)
[ci skip]
* New translations en.yml (Japanese)
[ci skip]
* New translations simple_form.en.yml (Japanese)
[ci skip]
* New translations en.yml (Japanese)
[ci skip]
* New translations en.yml (Galician)
[ci skip]
* New translations simple_form.en.yml (Galician)
[ci skip]
* New translations en.yml (Persian)
[ci skip]
* New translations en.yml (Persian)
[ci skip]
* New translations simple_form.en.yml (Persian)
[ci skip]
* New translations en.yml (Esperanto)
[ci skip]
* New translations devise.en.yml (German)
[ci skip]
* New translations simple_form.en.yml (Hungarian)
[ci skip]
* New translations en.yml (Spanish, Argentina)
[ci skip]
* New translations en.yml (Hungarian)
[ci skip]
* New translations simple_form.en.yml (Hungarian)
[ci skip]
* New translations en.yml (Spanish, Argentina)
[ci skip]
* New translations simple_form.en.yml (Spanish, Argentina)
[ci skip]
* New translations en.yml (Hungarian)
[ci skip]
* New translations en.yml (Albanian)
[ci skip]
* New translations simple_form.en.yml (Albanian)
[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 (Corsican)
[ci skip]
* New translations en.yml (Corsican)
[ci skip]
* New translations en.yml (Corsican)
[ci skip]
* New translations simple_form.en.yml (Corsican)
[ci skip]
* New translations en.yml (Corsican)
[ci skip]
* New translations en.json (Corsican)
[ci skip]
* New translations doorkeeper.en.yml (Corsican)
[ci skip]
* New translations devise.en.yml (Corsican)
[ci skip]
* New translations en.yml (Turkish)
[ci skip]
* New translations en.yml (Danish)
[ci skip]
* New translations en.yml (Vietnamese)
[ci skip]
* New translations simple_form.en.yml (Vietnamese)
[ci skip]
* New translations en.yml (Vietnamese)
[ci skip]
* New translations en.yml (Vietnamese)
[ci skip]
* New translations en.json (Chinese Traditional)
[ci skip]
* New translations en.json (German)
[ci skip]
* New translations en.yml (Indonesian)
[ci skip]
* New translations simple_form.en.yml (Indonesian)
[ci skip]
* New translations en.yml (Indonesian)
[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.json (Occitan)
[ci skip]
* New translations en.json (Occitan)
[ci skip]
* New translations devise.en.yml (Occitan)
[ci skip]
* New translations en.yml (Occitan)
[ci skip]
* New translations simple_form.en.yml (Occitan)
[ci skip]
* New translations en.json (Occitan)
[ci skip]
* New translations simple_form.en.yml (Occitan)
[ci skip]
* New translations simple_form.en.yml (Occitan)
[ci skip]
* New translations en.yml (Spanish)
[ci skip]
* New translations en.json (Standard Moroccan Tamazight)
[ci skip]
* New translations en.yml (Standard Moroccan Tamazight)
[ci skip]
* New translations simple_form.en.yml (Standard Moroccan Tamazight)
[ci skip]
* New translations activerecord.en.yml (Standard Moroccan Tamazight)
[ci skip]
* New translations devise.en.yml (Standard Moroccan Tamazight)
[ci skip]
* New translations doorkeeper.en.yml (Standard Moroccan Tamazight)
[ci skip]
* New translations en.json (Turkish)
[ci skip]
* New translations simple_form.en.yml (Turkish)
[ci skip]
* New translations en.json (Turkish)
[ci skip]
* New translations en.json (Turkish)
[ci skip]
* New translations en.json (Turkish)
[ci skip]
* New translations en.yml (Turkish)
[ci skip]
* New translations en.json (Turkish)
[ci skip]
* New translations en.yml (Turkish)
[ci skip]
* New translations en.json (Turkish)
[ci skip]
* New translations en.yml (Turkish)
[ci skip]
* New translations en.json (Turkish)
[ci skip]
* New translations en.json (Turkish)
[ci skip]
* New translations en.json (Turkish)
[ci skip]
* New translations doorkeeper.en.yml (Turkish)
[ci skip]
* New translations doorkeeper.en.yml (Turkish)
[ci skip]
* New translations doorkeeper.en.yml (Turkish)
[ci skip]
* New translations devise.en.yml (Turkish)
[ci skip]
* New translations simple_form.en.yml (Turkish)
[ci skip]
* New translations devise.en.yml (Turkish)
[ci skip]
* New translations activerecord.en.yml (Turkish)
[ci skip]
* New translations simple_form.en.yml (Turkish)
[ci skip]
* New translations simple_form.en.yml (Turkish)
[ci skip]
* New translations en.yml (Turkish)
[ci skip]
* New translations en.yml (Turkish)
[ci skip]
* New translations en.yml (Turkish)
[ci skip]
* New translations en.yml (Turkish)
[ci skip]
* New translations en.yml (Turkish)
[ci skip]
* New translations en.yml (Turkish)
[ci skip]
* New translations en.yml (Turkish)
[ci skip]
* New translations en.yml (Turkish)
[ci skip]
* ran `i18n-tasks normalize`
* ran `yarn manage:translations`
* ran `i18n-tasks normalize`
* New translations en.json (Turkish)
[ci skip]
* New translations en.yml (Turkish)
[ci skip]
Co-authored-by: Yamagishi Kazutoshi <ykzts@desire.sh> 
							
						 
						
							2020-11-09 00:56:52 +01:00  
				
					
						
							
							
								 
						
							
								1e64666662 
								
							 
						 
						
							
							
								
								Fix crash in SuspendAccountWorker ( #15106 )  
							
							... 
							
							
							
							* Fix crash in SuspendAccountWorker
`follows` is an array thanks to `to_a`
* Fix code style issue
Co-authored-by: Eugen Rochko <eugen@zeonfederated.com> 
							
						 
						
							2020-11-08 18:29:48 +01:00  
				
					
						
							
							
								 
						
							
								0437d70628 
								
							 
						 
						
							
							
								
								Merge branch 'master' into glitch-soc/merge-upstream  
							
							... 
							
							
							
							Conflicts:
- `app/controllers/follower_accounts_controller.rb`:
  Conflict due to upstream changing suspension logic while
  glitch-soc has an extra option to hide followers count.
  Ported upstream changes. 
							
						 
						
							2020-11-08 14:20:35 +01:00  
				
					
						
							
							
								 
						
							
								3134691948 
								
							 
						 
						
							
							
								
								Add support for reversible suspensions through ActivityPub ( #14989 )  
							
							
							
						 
						
							2020-11-08 00:28:39 +01:00  
				
					
						
							
							
								 
						
							
								e4d62042bd 
								
							 
						 
						
							
							
								
								[Glitch] Add limitation of image's max zoom rate (max to the original size of image)  
							
							... 
							
							
							
							Port f720af6b72 
							
						 
						
							2020-11-07 18:33:16 +01:00  
				
					
						
							
							
								 
						
							
								91c2f14fd2 
								
							 
						 
						
							
							
								
								[Glitch] Bump detect-passive-events from 1.0.5 to 2.0.1  
							
							... 
							
							
							
							Port e16b0fb15a 
							
						 
						
							2020-11-07 18:32:09 +01:00  
				
					
						
							
							
								 
						
							
								412218af2e 
								
							 
						 
						
							
							
								
								Merge branch 'master' into glitch-soc/merge-upstream  
							
							
							
						 
						
							2020-11-07 18:23:02 +01:00  
				
					
						
							
							
								 
						
							
								ee8cf246cf 
								
							 
						 
						
							
							
								
								Fix crashes in SuspendAccountService/UnsuspendAccountService ( #15100 )  
							
							... 
							
							
							
							* Fix crashes in SuspendAccountService/UnsuspendAccountService
* Catch filesystem errors 
							
						 
						
							2020-11-07 13:16:54 +01:00  
				
					
						
							
							
								 
						
							
								f84239ecab 
								
							 
						 
						
							
							
								
								Fix suspension/unsuspension not working because of FeedManager change ( #15099 )  
							
							
							
						 
						
							2020-11-07 13:16:00 +01:00  
				
					
						
							
							
								 
						
							
								9b1f2a4b61 
								
							 
						 
						
							
							
								
								Add subresource integrity for JS and CSS assets ( #15096 )  
							
							... 
							
							
							
							Fix  #2744  
						
							2020-11-06 11:56:31 +01:00  
				
					
						
							
							
								 
						
							
								68d4b2b83e 
								
							 
						 
						
							
							
								
								Display “Show newer” and “Show older” instead of “Show more” in public pages ( #15052 )  
							
							
							
						 
						
							2020-11-04 21:15:45 +01:00  
				
					
						
							
							
								 
						
							
								b29defb851 
								
							 
						 
						
							
							
								
								Change order of announcements in admin page to sort them newest-first ( #15091 )  
							
							... 
							
							
							
							* Change order of announcements in admin page to sort show newly-created first
Fixes  #15090 
* Use reverse-chronological rather than creation date only 
							
						 
						
							2020-11-04 21:15:22 +01:00  
				
					
						
							
							
								 
						
							
								d6fe0c94ca 
								
							 
						 
						
							
							
								
								Add account sensitized ( #14361 )  
							
							... 
							
							
							
							* Add account sensitized
* Fix i18n normalize
* Fix description and spec
* Fix spec
* Fix wording 
							
						 
						
							2020-11-04 20:45:01 +01:00  
				
					
						
							
							
								 
						
							
								f720af6b72 
								
							 
						 
						
							
							
								
								Add limitation of image's max zoom rate (max to the original size of image) ( #15094 )  
							
							... 
							
							
							
							* limit image max scale rate to fit the actual image size
* replace with MIN_SCALE
* fix behavior on touch screen 
							
						 
						
							2020-11-04 20:43:31 +01:00  
				
					
						
							
							
								 
						
							
								5a9fc749c3 
								
							 
						 
						
							
							
								
								Fix unsightly re-layout delay for media previews  
							
							
							
						 
						
							2020-11-04 18:53:52 +01:00  
				
					
						
							
							
								 
						
							
								a48dbc78f8 
								
							 
						 
						
							
							
								
								Fix hiding video breaking playback  
							
							... 
							
							
							
							Also make the video player code closer to upstream 
							
						 
						
							2020-11-04 18:53:39 +01:00  
				
					
						
							
							
								 
						
							
								e16b0fb15a 
								
							 
						 
						
							
							
								
								Bump detect-passive-events from 1.0.5 to 2.0.1 ( #15003 )  
							
							... 
							
							
							
							* Bump detect-passive-events from 1.0.5 to 2.0.1
Bumps [detect-passive-events](https://github.com/rafgraph/detect-passive-events ) from 1.0.5 to 2.0.1.
- [Release notes](https://github.com/rafgraph/detect-passive-events/releases )
- [Commits](https://github.com/rafgraph/detect-passive-events/compare/v1.0.5...v2.0.1 )
Signed-off-by: dependabot[bot] <support@github.com>
* Migrate to detect-passive-events v2
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: Yamagishi Kazutoshi <ykzts@desire.sh> 
							
						 
						
							2020-11-05 02:21:05 +09:00  
				
					
						
							
							
								 
						
							
								dc86d814d9 
								
							 
						 
						
							
							
								
								[Glitch] add mouse scroll lock in image expand view  
							
							... 
							
							
							
							Port f645dad661 
							
						 
						
							2020-11-04 12:24:40 +01:00  
				
					
						
							
							
								 
						
							
								40af1cf65b 
								
							 
						 
						
							
							
								
								[Glitch] Add expand/compress image button on image view box  
							
							... 
							
							
							
							Port 6a2db10f76 
							
						 
						
							2020-11-04 12:24:40 +01:00  
				
					
						
							
							
								 
						
							
								f5df3d1ae2 
								
							 
						 
						
							
							
								
								[Glitch] Fix width of content text fluctuating over time  
							
							... 
							
							
							
							Port 2ae751f19d 
							
						 
						
							2020-11-04 12:24:40 +01:00  
				
					
						
							
							
								 
						
							
								078744f210 
								
							 
						 
						
							
							
								
								[Glitch] Make visibility icon clickable as part of the time of a toot  
							
							... 
							
							
							
							Port 1d07f51039 
							
						 
						
							2020-11-04 12:24:40 +01:00  
				
					
						
							
							
								 
						
							
								578e757d09 
								
							 
						 
						
							
							
								
								[Glitch] Make click area of video/audio player buttons bigger in WebUI  
							
							... 
							
							
							
							Port a5afbb62d2 
							
						 
						
							2020-11-03 17:42:40 +01:00  
				
					
						
							
							
								 
						
							
								adfaf9551c 
								
							 
						 
						
							
							
								
								[Glitch] Fix some account media gallery items having empty labels  
							
							... 
							
							
							
							Port 9d023ed4f6 
							
						 
						
							2020-11-03 17:38:50 +01:00  
				
					
						
							
							
								 
						
							
								37dfb9dddc 
								
							 
						 
						
							
							
								
								[Glitch] Fix wrong seek bar width on media player  
							
							... 
							
							
							
							Port 8d7fbe7dd9 
							
						 
						
							2020-11-03 17:37:53 +01:00  
				
					
						
							
							
								 
						
							
								3b96141633 
								
							 
						 
						
							
							
								
								[Glitch] Make “Mark media as sensitive” properly translatable  
							
							... 
							
							
							
							Port c5704e75ae 
							
						 
						
							2020-11-03 17:36:54 +01:00  
				
					
						
							
							
								 
						
							
								cd675fbe18 
								
							 
						 
						
							
							
								
								Merge branch 'master' into glitch-soc/merge-upstream  
							
							
							
						 
						
							2020-11-03 17:28:54 +01:00  
				
					
						
							
							
								 
						
							
								f645dad661 
								
							 
						 
						
							
							
								
								add mouse scroll lock in image expand view ( #15088 )  
							
							... 
							
							
							
							* add mouse scroll lock in image expand view
* enhancement 
							
						 
						
							2020-11-03 06:06:45 +01:00  
				
					
						
							
							
								 
						
							
								6a2db10f76 
								
							 
						 
						
							
							
								
								Add expand/compress image button on image view box ( #15068 )  
							
							... 
							
							
							
							* add zoom image button
* enhance zoom algorithm & add translation
* code structure
* code structure
* code structure
* enhance grab performance
* rm useless state
* fix behavior on Firefox & scroll lock & horizontal scroll with mousewheel
* remove scroll lock on MouseWheelEvent
* code structure
* enhance algorithm and code structure
* rm Gemfile.lock from tree
* codeclimate
* fix a stupid mistake 
							
						 
						
							2020-11-02 21:16:38 +01:00  
				
					
						
							
							
								 
						
							
								fa929d8b81 
								
							 
						 
						
							
							
								
								Tweak signature verification ( #15069 )  
							
							... 
							
							
							
							* Add more specific error message when request body digest is invalid
This may help other implementors debug their implementation.
* Relax Host parameter requirement to GET requests
The only POST requests processed by Mastodon need objects/actors (including
their host) to be explicitly mentioned in the request's body, so replaying
a legitimate request to another host should not be a security issue.
* Support Digest headers using multiple algorithms or lowercase alogirthm names 
							
						 
						
							2020-11-01 23:38:31 +01:00  
				
					
						
							
							
								 
						
							
								9d023ed4f6 
								
							 
						 
						
							
							
								
								Fix some account media gallery items having empty labels ( #15073 )  
							
							... 
							
							
							
							Remove the labels entirely for images instead of putting an empty label. 
							
						 
						
							2020-11-01 18:31:39 +01:00  
				
					
						
							
							
								 
						
							
								b8e790c3c2 
								
							 
						 
						
							
							
								
								Fix crash when viewing a profile with a filtered out pinned toot  
							
							
							
						 
						
							2020-11-01 16:53:03 +01:00  
				
					
						
							
							
								 
						
							
								c49805efb1 
								
							 
						 
						
							
							
								
								Fix poll ending notifications being created for each vote ( #15071 )  
							
							... 
							
							
							
							On a poll ending, notifications were created for each vote instead
of for each voter. 
							
						 
						
							2020-11-01 06:34:43 +01:00  
				
					
						
							
							
								 
						
							
								f1f0400adc 
								
							 
						 
						
							
							
								
								Show announcements in reverse chronological order ( #15065 )  
							
							
							
						 
						
							2020-10-30 13:09:51 +01:00  
				
					
						
							
							
								 
						
							
								8d7fbe7dd9 
								
							 
						 
						
							
							
								
								Fix wrong seek bar width on media player ( #15060 )  
							
							
							
						 
						
							2020-10-30 13:09:20 +01:00  
				
					
						
							
							
								 
						
							
								5a41704f89 
								
							 
						 
						
							
							
								
								Fix IP blocks in admin panel  
							
							... 
							
							
							
							It was broken due to discrepancies between upstream and glitch-soc's
theming system. 
							
						 
						
							2020-10-28 23:55:41 +01:00  
				
					
						
							
							
								 
						
							
								2ae751f19d 
								
							 
						 
						
							
							
								
								Fix width of content text fluctuating over time ( #15055 )  
							
							
							
						 
						
							2020-10-27 13:34:02 +01:00  
				
					
						
							
							
								 
						
							
								a81bb14abe 
								
							 
						 
						
							
							
								
								Add option to hide notification markers  
							
							
							
						 
						
							2020-10-27 11:20:11 +01:00  
				
					
						
							
							
								 
						
							
								c5704e75ae 
								
							 
						 
						
							
							
								
								Make “Mark media as sensitive” properly translatable ( #15051 )  
							
							
							
						 
						
							2020-10-27 03:05:50 +01:00  
				
					
						
							
							
								 
						
							
								1d07f51039 
								
							 
						 
						
							
							
								
								Make visibility icon clickable as part of the time of a toot ( #15053 )  
							
							... 
							
							
							
							- Makes permalink to a toot more easily clickable
- Fix clicking between icon and time in fact clicking the display name
- Fix clicking slightly under time in fact clicking the display name 
							
						 
						
							2020-10-27 03:00:47 +01:00  
				
					
						
							
							
								 
						
							
								0a8ab822e2 
								
							 
						 
						
							
							
								
								Sort filters by “keyword or phrase” in Settings ( #15050 )  
							
							
							
						 
						
							2020-10-27 03:00:06 +01:00  
				
					
						
							
							
								 
						
							
								a5afbb62d2 
								
							 
						 
						
							
							
								
								Make click area of video/audio player buttons bigger in WebUI ( #15049 )  
							
							
							
						 
						
							2020-10-27 02:58:47 +01:00  
				
					
						
							
							
								 
						
							
								49ee69f75f 
								
							 
						 
						
							
							
								
								Add local setting for pop-in player position  
							
							
							
						 
						
							2020-10-26 20:51:28 +01:00  
				
					
						
							
							
								 
						
							
								ea5298ab9b 
								
							 
						 
						
							
							
								
								Add setting to disable the pop-in player  
							
							
							
						 
						
							2020-10-26 20:31:54 +01:00  
				
					
						
							
							
								 
						
							
								5ee2b860f9 
								
							 
						 
						
							
							
								
								Respect glitch-soc's reply counter setting in the pop-in player  
							
							
							
						 
						
							2020-10-26 20:31:54 +01:00  
				
					
						
							
							
								 
						
							
								47edac871c 
								
							 
						 
						
							
							
								
								[Glitch] Fix regressions in icon buttons in web UI  
							
							... 
							
							
							
							Port a549415868 
							
						 
						
							2020-10-26 19:51:09 +01:00  
				
					
						
							
							
								 
						
							
								8f950e540b 
								
							 
						 
						
							
							
								
								[Glitch] Add pop-out player for audio/video in web UI  
							
							... 
							
							
							
							port d88a79b456 
							
						 
						
							2020-10-26 19:51:09 +01:00  
				
					
						
							
							
								 
						
							
								ddbb9f0ec4 
								
							 
						 
						
							
							
								
								[Glitch] Fix follow request notifications  
							
							... 
							
							
							
							Port 3678b10823 
							
						 
						
							2020-10-26 15:50:48 +01:00  
				
					
						
							
							
								 
						
							
								9c34090db8 
								
							 
						 
						
							
							
								
								Merge branch 'master' into glitch-soc/merge-upstream  
							
							... 
							
							
							
							Conflicts:
- `app/services/process_mentions_service.rb`:
  glitch-soc local-only handling, ported upstream changes 
							
						 
						
							2020-10-26 15:48:16 +01:00  
				
					
						
							
							
								 
						
							
								3678b10823 
								
							 
						 
						
							
							
								
								Fix follow request notifications ( #15048 )  
							
							
							
						 
						
							2020-10-26 15:41:28 +01:00  
				
					
						
							
							
								 
						
							
								1f945e7390 
								
							 
						 
						
							
							
								
								Fix followers synchronization mechanism not being triggered on mentions ( #15026 )  
							
							... 
							
							
							
							e.g. if someone on an instance that previously had followers gets mentioned
in a private toot, before this PR, they would not receive a
Collection-Synchronization header and may show the toot to the former followers
in addition to the mentioned person. 
							
						 
						
							2020-10-23 14:22:16 +02:00  
				
					
						
							
							
								 
						
							
								fb586584f2 
								
							 
						 
						
							
							
								
								Fix account processing failing because of large collections ( #15027 )  
							
							... 
							
							
							
							Fixes  #15025  
						
							2020-10-23 14:21:31 +02:00  
				
					
						
							
							
								 
						
							
								5c60f7eaed 
								
							 
						 
						
							
							
								
								[Glitch] Fix strings that could not be translated  
							
							... 
							
							
							
							Port fb5f3be18f 
							
						 
						
							2020-10-21 21:49:46 +02:00  
				
					
						
							
							
								 
						
							
								4ae4b03974 
								
							 
						 
						
							
							
								
								[Glitch] Change how missing desktop notifications permission is displayed  
							
							... 
							
							
							
							Port a69ca29473 
							
						 
						
							2020-10-21 21:49:46 +02:00  
				
					
						
							
							
								 
						
							
								dca05c79a9 
								
							 
						 
						
							
							
								
								Move columns-related CSS rules into the appropriate files  
							
							
							
						 
						
							2020-10-21 21:28:47 +02:00  
				
					
						
							
							
								 
						
							
								b5927301cf 
								
							 
						 
						
							
							
								
								[Glitch] Fix browser notification permission request logic  
							
							... 
							
							
							
							Port f54ca3d08e 
							
						 
						
							2020-10-21 21:28:47 +02:00  
				
					
						
							
							
								 
						
							
								78ad04420c 
								
							 
						 
						
							
							
								
								[Glitch] Add duration parameter to muting.  
							
							... 
							
							
							
							Port 96761752ec 
							
						 
						
							2020-10-21 21:28:47 +02:00  
				
					
						
							
							
								 
						
							
								813c84cd6c 
								
							 
						 
						
							
							
								
								[Glitch] Change how CDN_HOST is passed down to make assets build reproducible  
							
							... 
							
							
							
							Port 4c45b43cb8 
							
						 
						
							2020-10-21 21:28:47 +02:00  
				
					
						
							
							
								 
						
							
								842c048c6b 
								
							 
						 
						
							
							
								
								[Glitch] Fix unread notification marker not updating when mounting column  
							
							... 
							
							
							
							Port dac3e362fd 
							
						 
						
							2020-10-21 19:36:41 +02:00  
				
					
						
							
							
								 
						
							
								f7306c7b7c 
								
							 
						 
						
							
							
								
								[Glitch] Ignore alt-key hotkeys in text fields  
							
							... 
							
							
							
							Port 63770d3aac 
							
						 
						
							2020-10-21 19:34:44 +02:00  
				
					
						
							
							
								 
						
							
								8071613dd7 
								
							 
						 
						
							
							
								
								[Glitch] Fix mark as read in notifications to be saved immediately  
							
							... 
							
							
							
							Port bec8b12bb5 
							
						 
						
							2020-10-21 19:33:20 +02:00  
				
					
						
							
							
								 
						
							
								c3d82027cf 
								
							 
						 
						
							
							
								
								[Glitch] Fix bell button causing a brief “Cancel follow request” on locked accounts  
							
							... 
							
							
							
							Port 82951920f7 
							
						 
						
							2020-10-21 19:24:32 +02:00  
				
					
						
							
							
								 
						
							
								ec49aa8175 
								
							 
						 
						
							
							
								
								Merge branch 'master' into glitch-soc/merge-upstream  
							
							... 
							
							
							
							Conflicts:
- `.github/dependabot.yml`:
  Updated upstream, we deleted it to not be flooded by Depandabot.
  Kept deleted.
- `Gemfile.lock`:
  Puma updated on both sides, went for the most recent version.
- `app/controllers/api/v1/mutes_controller.rb`:
  Upstream updated the serializer to support timed mutes, while
  glitch-soc added a custom API ages ago to get information that
  is already available elsewhere.
  Dropped the glitch-soc-specific API, went with upstream changes.
- `app/javascript/core/admin.js`:
  Conflict due to changing how assets are loaded. Went with upstream.
- `app/javascript/packs/public.js`:
  Conflict due to changing how assets are loaded. Went with upstream.
- `app/models/mute.rb`:
  🤷 
- `app/models/user.rb`:
  New user setting added upstream while we have glitch-soc-specific
  user settings. Added upstream's user setting.
- `config/settings.yml`:
  Upstream added a new user setting close to a user setting we had
  changed the defaults for. Added the new upstream setting.
- `package.json`:
  Upstream dependency updated “too close” to a glitch-soc-specific
  dependency. No real conflict. Updated the dependency. 
							
						 
						
							2020-10-21 19:10:50 +02:00  
				
					
						
							
							
								 
						
							
								ca56527140 
								
							 
						 
						
							
							
								
								Add follower synchronization mechanism ( #14510 )  
							
							... 
							
							
							
							* Add support for followers synchronization on the receiving end
Check the `collectionSynchronization` attribute on `Create` and `Announce`
activities and synchronize followers from provided collection if possible.
* Add tests for followers synchronization on the receiving end
* Add support for follower synchronization on the sender's end
* Add tests for the sending end
* Switch from AS attributes to HTTP header
Replace the custom `collectionSynchronization` ActivityStreams attribute by
an HTTP header (`X-AS-Collection-Synchronization`) with the same syntax as
the `Signature` header and the following fields:
- `collectionId` to specify which collection to synchronize
- `digest` for the SHA256 hex-digest of the list of followers known on the
   receiving instance (where “receiving instance” is determined by accounts
   sharing the same host name for their ActivityPub actor `id`)
- `url` of a collection that should be fetched by the instance actor
Internally, move away from the webfinger-based `domain` attribute and use
account `uri` prefix to group accounts.
* Add environment variable to disable followers synchronization
Since the whole mechanism relies on some new preconditions that, in some
extremely rare cases, might not be met, add an environment variable
(DISABLE_FOLLOWERS_SYNCHRONIZATION) to disable the mechanism altogether and
avoid followers being incorrectly removed.
The current conditions are:
1. all managed accounts' actor `id` and inbox URL have the same URI scheme and
   netloc.
2. all accounts whose actor `id` or inbox URL share the same URI scheme and
   netloc as a managed account must be managed by the same Mastodon instance
   as well.
As far as Mastodon is concerned, breaking those preconditions require extensive
configuration changes in the reverse proxy and might also cause other issues.
Therefore, this environment variable provides a way out for people with highly
unusual configurations, and can be safely ignored for the overwhelming majority
of Mastodon administrators.
* Only set follower synchronization header on non-public statuses
This is to avoid unnecessary computations and allow Follow-related
activities to be handled by the usual codepath instead of going through
the synchronization mechanism (otherwise, any Follow/Undo/Accept activity
would trigger the synchronization mechanism even if processing the activity
itself would be enough to re-introduce synchronization)
* Change how ActivityPub::SynchronizeFollowersService handles follow requests
If the remote lists a local follower which we only know has sent a follow
request, consider the follow request as accepted instead of sending an Undo.
* Integrate review feeback
- rename X-AS-Collection-Synchronization to Collection-Synchronization
- various minor refactoring and code style changes
* Only select required fields when computing followers_hash
* Use actor URI rather than webfinger domain in synchronization endpoint
* Change hash computation to be a XOR of individual hashes
Makes it much easier to be memory-efficient, and avoid sorting discrepancy issues.
* Marginally improve followers_hash computation speed
* Further improve hash computation performances by using pluck_each 
							
						 
						
							2020-10-21 18:04:09 +02:00  
				
					
						
							
							
								 
						
							
								9649ca0fbe 
								
							 
						 
						
							
							
								
								Removed disabling comments for Style/MethodMissingSuper ( #15014 )  
							
							... 
							
							
							
							* Removed disabling comments for Style/MethodMissingSuper
* Update rubocop for codeclimate 
							
						 
						
							2020-10-20 09:13:39 +02:00  
				
					
						
							
							
								 
						
							
								29870d2be6 
								
							 
						 
						
							
							
								
								Glitchsoc translation to 'es' language ( #1439 )  
							
							... 
							
							
							
							glitch-soc-specific translation to 'es' language 
							
						 
						
							2020-10-19 22:17:29 +02:00  
				
					
						
							
							
								 
						
							
								0c24f4dce2 
								
							 
						 
						
							
							
								
								Add support for Gemini urls ( #15013 )  
							
							... 
							
							
							
							This PR updates the `valid_url` regex and sanitizer allowlist to provide
support for Gemini urls.
Closes  #14991  
							
						 
						
							2020-10-19 17:02:13 +02:00  
				
					
						
							
							
								 
						
							
								4130aef29c 
								
							 
						 
						
							
							
								
								Fix translation string ( #14986 )  
							
							
							
						 
						
							2020-10-16 21:41:43 +02:00  
				
					
						
							
							
								 
						
							
								fb5f3be18f 
								
							 
						 
						
							
							
								
								Fix strings that could not be translated ( #14980 )  
							
							
							
						 
						
							2020-10-15 21:24:58 +02:00  
				
					
						
							
							
								 
						
							
								a69ca29473 
								
							 
						 
						
							
							
								
								Change how missing desktop notifications permission is displayed ( #14985 )  
							
							... 
							
							
							
							Add missing controls for new notification type 
							
						 
						
							2020-10-15 16:24:47 +02:00  
				
					
						
							
							
								 
						
							
								b4c4af18dc 
								
							 
						 
						
							
							
								
								Fix a bear check when the activity object is nil ( #14981 )  
							
							
							
						 
						
							2020-10-13 22:41:00 +02:00  
				
					
						
							
							
								 
						
							
								311f457430 
								
							 
						 
						
							
							
								
								Fix crash when autolinking an invalid URI in Markdown  
							
							
							
						 
						
							2020-10-13 14:35:07 +02:00  
				
					
						
							
							
								 
						
							
								4c45b43cb8 
								
							 
						 
						
							
							
								
								Change how CDN_HOST is passed down to make assets build reproducible ( #14381 )  
							
							... 
							
							
							
							* Change how CDN_HOST is passed down to make assets build reproducible
* Change webpacker/webpack configuration to dynamically load publicPath based on meta header
* Fix embedded layout missing the cdn-host meta header 
							
						 
						
							2020-10-13 01:19:35 +02:00  
				
					
						
							
							
								 
						
							
								96761752ec 
								
							 
						 
						
							
							
								
								Add duration parameter to muting. ( #13831 )  
							
							... 
							
							
							
							* Adding duration to muting.
* Remove useless checks 
							
						 
						
							2020-10-13 01:01:14 +02:00  
				
					
						
							
							
								 
						
							
								f54ca3d08e 
								
							 
						 
						
							
							
								
								Fix browser notification permission request logic ( #13543 )  
							
							... 
							
							
							
							* Add notification permission handling code
* Request notification permission when enabling any notification setting
* Add badge to notification settings when permissions insufficient
* Disable alerts by default, requesting permission and enable them on onboarding 
							
						 
						
							2020-10-13 00:37:21 +02:00  
				
					
						
							
							
								 
						
							
								5e1364c448 
								
							 
						 
						
							
							
								
								Add IP-based rules ( #14963 )  
							
							
							
						 
						
							2020-10-12 16:33:49 +02:00  
				
					
						
							
							
								 
						
							
								dc52a778e1 
								
							 
						 
						
							
							
								
								Fix issue checking for last unread notification when there are gaps ( #14960 )  
							
							
							
						 
						
							2020-10-09 17:12:52 +02:00  
				
					
						
							
							
								 
						
							
								cd861c051c 
								
							 
						 
						
							
							
								
								Fix issue checking for last unread notification when there are gaps  
							
							
							
						 
						
							2020-10-08 22:44:30 +02:00  
				
					
						
							
							
								 
						
							
								dac3e362fd 
								
							 
						 
						
							
							
								
								Fix unread notification marker not updating when mounting column ( #14954 )  
							
							
							
						 
						
							2020-10-08 00:35:27 +02:00  
				
					
						
							
							
								 
						
							
								7d985f2aac 
								
							 
						 
						
							
							
								
								Remove dependency on goldfinger gem ( #14919 )  
							
							... 
							
							
							
							There are edge cases where requests to certain hosts timeout when
using the vanilla HTTP.rb gem, which the goldfinger gem uses. Now
that we no longer need to support OStatus servers, webfinger logic
is so simple that there is no point encapsulating it in a gem, so
we can just use our own Request class. With that, we benefit from
more robust timeout code and IPv4/IPv6 resolution.
Fix  #14091  
							
						 
						
							2020-10-08 00:34:57 +02:00  
				
					
						
							
							
								 
						
							
								63770d3aac 
								
							 
						 
						
							
							
								
								Ignore alt-key hotkeys in text fields ( #14942 )  
							
							... 
							
							
							
							Fixes  #14862 
This used to be the case until #13987 , which introduced a hotkey to toggle
the Content Warning field.
Unfortunately, MacOS relies on the “alt” key for many things, including
composing text (see #14862 ), therefore, even if that makes the CW toggle
hotkey significantly less useful, it makes sense to not interfere with
composing toots. 
						
							2020-10-05 22:04:06 +02:00  
				
					
						
							
							
								 
						
							
								5a9ad221bf 
								
							 
						 
						
							
							
								
								Update translation files ( #14920 )  
							
							
							
						 
						
							2020-10-05 02:57:38 +02:00  
				
					
						
							
							
								 
						
							
								a549415868 
								
							 
						 
						
							
							
								
								Fix regressions in icon buttons in web UI ( #14915 )  
							
							
							
						 
						
							2020-10-04 15:02:36 +02:00  
				
					
						
							
							
								 
						
							
								bec8b12bb5 
								
							 
						 
						
							
							
								
								Fix mark as read in notifications to be saved immediately ( #14907 )  
							
							... 
							
							
							
							* Fix mark as read in notifications to be saved immediately
* fix code style 
							
						 
						
							2020-10-01 04:17:46 +02:00  
				
					
						
							
							
								 
						
							
								65136600e3 
								
							 
						 
						
							
							
								
								Fix logging out on mobile ( #14901 )  
							
							... 
							
							
							
							Fixes  #14900  
						
							2020-09-30 19:31:17 +02:00  
				
					
						
							
							
								 
						
							
								78e45a5285 
								
							 
						 
						
							
							
								
								Add option to disable swiping motions across the WebUI ( #13885 )  
							
							... 
							
							
							
							Fixes  #13882  
						
							2020-09-30 19:31:03 +02:00  
				
					
						
							
							
								 
						
							
								f5d08f2417 
								
							 
						 
						
							
							
								
								Fix unread notification markers ( #14897 )  
							
							
							
						 
						
							2020-09-29 15:30:56 +02:00  
				
					
						
							
							
								 
						
							
								b5edf30160 
								
							 
						 
						
							
							
								
								Fix boost icon not being displayed in boost notifications  
							
							
							
						 
						
							2020-09-29 11:05:05 +02:00  
				
					
						
							
							
								 
						
							
								82951920f7 
								
							 
						 
						
							
							
								
								Fix bell button causing a brief “Cancel follow request” on locked accounts ( #14896 )  
							
							
							
						 
						
							2020-09-28 21:44:29 +02:00  
				
					
						
							
							
								 
						
							
								ccfc2b6dce 
								
							 
						 
						
							
							
								
								Make explicit in glitch-soc's WebUI when an account is suspended  
							
							
							
						 
						
							2020-09-28 18:00:49 +02:00  
				
					
						
							
							
								 
						
							
								e3f822ac1b 
								
							 
						 
						
							
							
								
								Do not filter out temporarily-suspended accounts from relationships API  
							
							
							
						 
						
							2020-09-28 17:56:16 +02:00  
				
					
						
							
							
								 
						
							
								dadec533ce 
								
							 
						 
						
							
							
								
								[Glitch] Fix unreadable placeholder text color in high contrast theme in web UI ( #14803 )  
							
							... 
							
							
							
							Port bbcbf12215 
							
						 
						
							2020-09-28 17:56:16 +02:00  
				
					
						
							
							
								 
						
							
								6dde075425 
								
							 
						 
						
							
							
								
								Fix actions being performed before the redux state is set up  
							
							
							
						 
						
							2020-09-28 17:49:55 +02:00  
				
					
						
							
							
								 
						
							
								f8205b7b4a 
								
							 
						 
						
							
							
								
								[Glitch] Add paragraph about browser add-ons when encountering some errors  
							
							... 
							
							
							
							Port b67caf9be4 
							
						 
						
							2020-09-28 17:49:55 +02:00  
				
					
						
							
							
								 
						
							
								14869ee656 
								
							 
						 
						
							
							
								
								[Glitch] Add option to be notified when a followed user posts  
							
							... 
							
							
							
							Port 974b1b79ce 
							
						 
						
							2020-09-28 17:49:55 +02:00  
				
					
						
							
							
								 
						
							
								0a069bffd9 
								
							 
						 
						
							
							
								
								[Glitch] Optimize the process of following someone  
							
							... 
							
							
							
							Port front-end changes from 6d59dfa15d 
							
						 
						
							2020-09-28 17:49:55 +02:00  
				
					
						
							
							
								 
						
							
								6775de3fc9 
								
							 
						 
						
							
							
								
								[Glitch] Change web UI to show empty profile for suspended accounts  
							
							... 
							
							
							
							Port fcb9350ff8 
							
						 
						
							2020-09-28 17:49:55 +02:00  
				
					
						
							
							
								 
						
							
								572d1a1bf8 
								
							 
						 
						
							
							
								
								[Glitch] Fix home TL marker code mishandling gaps  
							
							... 
							
							
							
							Port eaea2311aa 
							
						 
						
							2020-09-28 15:00:19 +02:00  
				
					
						
							
							
								 
						
							
								4586202448 
								
							 
						 
						
							
							
								
								[Glitch] Fix notification filter bar incorrectly filtering gaps  
							
							... 
							
							
							
							Port aab867b0e8 
							
						 
						
							2020-09-28 14:59:10 +02:00  
				
					
						
							
							
								 
						
							
								d31792a2a6 
								
							 
						 
						
							
							
								
								[Glitch] Add border around  🕺  emoji  
							
							... 
							
							
							
							Port 91eecd1b3c 
							
						 
						
							2020-09-28 14:58:25 +02:00  
				
					
						
							
							
								 
						
							
								a7aedebc31 
								
							 
						 
						
							
							
								
								Merge branch 'master' into glitch-soc/merge-upstream  
							
							... 
							
							
							
							Conflicts:
- `Gemfile.lock`:
  Not a real conflict, upstream updated dependencies that were too close to
  glitch-soc-only ones in the file.
- `app/controllers/oauth/authorized_applications_controller.rb`:
  Upstream changed the logic surrounding suspended accounts.
  Minor conflict due to glitch-soc's theming system.
  Ported upstream changes.
- `app/controllers/settings/base_controller.rb`:
  Upstream refactored and changed the logic surrounding suspended accounts.
  Minor conflict due to glitch-soc's theming system.
  Ported upstream changes.
- `app/controllers/settings/sessions_controller.rb`:
  Upstream refactored and changed the logic surrounding suspended accounts.
  Minor conflict due to glitch-soc's theming system.
  Ported upstream changes.
- `app/models/user.rb`:
  Upstream refactored and changed the logic surrounding suspended accounts.
  Minor conflict due to glitch-soc not preventing moved accounts from logging
  in.
  Ported upstream changes while keeping the ability for moved accounts to log
  in.
- `app/policies/status_policy.rb`:
  Upstream refactored and changed the logic surrounding suspended accounts.
  Minor conflict due to glitch-soc's local-only toots.
  Ported upstream changes.
- `app/serializers/rest/account_serializer.rb`:
  Upstream refactored and changed the logic surrounding suspended accounts.
  Minor conflict due to glitch-soc's ability  to hide followers count.
  Ported upstream changes.
- `app/services/process_mentions_service.rb`:
  Upstream refactored and changed the logic surrounding suspended accounts.
  Minor conflict due to glitch-soc's local-only toots.
  Ported upstream changes.
- `package.json`:
  Not a real conflict, upstream updated dependencies that were too close to
  glitch-soc-only ones in the file. 
							
						 
						
							2020-09-28 14:13:30 +02:00  
				
					
						
							
							
								 
						
							
								d88a79b456 
								
							 
						 
						
							
							
								
								Add pop-out player for audio/video in web UI ( #14870 )  
							
							... 
							
							
							
							Fix  #11160  
						
							2020-09-28 13:29:43 +02:00  
				
					
						
							
							
								 
						
							
								d60290044e 
								
							 
						 
						
							
							
								
								Add environment variable to allow requests to some private addresses ( #14722 )  
							
							
							
						 
						
							2020-09-26 20:57:39 +02:00  
				
					
						
							
							
								 
						
							
								ff89025979 
								
							 
						 
						
							
							
								
								Add unread notification markers ( #14818 )  
							
							... 
							
							
							
							* Add unread notification markers
Fixes  #14804 
* Allow IntersectionObserverArticle's children to be updated 
							
						 
						
							2020-09-26 20:57:07 +02:00  
				
					
						
							
							
								 
						
							
								03b6b034b9 
								
							 
						 
						
							
							
								
								add og:published_time to opengraph meta tags ( #14865 )  
							
							
							
						 
						
							2020-09-24 23:32:13 +02:00  
				
					
						
							
							
								 
						
							
								b655a7f88f 
								
							 
						 
						
							
							
								
								Fix a slow query for TagFeed ( #14861 )  
							
							... 
							
							
							
							* Fix a slow query for TagFeed
* rename tags to tag_ids 
							
						 
						
							2020-09-23 16:01:54 +02:00  
				
					
						
							
							
								 
						
							
								070026e634 
								
							 
						 
						
							
							
								
								Fix method of the DELETE DATA button ( #14855 )  
							
							
							
						 
						
							2020-09-21 20:37:19 +02:00  
				
					
						
							
							
								 
						
							
								8c8bf0289f 
								
							 
						 
						
							
							
								
								Fix not being able to enable status notifications in Web Push API ( #14822 )  
							
							
							
						 
						
							2020-09-21 17:48:55 +02:00  
				
					
						
							
							
								 
						
							
								787d5d7289 
								
							 
						 
						
							
							
								
								Fix minor bugs  
							
							
							
						 
						
							2020-09-19 15:01:46 +02:00  
				
					
						
							
							
								 
						
							
								312c936d51 
								
							 
						 
						
							
							
								
								Minor refactoring and fixups  
							
							
							
						 
						
							2020-09-19 14:15:28 +02:00  
				
					
						
							
							
								 
						
							
								85b9086e6b 
								
							 
						 
						
							
							
								
								Filter out mounted lists from “getting started” column  
							
							
							
						 
						
							2020-09-18 20:07:25 +02:00  
				
					
						
							
							
								 
						
							
								974b1b79ce 
								
							 
						 
						
							
							
								
								Add option to be notified when a followed user posts ( #13546 )  
							
							... 
							
							
							
							* Add bell button
Fix  #4890 
* Remove duplicate type from post-deployment migration
* Fix legacy class type mappings
* Improve query performance with better index
* Fix validation
* Remove redundant index from notifications 
							
						 
						
							2020-09-18 17:26:45 +02:00  
				
					
						
							
							
								 
						
							
								a681980307 
								
							 
						 
						
							
							
								
								Submit timeline markers closer to the moment they change  
							
							
							
						 
						
							2020-09-17 15:22:56 +02:00  
				
					
						
							
							
								 
						
							
								60eebc6cc4 
								
							 
						 
						
							
							
								
								Fix crashes when connection drops  
							
							
							
						 
						
							2020-09-17 15:22:56 +02:00  
				
					
						
							
							
								 
						
							
								f1c0cf9806 
								
							 
						 
						
							
							
								
								Add button to manually mark all notifications as read  
							
							
							
						 
						
							2020-09-17 15:22:56 +02:00  
				
					
						
							
							
								 
						
							
								94c290d7d2 
								
							 
						 
						
							
							
								
								Only update read marker when giving focus/mounting column  
							
							
							
						 
						
							2020-09-17 15:22:56 +02:00  
				
					
						
							
							
								 
						
							
								145ed37978 
								
							 
						 
						
							
							
								
								Refactor and change logic to only update marker if we reached the last  
							
							... 
							
							
							
							read notification. 
							
						 
						
							2020-09-17 15:22:56 +02:00  
				
					
						
							
							
								 
						
							
								66e9a77e36 
								
							 
						 
						
							
							
								
								Display unread marker for notifications  
							
							
							
						 
						
							2020-09-17 15:22:56 +02:00  
				
					
						
							
							
								 
						
							
								ae698469d0 
								
							 
						 
						
							
							
								
								Clean up leftover from DM conversation view redesign  
							
							
							
						 
						
							2020-09-17 15:22:56 +02:00  
				
					
						
							
							
								 
						
							
								eaea2311aa 
								
							 
						 
						
							
							
								
								Fix home TL marker code mishandling gaps ( #14809 )  
							
							
							
						 
						
							2020-09-16 20:17:40 +02:00  
				
					
						
							
							
								 
						
							
								aab867b0e8 
								
							 
						 
						
							
							
								
								Fix notification filter bar incorrectly filtering gaps ( #14808 )  
							
							
							
						 
						
							2020-09-16 20:17:16 +02:00  
				
					
						
							
							
								 
						
							
								5d3c8baa9a 
								
							 
						 
						
							
							
								
								Fix validates :sign_count of WebauthnCredential ( #14806 )  
							
							
							
						 
						
							2020-09-16 20:16:46 +02:00  
				
					
						
							
							
								 
						
							
								ed099d8bdc 
								
							 
						 
						
							
							
								
								Change account suspensions to be reversible by default ( #14726 )  
							
							
							
						 
						
							2020-09-15 14:37:58 +02:00  
				
					
						
							
							
								 
						
							
								bbcbf12215 
								
							 
						 
						
							
							
								
								Fix unreadable placeholder text color in high contrast theme in web UI ( #14803 )  
							
							... 
							
							
							
							Fix  #14717  
						
							2020-09-15 09:24:24 +02:00  
				
					
						
							
							
								 
						
							
								b67caf9be4 
								
							 
						 
						
							
							
								
								Add paragraph about browser add-ons when encountering some errors ( #14801 )  
							
							... 
							
							
							
							* Add paragraph about browser add-ons when encountering some errors
When a crash is caused by a NotFoundError exception, add a paragraph
to the error page mentioning browser add-ons.
Indeed, crashes with NotFoundError are often caused by browser extensions
messing with the DOM in ways React.JS can't recover from (e.g. issues #13325 
and #14731 ).
* Reword error messages 
							
						 
						
							2020-09-14 15:05:22 +02:00  
				
					
						
							
							
								 
						
							
								cd4ec7cd74 
								
							 
						 
						
							
							
								
								Do not serve account actors at all in limited federation mode ( #14800 )  
							
							... 
							
							
							
							* Do not serve account actors at all in limited federation mode
When an account is fetched without a signature from an allowed instance,
return an error.
This isn't really an improvement in security, as the only information that was
previously returned was required protocol-level info, and the only personal bit
was the existence of the account. The existence of the account can still be
checked by issuing a webfinger query, as those are accepted without signatures.
However, this change makes it so that unallowed instances won't create account
records on their end when they find a reference to an unknown account.
The previous behavior of rendering a limited list of fields, instead of not
rendering the actor at all, was in order to prevent situations in which two
instances in Authorized Fetch mode or Limited Federation mode would fail to
reach each other because resolving an account would require a signed query…
from an account which can only be fetched with a signed query itself. However,
this should now be fine as fetching accounts is done by signing on behalf of
the special instance actor, which does not require any kind of valid signature
to be fetched.
* Fix tests 
							
						 
						
							2020-09-14 13:04:29 +02:00  
				
					
						
							
							
								 
						
							
								42c4322ce7 
								
							 
						 
						
							
							
								
								Fix reported statuses not being included in warning e-mail ( #14778 )  
							
							
							
						 
						
							2020-09-13 12:52:17 +02:00  
				
					
						
							
							
								 
						
							
								fa0c71f0d9 
								
							 
						 
						
							
							
								
								allow pagination by min_id and max_id ( #14776 )  
							
							... 
							
							
							
							* allow pagination by min_id and max_id
* also AccountConversation allows min_id,max_id pair
* also home,list TL allows min_id,max_id pair 
							
						 
						
							2020-09-12 17:09:49 +02:00  
				
					
						
							
							
								 
						
							
								4e4b3a0c8e 
								
							 
						 
						
							
							
								
								Refactor settings controllers ( #14767 )  
							
							... 
							
							
							
							- Disallow suspended accounts from revoking sessions and apps
- Allow suspended accounts to access exports 
							
						 
						
							2020-09-11 20:56:35 +02:00  
				
					
						
							
							
								 
						
							
								e6b272e5c9 
								
							 
						 
						
							
							
								
								Change REST API to return empty data for suspended accounts ( #14765 )  
							
							
							
						 
						
							2020-09-11 15:16:29 +02:00  
				
					
						
							
							
								 
						
							
								91eecd1b3c 
								
							 
						 
						
							
							
								
								Add border around  🕺  emoji ( #14769 )  
							
							... 
							
							
							
							Fixes  #14768  
						
							2020-09-10 19:08:03 +02:00  
				
					
						
							
							
								 
						
							
								afa753a890 
								
							 
						 
						
							
							
								
								[Glitch] Set z-index of dropdown to 9999.  
							
							... 
							
							
							
							Port 678f5ed296 
							
						 
						
							2020-09-10 17:44:38 +02:00  
				
					
						
							
							
								 
						
							
								fcb9350ff8 
								
							 
						 
						
							
							
								
								Change web UI to show empty profile for suspended accounts ( #14766 )  
							
							
							
						 
						
							2020-09-10 00:07:19 +02:00  
				
					
						
							
							
								 
						
							
								9748f074a3 
								
							 
						 
						
							
							
								
								Merge branch 'master' into glitch-soc/merge-upstream  
							
							... 
							
							
							
							Conflicts:
- app/controllers/api/v1/timelines/public_controller.rb
- app/lib/feed_manager.rb
- app/models/status.rb
- app/services/precompute_feed_service.rb
- app/workers/feed_insert_worker.rb
- spec/models/status_spec.rb
All conflicts are due to upstream refactoring feed management and us having
local-only toots on top of that. Rewrote local-only toots management for
upstream's changes. 
							
						 
						
							2020-09-08 16:26:47 +02:00  
				
					
						
							
							
								 
						
							
								65760f59df 
								
							 
						 
						
							
							
								
								Refactor feed manager ( #14761 )  
							
							
							
						 
						
							2020-09-08 03:41:16 +02:00  
				
					
						
							
							
								 
						
							
								517af45e32 
								
							 
						 
						
							
							
								
								Fix multiple boosts of a same toot erroneously appearing in TL ( #14759 )  
							
							... 
							
							
							
							* Check for and record reblog info atomically
Instead of using ZREVRANK to determine whether a reblog is a new reblog or not,
use ZADD's NX option to perform the check/addition option atomically.
* Replace ZREVRANK call with ZSCORE key which is more efficient
* Make tests a bit stricter
* Fix off-by-one 
							
						 
						
							2020-09-07 18:00:15 +02:00  
				
					
						
							
							
								 
						
							
								e79d719e92 
								
							 
						 
						
							
							
								
								Changed tag most_used to recently_used ( #14760 )  
							
							
							
						 
						
							2020-09-07 17:47:41 +02:00  
				
					
						
							
							
								 
						
							
								e8bc187845 
								
							 
						 
						
							
							
								
								Refactor how public and tag timelines are queried ( #14728 )  
							
							
							
						 
						
							2020-09-07 11:02:04 +02:00  
				
					
						
							
							
								 
						
							
								e5f934ddf0 
								
							 
						 
						
							
							
								
								Merge branch 'master' into glitch-soc/merge-upstream  
							
							... 
							
							
							
							Conflicts:
- `app/controllers/activitypub/collections_controller.rb`:
  Conflict caused because we have additional code to make sure pinned
  local-only toots don't get rendered on the ActivityPub endpoints.
  Ported upstream changes. 
							
						 
						
							2020-09-07 09:21:38 +02:00  
				
					
						
							
							
								 
						
							
								a6121a159c 
								
							 
						 
						
							
							
								
								Remove obsolete IndexedDB operations from web UI ( #14730 )  
							
							... 
							
							
							
							Storing objects in IndexedDB was disabled in #7932 , but we were
still trying to read objects from it before making an API call 
							
						 
						
							2020-09-04 20:22:40 +02:00  
				
					
						
							
							
								 
						
							
								272aa4a109 
								
							 
						 
						
							
							
								
								Fix direct visibility style for light theme ( #14727 )  
							
							
							
						 
						
							2020-09-04 08:49:56 +02:00  
				
					
						
							
							
								 
						
							
								abee40b232 
								
							 
						 
						
							
							
								
								Add outbox attribute to instance actor ( #14721 )  
							
							... 
							
							
							
							It's not useful for now, but it's required by ActivityPub 
							
						 
						
							2020-09-02 18:42:50 +02:00  
				
					
						
							
							
								 
						
							
								33ad850c98 
								
							 
						 
						
							
							
								
								Added account featured tags API ( #11817 )  
							
							
							
						 
						
							2020-09-02 02:13:10 +02:00  
				
					
						
							
							
								 
						
							
								17340365bb 
								
							 
						 
						
							
							
								
								Add featured hashtags as an ActivityPub collection ( #11595 )  
							
							
							
						 
						
							2020-09-02 02:11:12 +02:00  
				
					
						
							
							
								 
						
							
								787a629b8f 
								
							 
						 
						
							
							
								
								[Glitch] Update Tesseract.js  
							
							... 
							
							
							
							Port 5fc5a9f9f1 
							
						 
						
							2020-09-01 17:10:20 +02:00  
				
					
						
							
							
								 
						
							
								a2d66a90e6 
								
							 
						 
						
							
							
								
								[Glitch] Add border around  🐞  emoji  
							
							... 
							
							
							
							Port JS change from f0b6ddd979 
							
						 
						
							2020-09-01 17:08:09 +02:00  
				
					
						
							
							
								 
						
							
								3fefb7909b 
								
							 
						 
						
							
							
								
								Merge branch 'master' into glitch-soc/merge-upstream  
							
							... 
							
							
							
							Conflicts:
- `config/webpack/shared.js`:
  Upstream has changed how Tesseract.js gets included and dropped a dependency.
  The conflict is caused by glitch-soc having different code due to its
  theming system.
  Ported upstream changes.
- `lib/mastodon/version.rb`:
  Upstream refactor/code style change in a place we replaced upstream's
  repo URL with ours.
  Ported upstram changes, keeping our repo URL.
- `yarn.lock`:
  Upstream dropped dependencies, one of which was textually too close to
  a glitch-soc-specific dependency. Not a real conflict. 
							
						 
						
							2020-09-01 17:02:18 +02:00  
				
					
						
							
							
								 
						
							
								d95dd3883e 
								
							 
						 
						
							
							
								
								Change radio button design to be consistent with that of the directory explorer  
							
							... 
							
							
							
							Signed-off-by: Thibaut Girka <thib@sitedethib.com> 
							
						 
						
							2020-09-01 14:09:35 +02:00  
				
					
						
							
							
								 
						
							
								70e64206be 
								
							 
						 
						
							
							
								
								Capitalize replies_policy strings  
							
							... 
							
							
							
							Signed-off-by: Thibaut Girka <thib@sitedethib.com> 
							
						 
						
							2020-09-01 14:09:35 +02:00  
				
					
						
							
							
								 
						
							
								79305428a7 
								
							 
						 
						
							
							
								
								Add configuration option to filter replies in lists ( #9205 )  
							
							... 
							
							
							
							* Add database support for list show-reply preferences
* Add backend support to read and update list-specific show_replies settings
* Add basic UI to set list replies setting
* Add specs for list replies policy
* Switch "cycling" reply policy link to a set of radio inputs
* Capitalize replies_policy strings
* Change radio button design to be consistent with that of the directory explorer 
							
						 
						
							2020-09-01 13:31:28 +02:00  
				
					
						
							
							
								 
						
							
								1c308af84c 
								
							 
						 
						
							
							
								
								Change own direct-visibility statuses to be in the home feed again ( #14711 )  
							
							... 
							
							
							
							And remove highlighting in web UI
Full circle from #8940  
							
						 
						
							2020-09-01 13:30:42 +02:00  
				
					
						
							
							
								 
						
							
								e02f375d22 
								
							 
						 
						
							
							
								
								Fix threaded mode  
							
							... 
							
							
							
							Fixes  #1414  
						
							2020-09-01 09:37:17 +02:00  
				
					
						
							
							
								 
						
							
								8972e5f7f6 
								
							 
						 
						
							
							
								
								Bump rubocop from 0.86.0 to 0.88.0 ( #14412 )  
							
							... 
							
							
							
							* Bump rubocop from 0.86.0 to 0.88.0
Bumps [rubocop](https://github.com/rubocop-hq/rubocop ) from 0.86.0 to 0.88.0.
- [Release notes](https://github.com/rubocop-hq/rubocop/releases )
- [Changelog](https://github.com/rubocop-hq/rubocop/blob/master/CHANGELOG.md )
- [Commits](https://github.com/rubocop-hq/rubocop/compare/v0.86.0...v0.88.0 )
Signed-off-by: dependabot[bot] <support@github.com>
* Fix for latest RuboCop
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: Yamagishi Kazutoshi <ykzts@desire.sh> 
							
						 
						
							2020-09-01 03:04:00 +02:00  
				
					
						
							
							
								 
						
							
								5fc5a9f9f1 
								
							 
						 
						
							
							
								
								Update Tesseract.js ( #14708 )  
							
							... 
							
							
							
							* [WiP] Update Tesseract.js
- Update Tesseract.js to 2.2.1
- Use versioned file names
- differentiate two progression states: preparing OCR and detecting picture
* Get rid of copy-webpack-plugin 
							
						 
						
							2020-09-01 00:26:10 +02:00  
				
					
						
							
							
								 
						
							
								38182fceb3 
								
							 
						 
						
							
							
								
								Fix crash when opening detailed view of a status you boosted  
							
							
							
						 
						
							2020-08-31 23:48:16 +02:00  
				
					
						
							
							
								 
						
							
								f0b6ddd979 
								
							 
						 
						
							
							
								
								Add border around  🐞  emoji ( #14712 )  
							
							
							
						 
						
							2020-08-31 23:30:27 +02:00  
				
					
						
							
							
								 
						
							
								7febf19296 
								
							 
						 
						
							
							
								
								Add back “Home” link to the “Getting Started” column when the “Home” column isn't mounted ( #14707 )  
							
							... 
							
							
							
							* Add back "Home" link to "Getting started" when Home column isn't mounted
* Fix keys in getting_started
It should not matter much in practice as the list of items will only
change extremely rarely, but having a `key` that corresponds to the actual
item makes much more sense than having it be the index of the item within
the list. 
							
						 
						
							2020-08-31 18:11:37 +02:00  
				
					
						
							
							
								 
						
							
								b1bb1906be 
								
							 
						 
						
							
							
								
								Fix limited follower id in fan-out-on-write service ( #14709 )  
							
							
							
						 
						
							2020-08-31 18:11:27 +02:00  
				
					
						
							
							
								 
						
							
								ae871c4d46 
								
							 
						 
						
							
							
								
								Make Array-creation behavior of Paginable more predictable ( #14687 )  
							
							... 
							
							
							
							* Make Array-creation behavior of Paginable more predictable
Paginable.paginate_by_id usually returns ActiveRecord::Relation, but it
returns an Array if min_id option is present. The behavior caused problems
fixed with the following commits:
- 552e886b64b63ede500564ef37b89dhttps://api.rubyonrails.org/classes/ActiveRecord/Scoping/Named/ClassMethods.html#method-i-scope 
> The method is intended to return an ActiveRecord::Relation object, which
> is composable with other scopes.
Paginable.to_a_paginated_by_id returns an Array and is not appropriate
as a scope. 
							
						 
						
							2020-08-31 12:47:09 +02:00  
				
					
						
							
							
								 
						
							
								a68ec50e4e 
								
							 
						 
						
							
							
								
								Adapt 2FA changes to glitch-soc's theming system  
							
							
							
						 
						
							2020-08-30 17:26:18 +02:00  
				
					
						
							
							
								 
						
							
								a340e653df 
								
							 
						 
						
							
							
								
								[Glitch] Add WebAuthn as an alternative 2FA method  
							
							... 
							
							
							
							Port CSS changes from e8d41bc2fe 
							
						 
						
							2020-08-30 17:21:16 +02:00  
				
					
						
							
							
								 
						
							
								bf55b5463a 
								
							 
						 
						
							
							
								
								[Glitch] Fix: also use custom private boost icon for detailed status  
							
							... 
							
							
							
							Port a3ec9af9b0 
							
						 
						
							2020-08-30 16:51:16 +02:00  
				
					
						
							
							
								 
						
							
								72b1d5fdc5 
								
							 
						 
						
							
							
								
								[Glitch] Better manage subscriptionCounters  
							
							... 
							
							
							
							Port 9669557be1 
							
						 
						
							2020-08-30 16:35:33 +02:00  
				
					
						
							
							
								 
						
							
								3bbf6b1519 
								
							 
						 
						
							
							
								
								[Glitch] reword "boost to original audience" as per tootsuite#14596  
							
							... 
							
							
							
							Port 46210a65d1 
							
						 
						
							2020-08-30 16:34:38 +02:00  
				
					
						
							
							
								 
						
							
								cd806663af 
								
							 
						 
						
							
							
								
								[Glitch] Fix click range discrepancies in gifv  
							
							... 
							
							
							
							Port debf6ae316 
							
						 
						
							2020-08-30 16:31:41 +02:00  
				
					
						
							
							
								 
						
							
								45d1f34a30 
								
							 
						 
						
							
							
								
								[Glitch] Fix scrolling issues when closing some dropdown menus  
							
							... 
							
							
							
							Port c7cfd4e67a 
							
						 
						
							2020-08-30 16:31:02 +02:00  
				
					
						
							
							
								 
						
							
								8c3c27bf06 
								
							 
						 
						
							
							
								
								Merge branch 'master' into glitch-soc/merge-upstream  
							
							... 
							
							
							
							Conflicts:
- `app/controllers/accounts_controller.rb`:
  Upstream change too close to a glitch-soc change related to
  instance-local toots. Merged upstream changes.
- `app/services/fan_out_on_write_service.rb`:
  Minor conflict due to glitch-soc's handling of Direct Messages,
  merged upstream changes.
- `yarn.lock`:
  Not really a conflict, caused by glitch-soc-only dependencies
  being textually too close to updated upstream dependencies.
  Merged upstream changes. 
							
						 
						
							2020-08-30 16:13:08 +02:00  
				
					
						
							
							
								 
						
							
								52157fdcba 
								
							 
						 
						
							
							
								
								Add support for dereferencing objects through bearcaps ( #14683 )  
							
							
							
						 
						
							2020-08-30 12:34:20 +02:00  
				
					
						
							
							
								 
						
							
								ce8f33dd2f 
								
							 
						 
						
							
							
								
								Fix inefficiencies in fan-out-on-write service ( #14682 )  
							
							
							
						 
						
							2020-08-30 12:33:59 +02:00  
				
					
						
							
							
								 
						
							
								bf477cee9f 
								
							 
						 
						
							
							
								
								Fix videos with near-60 fps being rejected ( #14684 )  
							
							... 
							
							
							
							Fix  #14668  
						
							2020-08-30 01:54:30 +02:00  
				
					
						
							
							
								 
						
							
								30632adf9e 
								
							 
						 
						
							
							
								
								Fix replying to some remote toots switching to local-only  
							
							
							
						 
						
							2020-08-29 19:57:32 +02:00  
				
					
						
							
							
								 
						
							
								64ef37b89d 
								
							 
						 
						
							
							
								
								Introduce ApplicationController#cache_collection_paginated_by_id ( #14677 )  
							
							... 
							
							
							
							* Replace incorrect use of distinct with group
Some uses of ActiveRecord::QueryMethods#distinct pass field names but they
are incorrect for the current version of Rails.
ActiveRecord::QueryMethods#group provides the expected behavior and
benefits performance. See commit 6da24aad4cafdef8d8a2c92bac2002a5fc2fe9c8.
* Introduce ApplicationController#cache_collection_paginated_by_id
ApplicationController#cache_collection_paginated_by_id fuses
ApplicationController#cache_collection and Paginable.paginate_by_id.
An advantage of this method is that it prevents from modifying scope which
Paginable.paginate_by_id may provide.
ApplicationController#cache_collection always return an array and there
is no possibility of the scope modification. It is also clear for a
programmer, considering the implication of "cache".
This method can also emit more efficient queries by using
Cacheable.cache_ids before calling Paginable.paginate_by_id. 
							
						 
						
							2020-08-28 12:31:56 +02:00  
				
					
						
							
							
								 
						
							
								b63ede5005 
								
							 
						 
						
							
							
								
								Eagerly load statuses with the main query in Api::V1::BookmarksController ( #14674 )  
							
							... 
							
							
							
							This is same with commit 552e886b64 
							
						 
						
							2020-08-28 12:30:23 +02:00  
				
					
						
							
							
								 
						
							
								e26e7a1cb5 
								
							 
						 
						
							
							
								
								Replace incorrect use of distinct with group ( #14675 )  
							
							... 
							
							
							
							Some uses of ActiveRecord::QueryMethods#distinct pass field names but they
are incorrect for the current version of Rails.
ActiveRecord::QueryMethods#group provides the expected behavior and
benefits performance. See commit 6da24aad4cafdef8d8a2c92bac2002a5fc2fe9c8. 
							
						 
						
							2020-08-28 12:29:59 +02:00