Thibaut Girka 
								
							 
						 
						
							
							
							
							
								
							
							
								e50554391a 
								
							 
						 
						
							
							
								
								Merge branch 'master' into glitch-soc/merge-upstream  
							
							
							
						 
						
							2019-08-05 13:13:28 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Eugen Rochko 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								8b9d0a0533 
								
							 
						 
						
							
							
								
								Remove XML version of Webfinger and remove links to Atom feeds ( #11460 )  
							
							... 
							
							
							
							Fix  #11453  
						
							2019-08-01 19:14:02 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Thibaut Girka 
								
							 
						 
						
							
							
							
							
								
							
							
								24968d20a0 
								
							 
						 
						
							
							
								
								Merge branch 'master' into glitch-soc/merge-upstream  
							
							... 
							
							
							
							Conflicts:
- app/controllers/directories_controller.rb
- package.json
- yarn.lock 
							
						 
						
							2019-07-30 12:22:33 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Eugen Rochko 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								24552b5160 
								
							 
						 
						
							
							
								
								Add whitelist mode ( #11291 )  
							
							
							
						 
						
							2019-07-30 11:10:46 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Thibaut Girka 
								
							 
						 
						
							
							
							
							
								
							
							
								bca3825c17 
								
							 
						 
						
							
							
								
								Merge branch 'master' into glitch-soc/merge-upstream  
							
							
							
						 
						
							2019-07-28 16:28:05 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									ThibG 
								
							 
						 
						
							
							
							
							
								
							
							
								92569ffde8 
								
							 
						 
						
							
							
								
								Fix invites not being disabled upon account suspension ( #11412 )  
							
							... 
							
							
							
							* Disable invite links from disabled/suspended users
* Add has_many invites relationship to users
* Destroy unused invites when suspending an account 
							
						 
						
							2019-07-26 18:55:33 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Thibaut Girka 
								
							 
						 
						
							
							
							
							
								
							
							
								2d35e4460a 
								
							 
						 
						
							
							
								
								Merge branch 'master' into glitch-soc/merge-upstream  
							
							
							
						 
						
							2019-07-24 16:23:53 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									dependabot-preview[bot] 
								
							 
						 
						
							
							
							
							
								
							
							
								1955aa9f7d 
								
							 
						 
						
							
							
								
								Bump active_model_serializers from 0.10.9 to 0.10.10 ( #11311 )  
							
							... 
							
							
							
							* Bump active_model_serializers from 0.10.9 to 0.10.10
Bumps [active_model_serializers](https://github.com/rails-api/active_model_serializers ) from 0.10.9 to 0.10.10.
- [Release notes](https://github.com/rails-api/active_model_serializers/releases )
- [Changelog](https://github.com/rails-api/active_model_serializers/blob/v0.10.10/CHANGELOG.md )
- [Commits](https://github.com/rails-api/active_model_serializers/compare/v0.10.9...v0.10.10 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
* Add root option to render method 
							
						 
						
							2019-07-23 11:10:42 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Thibaut Girka 
								
							 
						 
						
							
							
							
							
								
							
							
								8a89a2b0f4 
								
							 
						 
						
							
							
								
								Revert some refactoring in order to make codebase closer to upstream  
							
							
							
						 
						
							2019-07-23 10:51:12 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Thibaut Girka 
								
							 
						 
						
							
							
							
							
								
							
							
								444796b69b 
								
							 
						 
						
							
							
								
								Merge branch 'master' into glitch-soc/merge-upstream  
							
							... 
							
							
							
							Conflicts:
- app/controllers/application_controller.rb
- app/controllers/auth/confirmations_controller.rb
- app/controllers/auth/sessions_controller.rb
- app/controllers/settings/deletes_controller.rb
- app/controllers/settings/two_factor_authentication/recovery_codes_controller.rb 
							
						 
						
							2019-07-23 10:51:07 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Eugen Rochko 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								964ae8eee5 
								
							 
						 
						
							
							
								
								Change unconfirmed user login behaviour ( #11375 )  
							
							... 
							
							
							
							Allow access to account settings, 2FA, authorized applications, and
account deletions to unconfirmed and pending users, as well as
users who had their accounts disabled. Suspended users cannot update
their e-mail or password or delete their account.
Display account status on account settings page, for example, when
an account is frozen, limited, unconfirmed or pending review.
After sign up, login users straight away and show a simple page that
tells them the status of their account with links to account settings
and logout, to reduce onboarding friction and allow users to correct
wrongly typed e-mail addresses.
Move the final sign-up step of SSO integrations to be the same
as above to reduce code duplication. 
							
						 
						
							2019-07-22 10:48:50 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Eugen Rochko 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								c669bb42ba 
								
							 
						 
						
							
							
								
								Add (back) rails-level JSON caching ( #11333 )  
							
							
							
						 
						
							2019-07-21 22:32:16 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Eugen Rochko 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								bd1545de5e 
								
							 
						 
						
							
							
								
								Change locale detection to run once per session ( #8657 )  
							
							... 
							
							
							
							Fix  #6462  
						
							2019-07-21 18:08:02 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									ThibG 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								f1597e1ab9 
								
							 
						 
						
							
							
								
								Merge pull request  #1158  from ThibG/glitch-soc/merge-upstream  
							
							... 
							
							
							
							Merge upstream changes 
							
						 
						
							2019-07-21 00:53:28 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Lady Lumb 
								
							 
						 
						
							
							
							
							
								
							
							
								0ed0c77266 
								
							 
						 
						
							
							
								
								Add env variable to control search limit  
							
							... 
							
							
							
							Changed the default search limit to allow a variable called MAX_SEARCH_RESULTS in the .env.production file to change the maximum search results limit. 
							
						 
						
							2019-07-20 16:39:48 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Thibaut Girka 
								
							 
						 
						
							
							
							
							
								
							
							
								055450bc02 
								
							 
						 
						
							
							
								
								Merge branch 'master' into glitch-soc/merge-upstream  
							
							
							
						 
						
							2019-07-19 23:37:41 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									ThibG 
								
							 
						 
						
							
							
							
							
								
							
							
								650459f93c 
								
							 
						 
						
							
							
								
								Fix some flash notices/alerts staying on unrelated pages ( #11364 )  
							
							
							
						 
						
							2019-07-19 23:13:21 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Thibaut Girka 
								
							 
						 
						
							
							
							
							
								
							
							
								249991c498 
								
							 
						 
						
							
							
								
								Merge branch 'master' into glitch-soc/merge-upstream  
							
							... 
							
							
							
							Conflicts:
- Gemfile.lock
- app/controllers/accounts_controller.rb
- app/controllers/admin/dashboard_controller.rb
- app/controllers/follower_accounts_controller.rb
- app/controllers/following_accounts_controller.rb
- app/controllers/remote_follow_controller.rb
- app/controllers/stream_entries_controller.rb
- app/controllers/tags_controller.rb
- app/javascript/packs/public.js
- app/lib/sanitize_config.rb
- app/models/account.rb
- app/models/form/admin_settings.rb
- app/models/media_attachment.rb
- app/models/stream_entry.rb
- app/models/user.rb
- app/serializers/initial_state_serializer.rb
- app/services/batched_remove_status_service.rb
- app/services/post_status_service.rb
- app/services/process_mentions_service.rb
- app/services/reblog_service.rb
- app/services/remove_status_service.rb
- app/views/admin/settings/edit.html.haml
- config/locales/simple_form.pl.yml
- config/settings.yml
- docker-compose.yml 
							
						 
						
							2019-07-19 18:26:49 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									ThibG 
								
							 
						 
						
							
							
							
							
								
							
							
								730c4053d6 
								
							 
						 
						
							
							
								
								Add ActivityPub actor representing the entire server ( #11321 )  
							
							... 
							
							
							
							* Add support for an instance actor
* Skip username validation for local Application accounts
* Add migration script to create instance actor
* Make Codeclimate happy
* Switch to id -99 for instance actor
* Remove unused `icon` and `image` attributes from instance actor
* Use if/elsif/else instead of return + ternary operator
* Add instance actor to fresh installs
* Use instance actor as instance representative
Use instance actor for forwarding reports, relay operations, and spam
auto-reporting.
* Seed database in test environment
* Fix single-user mode
* Fix tests
* Fix specs to accomodate for an extra `Account`
* Auto-reject follows on instance actor
Following an instance actor might make sense, but we are not handling that
right now, so auto-reject.
* Fix webfinger lookup and serialization for instance actor
* Rename instance actor
* Make it clear in the HTML view that the instance actor should not be blocked
* Raise cache time for instance actor as there's no dynamic content
* Re-use /about/more with a flash message for instance actor profile 
							
						 
						
							2019-07-19 01:44:42 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									ThibG 
								
							 
						 
						
							
							
							
							
								
							
							
								7e2b6da57f 
								
							 
						 
						
							
							
								
								Add setting to disable the anti-spam ( #11296 )  
							
							... 
							
							
							
							* Add environment variable to disable the anti-spam
* Move antispam setting to admin settings
* Fix typo
* antispam → spam_check 
							
						 
						
							2019-07-17 21:09:15 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Eugen Rochko 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								fccd25cf53 
								
							 
						 
						
							
							
								
								Change terms and privacy policy pages to always be accessible ( #11334 )  
							
							... 
							
							
							
							Fix  #11328  
						
							2019-07-17 19:29:37 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									ThibG 
								
							 
						 
						
							
							
							
							
								
							
							
								873828ad2d 
								
							 
						 
						
							
							
								
								Fix custom CSS controller ( #11336 )  
							
							
							
						 
						
							2019-07-17 17:14:25 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									ThibG 
								
							 
						 
						
							
							
							
							
								
							
							
								15ddabf95a 
								
							 
						 
						
							
							
								
								Fix caching headers in ActivityPub endpoints ( #11331 )  
							
							... 
							
							
							
							* Fix reverse-proxy caching in public fetch mode
* Fix caching in ActivityPub-specific controllers 
							
						 
						
							2019-07-17 00:00:39 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Eugen Rochko 
								
							 
						 
						
							
							
							
							
								
							
							
								729723f857 
								
							 
						 
						
							
							
								
								Add option to disable real-time updates in web UI ( #9984 )  
							
							... 
							
							
							
							Fix  #9031 
Fix  #7913  
						
							2019-07-16 16:11:50 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Eugen Rochko 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								9b1d3e4acb 
								
							 
						 
						
							
							
								
								Add option to disable real-time updates in web UI ( #9984 )  
							
							... 
							
							
							
							Fix  #9031 
Fix  #7913  
						
							2019-07-16 06:30:47 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Eugen Rochko 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								5bf67ca913 
								
							 
						 
						
							
							
								
								Add ActivityPub secure mode ( #11269 )  
							
							... 
							
							
							
							* Add HTTP signature requirement for served ActivityPub resources
* Change `SECURE_MODE` to `AUTHORIZED_FETCH`
* Add 'Signature' to 'Vary' header and improve code style
* Improve code style by adding `public_fetch_mode?` method 
							
						 
						
							2019-07-11 20:11:09 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Eugen Rochko 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								4e92183227 
								
							 
						 
						
							
							
								
								Refactor domain block checks ( #11268 )  
							
							
							
						 
						
							2019-07-09 03:27:35 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Eugen Rochko 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								ef15246397 
								
							 
						 
						
							
							
								
								Remove unused remote unfollow controller ( #11250 )  
							
							
							
						 
						
							2019-07-08 12:04:06 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Eugen Rochko 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								63c7fe8e48 
								
							 
						 
						
							
							
								
								Refactor controllers for statuses, accounts, and more ( #11249 )  
							
							
							
						 
						
							2019-07-08 12:03:45 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Eugen Rochko 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								b851456139 
								
							 
						 
						
							
							
								
								Remove Atom feeds and old URLs in the form of GET /:username/updates/:id ( #11247 )  
							
							
							
						 
						
							2019-07-07 16:16:51 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Thibaut Girka 
								
							 
						 
						
							
							
							
							
								
							
							
								7039dca12c 
								
							 
						 
						
							
							
								
								Merge commit 'c07cca4727041ea5a5721acbc603d4bfb45a15a6' into glitch-soc/merge-upstream  
							
							... 
							
							
							
							Unlike upstream, kept the direct timeline endpoint, as it is still of use in
glitch-soc. 
							
						 
						
							2019-07-07 13:49:31 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Eugen Rochko 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								23aeef52cc 
								
							 
						 
						
							
							
								
								Remove Salmon and PubSubHubbub ( #11205 )  
							
							... 
							
							
							
							* Remove Salmon and PubSubHubbub endpoints
* Add error when trying to follow OStatus accounts
* Fix new accounts not being created in ResolveAccountService 
							
						 
						
							2019-07-06 23:26:16 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Eugen Rochko 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								0c1b1069c9 
								
							 
						 
						
							
							
								
								Remove deprecated REST API GET /api/v1/statuses/:id/card ( #11213 )  
							
							
							
						 
						
							2019-07-05 02:15:24 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Eugen Rochko 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								3fd6ab99e6 
								
							 
						 
						
							
							
								
								Remove deprecated REST API GET /api/v1/timelines/direct ( #11212 )  
							
							
							
						 
						
							2019-07-05 02:14:56 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Thibaut Girka 
								
							 
						 
						
							
							
							
							
								
							
							
								3922b518f7 
								
							 
						 
						
							
							
								
								Merge branch 'master' into glitch-soc/merge-upstream  
							
							
							
						 
						
							2019-06-28 21:36:50 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Eugen Rochko 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								e64e6a03dd 
								
							 
						 
						
							
							
								
								Add categories for custom emojis ( #11196 )  
							
							... 
							
							
							
							Fix  #7940  
						
							2019-06-28 15:54:10 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Thibaut Girka 
								
							 
						 
						
							
							
							
							
								
							
							
								ca17bae904 
								
							 
						 
						
							
							
								
								Use a redis-cached feed for the DM timeline  
							
							
							
						 
						
							2019-06-27 16:44:12 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Thibaut Girka 
								
							 
						 
						
							
							
							
							
								
							
							
								aaec64a500 
								
							 
						 
						
							
							
								
								Merge branch 'master' into glitch-soc/merge-upstream  
							
							... 
							
							
							
							Conflicts:
- app/controllers/settings/preferences_controller.rb
- app/lib/user_settings_decorator.rb
- app/models/user.rb
- config/locales/simple_form.en.yml 
							
						 
						
							2019-06-26 23:19:22 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									ThibG 
								
							 
						 
						
							
							
							
							
								
							
							
								3086c645fd 
								
							 
						 
						
							
							
								
								Add option to disable blurhash previews ( #11188 )  
							
							... 
							
							
							
							* Add option to disable blurhash previews
* Update option text
* Change options order 
							
						 
						
							2019-06-26 19:33:04 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Eugen Rochko 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								6836587117 
								
							 
						 
						
							
							
								
								Fix unnecessary SQL query performed on unauthenticated requests ( #11179 )  
							
							
							
						 
						
							2019-06-25 20:18:15 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Thibaut Girka 
								
							 
						 
						
							
							
							
							
								
							
							
								ddd875ad99 
								
							 
						 
						
							
							
								
								Merge branch 'master' into glitch-soc/merge-upstream  
							
							... 
							
							
							
							Conflicts:
- app/models/media_attachment.rb
  Upstream added audio attachment support
- app/serializers/initial_state_serializer.rb
  Upstream added audio attachment support and how mimetypes are returned
- app/serializers/rest/instance_serializer.rb
  Upstream added a few fields
- config/application.rb
  Upstream added a different paperclip transcoder 
							
						 
						
							2019-06-24 15:02:59 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Eugen Rochko 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								707ddf7808 
								
							 
						 
						
							
							
								
								Change domain blocks to automatically support subdomains ( #11138 )  
							
							... 
							
							
							
							* Change domain blocks to automatically support subdomains
If a more authoritative domain is blocked (example.com), then the
same block will be applied to a subdomain (foo.example.com)
* Match subdomains of existing accounts when blocking/unblocking domains
* Improve code style 
							
						 
						
							2019-06-22 00:13:10 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Eugen Rochko 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								7696f77245 
								
							 
						 
						
							
							
								
								Add moderation API ( #9387 )  
							
							... 
							
							
							
							Fix  #8580 
Fix  #7143  
						
							2019-06-20 02:52:34 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Acid Chicken (硫酸鶏) 
								
							 
						 
						
							
							
							
							
								
							
							
								33144e132d 
								
							 
						 
						
							
							
								
								Fix layout of identity proofs settings ( #11126 )  
							
							
							
						 
						
							2019-06-20 02:18:06 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Eugen Rochko 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								f7f23b4a19 
								
							 
						 
						
							
							
								
								Add audio uploads ( #11123 )  
							
							... 
							
							
							
							* Add audio uploads
Fix  #4827 
Accept uploads of OGG, WAV, FLAC, OPUS and MP3 files, and converts
them to OGG. Media attachments get a new `audio` type. In the UI,
audio uploads are displayed identically to video uploads.
* Improve code style 
							
						 
						
							2019-06-19 23:42:38 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Thibaut Girka 
								
							 
						 
						
							
							
							
							
								
							
							
								1b0ff4cd69 
								
							 
						 
						
							
							
								
								Merge branch 'master' into glitch-soc/merge-upstream  
							
							... 
							
							
							
							Conflicts:
- app/controllers/settings/notifications_controller.rb
- app/javascript/packs/public.js
- app/views/settings/preferences/show.html.haml
- app/views/stream_entries/_simple_status.html.haml
- config/locales/simple_form.en.yml
- config/locales/simple_form.pl.yml
- config/navigation.rb
- config/routes.rb 
							
						 
						
							2019-06-10 18:59:53 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Eugen Rochko 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								8514ef723c 
								
							 
						 
						
							
							
								
								Fix login sometimes redirecting to paths that are not pages ( #11019 )  
							
							... 
							
							
							
							Fix  #11016  
						
							2019-06-10 12:28:13 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Thibaut Girka 
								
							 
						 
						
							
							
							
							
								
							
							
								34b8346e7f 
								
							 
						 
						
							
							
								
								Merge branch 'master' into glitch-soc/merge-upstream  
							
							... 
							
							
							
							Conflicts:
- app/controllers/statuses_controller.rb
- app/controllers/stream_entries_controller.rb 
							
						 
						
							2019-06-07 17:00:36 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Eugen Rochko 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								560ec24e58 
								
							 
						 
						
							
							
								
								Change /settings/preferences to redirect to appearance, add /settings/preferences/other ( #10988 )  
							
							
							
						 
						
							2019-06-07 16:51:08 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Eugen Rochko 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								1db4117030 
								
							 
						 
						
							
							
								
								Change preferences page into appearance, notifications, and other ( #10977 )  
							
							
							
						 
						
							2019-06-07 03:39:24 +02:00