795f0107d2 
								
							 
						 
						
							
							
								
								Include preview cards in status entity in REST API ( #9120 )  
							
							... 
							
							
							
							* Include preview cards in status entity in REST API
* Display preview card in-stream
* Improve in-stream display of preview cards 
							
						 
						
							2018-10-28 06:35:03 +01:00  
				
					
						
							
							
								 
						
							
								ee1f1a2ec9 
								
							 
						 
						
							
							
								
								When searching for an emoji with multiple separators, consider the full input  
							
							... 
							
							
							
							e.g., typing “blob_cat_p” used to search for “blob” and “cat”, but not
“blob_cat_p”, which means “blob_cat_patpat” is very unlikely to show up,
although it is likely what the user wanted to type in the first place. 
							
						 
						
							2018-10-27 22:45:11 +02:00  
				
					
						
							
							
								 
						
							
								a90b569350 
								
							 
						 
						
							
							
								
								When searching for an emoji with multiple separators, consider the full input ( #9124 )  
							
							... 
							
							
							
							e.g., typing “blob_cat_p” used to search for “blob” and “cat”, but not
“blob_cat_p”, which means “blob_cat_patpat” is very unlikely to show up,
although it is likely what the user wanted to type in the first place. 
							
						 
						
							2018-10-27 22:32:54 +02:00  
				
					
						
							
							
								 
						
							
								8f4fab65a1 
								
							 
						 
						
							
							
								
								Do not rely on hover for upload form options if touch is used  
							
							
							
						 
						
							2018-10-27 19:06:49 +02:00  
				
					
						
							
							
								 
						
							
								008f98b304 
								
							 
						 
						
							
							
								
								[Glitch] RTL: fix column-back-button__icon margins/content  
							
							... 
							
							
							
							Port 6e1a4f85ad 
							
						 
						
							2018-10-27 18:55:11 +02:00  
				
					
						
							
							
								 
						
							
								c13cfeac09 
								
							 
						 
						
							
							
								
								Merge branch 'master' into glitch-soc/merge-upstream  
							
							
							
						 
						
							2018-10-27 18:54:26 +02:00  
				
					
						
							
							
								 
						
							
								6e1a4f85ad 
								
							 
						 
						
							
							
								
								RTL: fix column-back-button__icon margins/content ( #9112 )  
							
							... 
							
							
							
							* RTL: fix column-back-button__icon margins/content
* Update rtl.scss
* Update rtl.scss 
							
						 
						
							2018-10-26 22:49:39 +02:00  
				
					
						
							
							
								 
						
							
								5bb8563f6c 
								
							 
						 
						
							
							
								
								Merge branch 'master' into glitch-soc/merge-upstream  
							
							... 
							
							
							
							Conflicts:
- app/controllers/admin/base_controller.rb
- app/controllers/filters_controller.rb
- app/controllers/invites_controller.rb
- app/controllers/settings/deletes_controller.rb
- app/controllers/settings/exports_controller.rb
- app/controllers/settings/follower_domains_controller.rb
- app/controllers/settings/migrations_controller.rb
- app/controllers/settings/notifications_controller.rb
- app/controllers/settings/preferences_controller.rb
- app/controllers/settings/two_factor_authentication/recovery_codes_controller.rb
- app/javascript/packs/public.js
- app/views/settings/profiles/show.html.haml
Conflicts were mostly due to the addition of body classes to the settings page,
this was caused by rejecting upstream changes for most of those files and
modifying Settings::BaseController instead.
Another cause of conflicts was the deletion of client-side checking of
display name / bio length, this was modified in app/javascript/core/settings.js
instead. 
							
						 
						
							2018-10-26 20:41:43 +02:00  
				
					
						
							
							
								 
						
							
								161aeadbb4 
								
							 
						 
						
							
							
								
								Remove character counter from edit profile ( #9100 )  
							
							... 
							
							
							
							* Remove display name and bio counter hint, simply limit input
* Remove now redundant translations
* Fix code style issue 
							
						 
						
							2018-10-26 01:55:24 +02:00  
				
					
						
							
							
								 
						
							
								768b0f132d 
								
							 
						 
						
							
							
								
								Fix direct messages column not loading more items on scroll ( #9102 )  
							
							... 
							
							
							
							Fix  #9097  
						
							2018-10-26 01:55:08 +02:00  
				
					
						
							
							
								 
						
							
								a2e3401e48 
								
							 
						 
						
							
							
								
								Fix conversations not being marked read on click ( #9103 )  
							
							... 
							
							
							
							Fix  #9096  
						
							2018-10-26 01:54:58 +02:00  
				
					
						
							
							
								 
						
							
								d723f2a0a8 
								
							 
						 
						
							
							
								
								Fix RTL layout of status display names ( #9075 )  
							
							... 
							
							
							
							Fix  #2350  
						
							2018-10-24 18:18:08 +02:00  
				
					
						
							
							
								 
						
							
								288e435fe5 
								
							 
						 
						
							
							
								
								Show upload options on click as well as hover ( #9074 )  
							
							... 
							
							
							
							Fix  #8918  
						
							2018-10-24 18:17:15 +02:00  
				
					
						
							
							
								 
						
							
								01c169e796 
								
							 
						 
						
							
							
								
								Fix JS error when posting from page without router context ( #9073 )  
							
							... 
							
							
							
							Fix  #9057  
						
							2018-10-24 01:31:31 +02:00  
				
					
						
							
							
								 
						
							
								8f3096b846 
								
							 
						 
						
							
							
								
								Merge branch 'master' into glitch-soc/merge-upstream  
							
							
							
						 
						
							2018-10-23 17:15:57 +02:00  
				
					
						
							
							
								 
						
							
								39abec4d25 
								
							 
						 
						
							
							
								
								Fix public timelines not instantly updating on compose ( #9050 )  
							
							... 
							
							
							
							Fix  #9034  
						
							2018-10-23 00:43:18 +02:00  
				
					
						
							
							
								 
						
							
								ad510db3a1 
								
							 
						 
						
							
							
								
								Show suggested follows on search screen in mobile layout ( #9010 )  
							
							... 
							
							
							
							Reminder: Suggestions were added in #7918  and are based on who you
interact with who you do not follow. E.g. if you boost someone a lot
from seeing other people's boosts of that person, it makes sense you
might be interested in following the original source; or if you reply
to someone a lot, maybe you'd want to follow them
Each suggestion can be dismissed 
							
						 
						
							2018-10-23 00:08:39 +02:00  
				
					
						
							
							
								 
						
							
								81017eaea7 
								
							 
						 
						
							
							
								
								Revert "RTL: remove blank character inside bdi ( #9038 )" ( #9056 )  
							
							... 
							
							
							
							This reverts commit c7e9f9ff1e 
							
						 
						
							2018-10-22 23:23:00 +02:00  
				
					
						
							
							
								 
						
							
								0c7f710be1 
								
							 
						 
						
							
							
								
								[Glitch] Surround mid-text display names with bdi tags  
							
							... 
							
							
							
							Port 7861c5f108 
							
						 
						
							2018-10-22 18:57:20 +02:00  
				
					
						
							
							
								 
						
							
								323ae1403a 
								
							 
						 
						
							
							
								
								[Glitch] fix: initial state of PrivacyDropdown is should not be null  
							
							... 
							
							
							
							Port bebe8ec887 
							
						 
						
							2018-10-22 18:41:34 +02:00  
				
					
						
							
							
								 
						
							
								1bb23d0407 
								
							 
						 
						
							
							
								
								[Glitch] RTL: fix cardbar margins and alignment  
							
							... 
							
							
							
							Port c73864c137 
							
						 
						
							2018-10-22 18:39:37 +02:00  
				
					
						
							
							
								 
						
							
								c9b19e05e2 
								
							 
						 
						
							
							
								
								[Glitch] RTL: fix admin account avatar margin in about page  
							
							... 
							
							
							
							Port 3a157210c8 
							
						 
						
							2018-10-22 18:38:52 +02:00  
				
					
						
							
							
								 
						
							
								c14be538a6 
								
							 
						 
						
							
							
								
								[Glitch] RTL: fix column settings toggle label  
							
							... 
							
							
							
							Port bf58461d36 
							
						 
						
							2018-10-22 18:38:11 +02:00  
				
					
						
							
							
								 
						
							
								a1f512f18b 
								
							 
						 
						
							
							
								
								[Glitch] Fix domain label position and color  
							
							... 
							
							
							
							Port 25f9ead041 
							
						 
						
							2018-10-22 18:37:17 +02:00  
				
					
						
							
							
								 
						
							
								9950db2e1c 
								
							 
						 
						
							
							
								
								[Glitch] RTL: fix preferences layout  
							
							... 
							
							
							
							Port 029943d59b 
							
						 
						
							2018-10-22 18:34:48 +02:00  
				
					
						
							
							
								 
						
							
								076f0a0eb6 
								
							 
						 
						
							
							
								
								[Glitch] Fix admin account avatar margin  
							
							... 
							
							
							
							Port 065b39e7a4 
							
						 
						
							2018-10-22 18:33:35 +02:00  
				
					
						
							
							
								 
						
							
								aa277ab5fb 
								
							 
						 
						
							
							
								
								[Glitch] RTL: fix user stats in about page  
							
							... 
							
							
							
							Port 301cbcc980 
							
						 
						
							2018-10-22 18:31:50 +02:00  
				
					
						
							
							
								 
						
							
								ef9c11e050 
								
							 
						 
						
							
							
								
								[Glitch] RTL: fix domain append at signup form  
							
							... 
							
							
							
							Port 65b3804a6c 
							
						 
						
							2018-10-22 18:31:50 +02:00  
				
					
						
							
							
								 
						
							
								e18724363d 
								
							 
						 
						
							
							
								
								[Glitch] Fixes 8987 broken alignment at "Remote interaction dialog"  
							
							... 
							
							
							
							Port d35801aaa2 
							
						 
						
							2018-10-22 18:31:50 +02:00  
				
					
						
							
							
								 
						
							
								1139b758c5 
								
							 
						 
						
							
							
								
								[Glitch] RTL: fix admin account margins in about page  
							
							... 
							
							
							
							Port f8c1b32541 
							
						 
						
							2018-10-22 18:31:50 +02:00  
				
					
						
							
							
								 
						
							
								bf9c4b6d98 
								
							 
						 
						
							
							
								
								[Glitch] undo part of PR 8202 to fix RTL  
							
							... 
							
							
							
							Port efd09e2ebb 
							
						 
						
							2018-10-22 18:22:01 +02:00  
				
					
						
							
							
								 
						
							
								9f1c9b6135 
								
							 
						 
						
							
							
								
								[Glitch] Improve style of notice/alert messages  
							
							... 
							
							
							
							Port b972478812 
							
						 
						
							2018-10-22 18:20:43 +02:00  
				
					
						
							
							
								 
						
							
								dcded13a99 
								
							 
						 
						
							
							
								
								Merge branch 'master' into glitch-soc/merge-upstream  
							
							... 
							
							
							
							Conflicts:
- .github/ISSUE_TEMPLATE/bug_report.md
  Took our version.
- CONTRIBUTING.md
  Updated the embedded copy of upstream's version.
- README.md
  Took our version.
- app/policies/status_policy.rb
  Not a real conflict, took code from both.
- app/views/layouts/embedded.html.haml
  Added upstream's changes (dns-prefetch) and fixed
  `%body.embed`
- app/views/settings/preferences/show.html.haml
  Reverted some of upstream changes, as we have a
  page dedicated for flavours and skins.
- config/initializers/content_security_policy.rb
  Kept our version of the CSP.
- config/initializers/doorkeeper.rb
  Not a real conflict, took code from both. 
							
						 
						
							2018-10-22 17:51:38 +02:00  
				
					
						
							
							
								 
						
							
								c7e9f9ff1e 
								
							 
						 
						
							
							
								
								RTL: remove blank character inside bdi ( #9038 )  
							
							... 
							
							
							
							* RTL: remove blank character inside bdi
* Update app/javascript/mastodon/components/display_name.js
Co-Authored-By: mabkenar <ampbox@gmail.com> 
							
						 
						
							2018-10-22 01:04:32 +02:00  
				
					
						
							
							
								 
						
							
								c73864c137 
								
							 
						 
						
							
							
								
								RTL: fix cardbar margins and alignment ( #9044 )  
							
							
							
						 
						
							2018-10-21 18:37:57 +02:00  
				
					
						
							
							
								 
						
							
								3a157210c8 
								
							 
						 
						
							
							
								
								RTL: fix admin account avatar margin in about page ( #9039 )  
							
							... 
							
							
							
							* RTL: fix admin account avatar margin in about page
* fix code style 
							
						 
						
							2018-10-21 16:45:08 +02:00  
				
					
						
							
							
								 
						
							
								04bedd237b 
								
							 
						 
						
							
							
								
								Attempt at fixing inline video player  
							
							
							
						 
						
							2018-10-21 16:09:07 +02:00  
				
					
						
							
							
								 
						
							
								dfa5b0576f 
								
							 
						 
						
							
							
								
								Update mediaGallery component's width when opening CWs  
							
							
							
						 
						
							2018-10-21 16:09:07 +02:00  
				
					
						
							
							
								 
						
							
								bf58461d36 
								
							 
						 
						
							
							
								
								RTL: fix column settings toggle label ( #9037 )  
							
							
							
						 
						
							2018-10-21 20:31:40 +09:00  
				
					
						
							
							
								 
						
							
								25f9ead041 
								
							 
						 
						
							
							
								
								Fix domain label position and color ( #9033 )  
							
							... 
							
							
							
							* Fix position of the domain label
* Fix position of the domain label for RTL
- Fix color mismatch of linear gradient which assigned to "::after" pseudo class 
							
						 
						
							2018-10-21 14:35:25 +09:00  
				
					
						
							
							
								 
						
							
								e4c3ea1809 
								
							 
						 
						
							
							
								
								Force sensitive content flag when posting a toot with a CW  
							
							... 
							
							
							
							Indeed, when the “Always enable the Content Warning field” setting is enabled,
sending a content-less toot with a CW would move the CW to the toot's content
and leave the toot not marked as sensitive. 
							
						 
						
							2018-10-20 17:06:21 +02:00  
				
					
						
							
							
								 
						
							
								13c3fa8d36 
								
							 
						 
						
							
							
								
								Focus the UI when pressing Escape in the CW field  
							
							
							
						 
						
							2018-10-20 15:00:39 +02:00  
				
					
						
							
							
								 
						
							
								fd5285658f 
								
							 
						 
						
							
							
								
								Add option to block reports from domain ( #8830 )  
							
							
							
						 
						
							2018-10-20 08:02:44 +02:00  
				
					
						
							
							
								 
						
							
								eb1b9903a6 
								
							 
						 
						
							
							
								
								Redesign direct messages column ( #9022 )  
							
							
							
						 
						
							2018-10-20 02:23:58 +02:00  
				
					
						
							
							
								 
						
							
								029943d59b 
								
							 
						 
						
							
							
								
								RTL: fix preferences layout ( #9021 )  
							
							
							
						 
						
							2018-10-20 01:05:17 +02:00  
				
					
						
							
							
								 
						
							
								065b39e7a4 
								
							 
						 
						
							
							
								
								Fix admin account avatar margin ( #9020 )  
							
							
							
						 
						
							2018-10-19 20:35:42 +02:00  
				
					
						
							
							
								 
						
							
								301cbcc980 
								
							 
						 
						
							
							
								
								RTL: fix user stats in about page ( #9018 )  
							
							
							
						 
						
							2018-10-19 20:16:13 +09:00  
				
					
						
							
							
								 
						
							
								a38a452481 
								
							 
						 
						
							
							
								
								Add unread indicator to conversations ( #9009 )  
							
							
							
						 
						
							2018-10-19 01:47:29 +02:00  
				
					
						
							
							
								 
						
							
								bebe8ec887 
								
							 
						 
						
							
							
								
								fix: initial state of PrivacyDropdown is should not be null ( #9008 )  
							
							
							
						 
						
							2018-10-19 00:00:19 +02:00  
				
					
						
							
							
								 
						
							
								65b3804a6c 
								
							 
						 
						
							
							
								
								RTL: fix domain append at signup form ( #9007 )  
							
							
							
						 
						
							2018-10-18 21:19:31 +02:00  
				
					
						
							
							
								 
						
							
								007f7690fa 
								
							 
						 
						
							
							
								
								Fix fav/boosts hotkeys not working on detailed statuses ( #9006 )  
							
							
							
						 
						
							2018-10-18 19:52:00 +02:00  
				
					
						
							
							
								 
						
							
								b13c34de3a 
								
							 
						 
						
							
							
								
								Fix fav/boosts hotkeys not working on detailed statuses  
							
							
							
						 
						
							2018-10-18 19:00:59 +02:00  
				
					
						
							
							
								 
						
							
								f8c1b32541 
								
							 
						 
						
							
							
								
								RTL: fix admin account margins in about page ( #9005 )  
							
							
							
						 
						
							2018-10-18 14:35:49 +02:00  
				
					
						
							
							
								 
						
							
								adb06baef6 
								
							 
						 
						
							
							
								
								Handle global hotkeys even when no element has focus ( #8998 )  
							
							... 
							
							
							
							This fixes hotkeys not working when pressing the column
“back” button, for instance. 
							
						 
						
							2018-10-17 16:56:16 +02:00  
				
					
						
							
							
								 
						
							
								d35801aaa2 
								
							 
						 
						
							
							
								
								Fixes 8987 broken alignment at "Remote interaction dialog" ( #8988 )  
							
							
							
						 
						
							2018-10-15 16:09:08 +02:00  
				
					
						
							
							
								 
						
							
								efd09e2ebb 
								
							 
						 
						
							
							
								
								undo part of PR 8202 to fix RTL ( #8979 )  
							
							
							
						 
						
							2018-10-15 04:39:20 +02:00  
				
					
						
							
							
								 
						
							
								b0527a4ce7 
								
							 
						 
						
							
							
								
								Handle alt+enter in the spoiler input as shortcut for secondary post  
							
							... 
							
							
							
							Fixes  #780  
						
							2018-10-14 12:00:21 +02:00  
				
					
						
							
							
								 
						
							
								b972478812 
								
							 
						 
						
							
							
								
								Improve style of notice/alert messages ( #8973 )  
							
							
							
						 
						
							2018-10-13 01:51:30 +02:00  
				
					
						
							
							
								 
						
							
								7d182442a7 
								
							 
						 
						
							
							
								
								Weblate translations (2018-10-12) ( #8972 )  
							
							... 
							
							
							
							* Translated using Weblate (Welsh)
Currently translated at 64.4% (448 of 696 strings)
Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/cy/ 
* Translated using Weblate (Arabic)
Currently translated at 98.0% (682 of 696 strings)
Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/ar/ 
* Translated using Weblate (French)
Currently translated at 99.9% (695 of 696 strings)
Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/fr/ 
* Translated using Weblate (Arabic)
Currently translated at 94.3% (82 of 87 strings)
Translation: Mastodon/Preferences
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/ar/ 
* Translated using Weblate (Welsh)
Currently translated at 88.7% (297 of 335 strings)
Translation: Mastodon/React
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/cy/ 
* Translated using Weblate (French)
Currently translated at 100.0% (335 of 335 strings)
Translation: Mastodon/React
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/fr/ 
* Translated using Weblate (French)
Currently translated at 100,0% (87 of 87 strings)
Translation: Mastodon/Preferences
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/fr/ 
* Translated using Weblate (Czech)
Currently translated at 100.0% (335 of 335 strings)
Translation: Mastodon/React
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/cs/ 
* Translated using Weblate (Czech)
Currently translated at 100.0% (87 of 87 strings)
Translation: Mastodon/Preferences
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/cs/ 
* Translated using Weblate (Czech)
Currently translated at 99.9% (695 of 696 strings)
Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/cs/ 
* Translated using Weblate (Persian)
Currently translated at 100.0% (335 of 335 strings)
Translation: Mastodon/React
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/fa/ 
* Translated using Weblate (Arabic)
Currently translated at 94.6% (88 of 93 strings)
Translation: Mastodon/Preferences
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/ar/ 
* Translated using Weblate (Arabic)
Currently translated at 100.0% (335 of 335 strings)
Translation: Mastodon/React
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/ar/ 
* Translated using Weblate (Czech)
Currently translated at 100.0% (93 of 93 strings)
Translation: Mastodon/Preferences
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/cs/ 
* Translated using Weblate (Galician)
Currently translated at 100,0% (93 of 93 strings)
Translation: Mastodon/Preferences
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/gl/ 
* Translated using Weblate (Galician)
Currently translated at 100,0% (696 of 696 strings)
Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/gl/ 
* Translated using Weblate (Greek)
Currently translated at 100.0% (93 of 93 strings)
Translation: Mastodon/Preferences
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/el/ 
* Translated using Weblate (Greek)
Currently translated at 98.8% (331 of 335 strings)
Translation: Mastodon/React
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/el/ 
* Translated using Weblate (Greek)
Currently translated at 99.7% (694 of 696 strings)
Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/el/ 
* Translated using Weblate (Persian)
Currently translated at 100.0% (93 of 93 strings)
Translation: Mastodon/Preferences
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/fa/ 
* Translated using Weblate (Czech)
Currently translated at 99.9% (695 of 696 strings)
Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/cs/ 
* Translated using Weblate (French)
Currently translated at 100,0% (93 of 93 strings)
Translation: Mastodon/Preferences
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/fr/ 
* Translated using Weblate (French)
Currently translated at 99.9% (695 of 696 strings)
Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/fr/ 
* Translated using Weblate (Japanese)
Currently translated at 99.4% (692 of 696 strings)
Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/ja/ 
* Translated using Weblate (Corsican)
Currently translated at 100.0% (93 of 93 strings)
Translation: Mastodon/Preferences
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/co/ 
* Translated using Weblate (Corsican)
Currently translated at 99.9% (695 of 696 strings)
Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/co/ 
* Translated using Weblate (German)
Currently translated at 99.6% (693 of 696 strings)
Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/de/ 
* Translated using Weblate (German)
Currently translated at 100,0% (93 of 93 strings)
Translation: Mastodon/Preferences
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/de/ 
* Translated using Weblate (Japanese)
Currently translated at 99.4% (692 of 696 strings)
Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/ja/ 
* Translated using Weblate (Japanese)
Currently translated at 99.9% (695 of 696 strings)
Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/ja/ 
* Translated using Weblate (Japanese)
Currently translated at 100.0% (335 of 335 strings)
Translation: Mastodon/React
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/ja/ 
* Translated using Weblate (Japanese)
Currently translated at 94.6% (88 of 93 strings)
Translation: Mastodon/Preferences
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/ja/ 
* i18n-tasks normalize
* yarn manage:translations 
							
						 
						
							2018-10-13 01:51:14 +02:00  
				
					
						
							
							
								 
						
							
								70d346ea95 
								
							 
						 
						
							
							
								
								Fix auto-unfold CWs when no regexp is set  
							
							... 
							
							
							
							Fixes  #778  
						
							2018-10-12 23:34:26 +02:00  
				
					
						
							
							
								 
						
							
								9d4541c612 
								
							 
						 
						
							
							
								
								Display customized mascot in web UI and fix admin form for it ( #8964 )  
							
							... 
							
							
							
							Follow-up to #8766  
							
						 
						
							2018-10-12 04:04:08 +02:00  
				
					
						
							
							
								 
						
							
								0075964244 
								
							 
						 
						
							
							
								
								Merge pull request  #775  from ThibG/glitch-soc/merge-upstream  
							
							... 
							
							
							
							Merge upstream changes 
							
						 
						
							2018-10-11 21:28:03 +02:00  
				
					
						
							
							
								 
						
							
								87fdd139b8 
								
							 
						 
						
							
							
								
								Do not push DMs into the home feed ( #8940 )  
							
							... 
							
							
							
							* Do not push DMs into the home feed
* Show DMs column after sending a DM, if DMs column is not already shown 
							
						 
						
							2018-10-11 01:31:03 +02:00  
				
					
						
							
							
								 
						
							
								bb1103d974 
								
							 
						 
						
							
							
								
								Really fix HotKeys  
							
							
							
						 
						
							2018-10-10 17:40:06 +02:00  
				
					
						
							
							
								 
						
							
								a02244f17c 
								
							 
						 
						
							
							
								
								Merge branch 'master' into glitch-soc/merge-upstream  
							
							... 
							
							
							
							Conflicts:
	app/javascript/packs/public.js
Changes made to app/javascript/packs/publics.js were applied to
app/javascript/core/settings.js 
							
						 
						
							2018-10-09 21:08:26 +02:00  
				
					
						
							
							
								 
						
							
								e50cb5f4bd 
								
							 
						 
						
							
							
								
								Fix that the copy button of verify link did not work. ( #8938 )  
							
							
							
						 
						
							2018-10-09 19:36:13 +02:00  
				
					
						
							
							
								 
						
							
								269edc0e48 
								
							 
						 
						
							
							
								
								Fix CW icon color in local-settings modal  
							
							
							
						 
						
							2018-10-09 18:10:54 +02:00  
				
					
						
							
							
								 
						
							
								721aec40cd 
								
							 
						 
						
							
							
								
								Define some local-settings hints  
							
							
							
						 
						
							2018-10-09 18:10:54 +02:00  
				
					
						
							
							
								 
						
							
								26409f3e8e 
								
							 
						 
						
							
							
								
								Add support for hints (or extended descriptions) in local-settings pages  
							
							
							
						 
						
							2018-10-09 18:10:54 +02:00  
				
					
						
							
							
								 
						
							
								5f308a7f05 
								
							 
						 
						
							
							
								
								When screen width is too narrow, hide local-settings page text, keep only icons  
							
							
							
						 
						
							2018-10-09 18:10:54 +02:00  
				
					
						
							
							
								 
						
							
								6cd793f0ac 
								
							 
						 
						
							
							
								
								Change “preferences” icon to match settings page icon  
							
							
							
						 
						
							2018-10-09 18:10:54 +02:00  
				
					
						
							
							
								 
						
							
								edb9ec8543 
								
							 
						 
						
							
							
								
								Add icons for each of the local-setting pages  
							
							
							
						 
						
							2018-10-09 18:10:54 +02:00  
				
					
						
							
							
								 
						
							
								122ac9cd1d 
								
							 
						 
						
							
							
								
								Merge branch 'master' into glitch-soc/merge-upstream  
							
							
							
						 
						
							2018-10-09 12:12:03 +02:00  
				
					
						
							
							
								 
						
							
								4134a10549 
								
							 
						 
						
							
							
								
								Merge pull request  #770  from ThibG/glitch-soc/merge-upstream  
							
							... 
							
							
							
							Merge upstream changes 
							
						 
						
							2018-10-09 12:11:14 +02:00  
				
					
						
							
							
								 
						
							
								d0b1369a85 
								
							 
						 
						
							
							
								
								Fix app-wide hotkeys randomly failing to work  
							
							
							
						 
						
							2018-10-09 12:10:51 +02:00  
				
					
						
							
							
								 
						
							
								87abbb07f3 
								
							 
						 
						
							
							
								
								Add Japanese translations. ( #8927 )  
							
							
							
						 
						
							2018-10-09 07:12:37 +09:00  
				
					
						
							
							
								 
						
							
								b368d3c15d 
								
							 
						 
						
							
							
								
								Merge branch 'master' into glitch-soc/merge-upstream  
							
							
							
						 
						
							2018-10-08 15:34:53 +02:00  
				
					
						
							
							
								 
						
							
								770e337497 
								
							 
						 
						
							
							
								
								Fixed error occurrence when pinning the DM column. ( #8922 )  
							
							
							
						 
						
							2018-10-08 14:43:38 +02:00  
				
					
						
							
							
								 
						
							
								d17844e6d1 
								
							 
						 
						
							
							
								
								Merge branch 'master' into glitch-soc/merge-upstream  
							
							
							
						 
						
							2018-10-08 13:51:33 +02:00  
				
					
						
							
							
								 
						
							
								96c3d26870 
								
							 
						 
						
							
							
								
								Move “Show action buttons in collapsed toots” option  
							
							
							
						 
						
							2018-10-08 13:49:25 +02:00  
				
					
						
							
							
								 
						
							
								faecb35fe0 
								
							 
						 
						
							
							
								
								Switch from selects to radio buttons for local settings, improve styling  
							
							
							
						 
						
							2018-10-08 13:49:25 +02:00  
				
					
						
							
							
								 
						
							
								774ac47373 
								
							 
						 
						
							
							
								
								Add conversations API ( #8832 )  
							
							... 
							
							
							
							* Add conversations API
* Add web UI for conversations
* Add test for conversations API
* Add tests for ConversationAccount
* Improve web UI
* Rename ConversationAccount to AccountConversation
* Remove conversations on block and mute
* Change last_status_id to be a denormalization of status_ids
* Add optimistic locking 
							
						 
						
							2018-10-07 23:44:58 +02:00  
				
					
						
							
							
								 
						
							
								a3677a828d 
								
							 
						 
						
							
							
								
								[Glitch] Change documentation URL  
							
							... 
							
							
							
							Port 28401962ca 
							
						 
						
							2018-10-07 22:56:24 +02:00  
				
					
						
							
							
								 
						
							
								b4ba1058b8 
								
							 
						 
						
							
							
								
								[Glitch] RTL: fix margins of public-account-header__tabs  
							
							... 
							
							
							
							Port 185cb2dc3a 
							
						 
						
							2018-10-07 22:56:24 +02:00  
				
					
						
							
							
								 
						
							
								611740ce81 
								
							 
						 
						
							
							
								
								Merge branch 'master' into glitch-soc/merge-upstream  
							
							
							
						 
						
							2018-10-07 19:47:56 +02:00  
				
					
						
							
							
								 
						
							
								7cc7843109 
								
							 
						 
						
							
							
								
								Do not scroll timelines when *closing* media modals  
							
							... 
							
							
							
							Media modals push an history state so that pressing back on mobile closes them.
We made sure to not scroll when opening them, but not when *closing* them,
which caused some issues in rare cases. 
							
						 
						
							2018-10-07 12:08:32 +02:00  
				
					
						
							
							
								 
						
							
								2fb692ea45 
								
							 
						 
						
							
							
								
								i18n: Update Polish translation ( #8901 )  
							
							... 
							
							
							
							Signed-off-by: Marcin Mikołajczak <me@m4sk.in> 
							
						 
						
							2018-10-06 20:42:36 +09:00  
				
					
						
							
							
								 
						
							
								28401962ca 
								
							 
						 
						
							
							
								
								Change documentation URL ( #8898 )  
							
							... 
							
							
							
							* Change documentation URL
* Fix hardcoded documentation URL in locales 
							
						 
						
							2018-10-06 14:33:36 +09:00  
				
					
						
							
							
								 
						
							
								185cb2dc3a 
								
							 
						 
						
							
							
								
								RTL: fix margins of public-account-header__tabs ( #8897 )  
							
							... 
							
							
							
							* RTL: fix margins of public-account-header__tabs
* fix style
* even more stylish code :) 
							
						 
						
							2018-10-06 00:05:11 +02:00  
				
					
						
							
							
								 
						
							
								98bb6815a7 
								
							 
						 
						
							
							
								
								Merge branch 'master' into glitch-soc/merge-upstream  
							
							
							
						 
						
							2018-10-05 21:48:25 +02:00  
				
					
						
							
							
								 
						
							
								c6e4c48942 
								
							 
						 
						
							
							
								
								[Glitch] Add a confirmation dialog when hitting reply and the compose box isn't empty  
							
							
							
						 
						
							2018-10-05 19:08:52 +02:00  
				
					
						
							
							
								 
						
							
								42aecb4c13 
								
							 
						 
						
							
							
								
								Add a confirmation dialog when hitting reply and the compose box isn't empty ( #8893 )  
							
							... 
							
							
							
							* Add a confirmation dialog when hitting reply and the compose box isn't empty
Fixes  #878 
* Performance improvement 
							
						 
						
							2018-10-05 18:44:44 +02:00  
				
					
						
							
							
								 
						
							
								a9e8f98a9d 
								
							 
						 
						
							
							
								
								Make hidden media clickable in account media gallery  
							
							
							
						 
						
							2018-10-02 22:00:57 +02:00  
				
					
						
							
							
								 
						
							
								d82c495c0f 
								
							 
						 
						
							
							
								
								Add media description (or status spoiler) in account media gallery  
							
							
							
						 
						
							2018-10-02 22:00:57 +02:00  
				
					
						
							
							
								 
						
							
								bd1f08fa9a 
								
							 
						 
						
							
							
								
								Fix account gallery hidden media background color in mastodon-light  
							
							
							
						 
						
							2018-10-02 22:00:57 +02:00  
				
					
						
							
							
								 
						
							
								eb85427576 
								
							 
						 
						
							
							
								
								[Glitch] Honour displayMedia setting in accountMedia gallery  
							
							... 
							
							
							
							Inspired by b79ab15859 
							
						 
						
							2018-10-02 22:00:57 +02:00  
				
					
						
							
							
								 
						
							
								6ad7606909 
								
							 
						 
						
							
							
								
								[Glitch] Add support for new display_media setting  
							
							... 
							
							
							
							Port f7a6f9489d 
							
						 
						
							2018-10-01 16:48:55 +02:00  
				
					
						
							
							
								 
						
							
								15197a831c 
								
							 
						 
						
							
							
								
								[Glitch] RTL: fix margins: public-layout.header.nav-button  
							
							... 
							
							
							
							Port df2f4052b8 
							
						 
						
							2018-10-01 14:38:35 +02:00  
				
					
						
							
							
								 
						
							
								884a898442 
								
							 
						 
						
							
							
								
								[Glitch] RTL: fix statubar action buttons/counter margins  
							
							... 
							
							
							
							Port 9f6662fcc9 
							
						 
						
							2018-10-01 14:38:32 +02:00  
				
					
						
							
							
								 
						
							
								36d426cec9 
								
							 
						 
						
							
							
								
								[Glitch] Separate font-family into variable  
							
							... 
							
							
							
							Port d0d65b5a28 
							
						 
						
							2018-10-01 14:38:29 +02:00