Thibaut Girka 
							
						 
					 
					
						
						
						
						
							
						
						
							571d219bb9 
							
						 
					 
					
						
						
							
							Merge branch 'master' into glitch-soc/merge-upstream  
						
						... 
						
						
						
						Conflicts manually resolved:
- app/services/post_status_service.rb
- config/locales/simple_form.pl.yml
- config/routes.rb
- config/webpack/loaders/sass.js
- config/webpack/shared.js
- package.json
- yarn.lock 
						
						
					 
					
						2019-01-02 15:36:53 +01:00 
						 
				 
			
				
					
						
							
							
								Yamagishi Kazutoshi 
							
						 
					 
					
						
						
						
						
							
						
						
							dc84899fff 
							
						 
					 
					
						
						
							
							Upgrade ESLint to v5.x ( #9694 )  
						
						
						
						
					 
					
						2019-01-02 07:28:53 +01:00 
						 
				 
			
				
					
						
							
							
								ThibG 
							
						 
					 
					
						
						
						
						
							
						
						
							f04f3ee436 
							
						 
					 
					
						
						
							
							Fix icon alignment in onboarding interaction screen ( #9686 )  
						
						
						
						
					 
					
						2019-01-01 16:19:51 +01:00 
						 
				 
			
				
					
						
							
							
								Eugen Rochko 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							e3dc8870bf 
							
						 
					 
					
						
						
							
							Remove visible timestamps for notifications ( #9675 )  
						
						... 
						
						
						
						Revert #9423 . Issues with line breaks / clutter. 
						
						
					 
					
						2018-12-31 18:12:07 +01:00 
						 
				 
			
				
					
						
							
							
								Yamagishi Kazutoshi 
							
						 
					 
					
						
						
						
						
							
						
						
							8f5fdab5bf 
							
						 
					 
					
						
						
							
							Update dependencies for Node.js (2018-12-31) ( #9669 )  
						
						... 
						
						
						
						* Update react-* to v16.7.0
* Upgrade react-hotkeys to v1.1.4
* Update react-intl to v2.7.2
* Update react-select to v2.2.0
* Update react-swipeable-views to v0.13.0
* Upgrade react-textarea-autosize to v7.1.0
* Upgrade redux to v4.0.1
* Upgrade reselect to v4.0.0
* Update raf to v3.4.1
* Update enzyme to v3.8.0
* Update rails-ujs to v5.2.2
* Update axios to v0.18.0
* Update http-link-header to v1.0.2
* Update rellax to v1.7.1
* Update intersection-observer to v0.5.1
* Update stringz to v1.0.0
* Upgrade babel-eslint to v10.0.1
* Update @babel/* to v7.2.x
* Update babel-plugin-react-intl to v3.0.1
* Update babel-plugin-transform-react-remove-prop-types to v0.4.21
* Upgrade dotenv to v6.2.0
* Update express to v4.16.4
* Update webpack to v4.28.3
* Upgrade autoprefixer to v9.4.3
* Update babel-loader to v8.0.4
* Upgrade css-loader to v2.1.0
* Upgrade file-loader to v3.0.1
* Update marky to v1.2.1
* Update mini-css-extract-plugin to v0.5.0
* Update offline-plugin to v5.0.6
* Update style-loader to v0.23.1
* Update eslint-plugin-jsx-a11y to v6.1.2
* yarn upgrade
* fix
* Replace webpack-manifest-plugin to webpack-assets-manifest
* Replace node-zopfli to @gfz/zopfli
* Remove monkey-patch for http-link-header 
						
						
					 
					
						2018-12-31 18:11:48 +01:00 
						 
				 
			
				
					
						
							
							
								ThibG 
							
						 
					 
					
						
						
						
						
							
						
						
							6a7a36fcdd 
							
						 
					 
					
						
						
							
							Immediately go back in browser history upon successfully sending toot ( #9663 )  
						
						... 
						
						
						
						Avoids possible misleading delay before redirection during which the
composer would be cleared and redrawn. 
						
						
					 
					
						2018-12-30 18:58:25 +01:00 
						 
				 
			
				
					
						
							
							
								Takeshi Umeda 
							
						 
					 
					
						
						
						
						
							
						
						
							1340460c85 
							
						 
					 
					
						
						
							
							If it is disabled, remove the link of the profile directory ( #9665 )  
						
						
						
						
					 
					
						2018-12-30 18:57:50 +01:00 
						 
				 
			
				
					
						
							
							
								ThibG 
							
						 
					 
					
						
						
						
						
							
						
						
							e74c99edf5 
							
						 
					 
					
						
						
							
							Fix crash when clearing uninitialized timeline ( #9662 )  
						
						
						
						
					 
					
						2018-12-30 18:57:39 +01:00 
						 
				 
			
				
					
						
							
							
								Thibaut Girka 
							
						 
					 
					
						
						
						
						
							
						
						
							b300948526 
							
						 
					 
					
						
						
							
							Fix crash when clearing uninitialized timeline  
						
						... 
						
						
						
						Fixes  #875  
					
						2018-12-30 16:56:55 +01:00 
						 
				 
			
				
					
						
							
							
								Thibaut Girka 
							
						 
					 
					
						
						
						
						
							
						
						
							d126240129 
							
						 
					 
					
						
						
							
							Immediately go back in browser history upon successfully sending toot  
						
						
						
						
					 
					
						2018-12-30 14:07:57 +01:00 
						 
				 
			
				
					
						
							
							
								mayaeh 
							
						 
					 
					
						
						
						
						
							
						
						
							c1693827ae 
							
						 
					 
					
						
						
							
							Change the icon to "reply-all" when reply to other accounts ( #9378 )  
						
						
						
						
					 
					
						2018-12-28 03:51:32 +01:00 
						 
				 
			
				
					
						
							
							
								Eugen Rochko 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							6e49907ecf 
							
						 
					 
					
						
						
							
							Improve admin UI for account view ( #9643 )  
						
						
						
						
					 
					
						2018-12-28 03:38:41 +01:00 
						 
				 
			
				
					
						
							
							
								Renato "Lond" Cerqueira 
							
						 
					 
					
						
						
						
						
							
						
						
							b41f715180 
							
						 
					 
					
						
						
							
							Weblate translations (2018-12-27) ( #9642 )  
						
						... 
						
						
						
						* Translated using Weblate (Occitan)
Currently translated at 99.7% (715 of 717 strings)
Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/oc/ 
* Translated using Weblate (Occitan)
Currently translated at 100.0% (93 of 93 strings)
Translation: Mastodon/Preferences
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/oc/ 
* Translated using Weblate (Greek)
Currently translated at 99.7% (715 of 717 strings)
Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/el/ 
* Translated using Weblate (Czech)
Currently translated at 99.9% (716 of 717 strings)
Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/cs/ 
* Translated using Weblate (Czech)
Currently translated at 100.0% (354 of 354 strings)
Translation: Mastodon/React
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/cs/ 
* Translated using Weblate (French)
Currently translated at 100.0% (354 of 354 strings)
Translation: Mastodon/React
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/fr/ 
* Translated using Weblate (Dutch)
Currently translated at 100,0% (717 of 717 strings)
Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/nl/ 
* Translated using Weblate (French)
Currently translated at 99.9% (716 of 717 strings)
Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/fr/ 
* Translated using Weblate (Slovak)
Currently translated at 100.0% (354 of 354 strings)
Translation: Mastodon/React
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/sk/ 
* Translated using Weblate (Slovak)
Currently translated at 99.7% (715 of 717 strings)
Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/sk/ 
* Translated using Weblate (Korean)
Currently translated at 100.0% (717 of 717 strings)
Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/ko/ 
* Translated using Weblate (Arabic)
Currently translated at 97.5% (699 of 717 strings)
Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/ar/ 
* Translated using Weblate (Greek)
Currently translated at 93.8% (332 of 354 strings)
Translation: Mastodon/React
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/el/ 
* Translated using Weblate (Corsican)
Currently translated at 93.8% (332 of 354 strings)
Translation: Mastodon/React
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/co/ 
* Translated using Weblate (Arabic)
Currently translated at 98.6% (349 of 354 strings)
Translation: Mastodon/React
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/ar/ 
* Translated using Weblate (Chinese (Simplified))
Currently translated at 78.2% (277 of 354 strings)
Translation: Mastodon/React
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/zh_Hans/ 
* Translated using Weblate (Basque)
Currently translated at 93.8% (332 of 354 strings)
Translation: Mastodon/React
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/eu/ 
* Translated using Weblate (Dutch)
Currently translated at 93,8% (332 of 354 strings)
Translation: Mastodon/React
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/nl/ 
* Translated using Weblate (Galician)
Currently translated at 92,9% (329 of 354 strings)
Translation: Mastodon/React
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/gl/ 
* Translated using Weblate (Greek)
Currently translated at 100.0% (354 of 354 strings)
Translation: Mastodon/React
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/el/ 
* Translated using Weblate (Galician)
Currently translated at 99.9% (716 of 717 strings)
Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/gl/ 
* Translated using Weblate (Galician)
Currently translated at 100,0% (354 of 354 strings)
Translation: Mastodon/React
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/gl/ 
* Translated using Weblate (Corsican)
Currently translated at 100.0% (354 of 354 strings)
Translation: Mastodon/React
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/co/ 
* Translated using Weblate (Korean)
Currently translated at 100.0% (354 of 354 strings)
Translation: Mastodon/React
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/ko/ 
* Translated using Weblate (Tamil)
Currently translated at 14.4% (51 of 354 strings)
Translation: Mastodon/React
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/ta/ 
* Translated using Weblate (Russian)
Currently translated at 85.6% (303 of 354 strings)
Translation: Mastodon/React
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/ru/ 
* Translated using Weblate (Italian)
Currently translated at 93.8% (332 of 354 strings)
Translation: Mastodon/React
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/it/ 
* Translated using Weblate (Occitan)
Currently translated at 93.8% (332 of 354 strings)
Translation: Mastodon/React
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/oc/ 
* Translated using Weblate (Spanish)
Currently translated at 88.1% (312 of 354 strings)
Translation: Mastodon/React
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/es/ 
* Translated using Weblate (German)
Currently translated at 93.5% (331 of 354 strings)
Translation: Mastodon/React
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/de/ 
* Translated using Weblate (Hungarian)
Currently translated at 63.0% (223 of 354 strings)
Translation: Mastodon/React
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/hu/ 
* Translated using Weblate (Portuguese)
Currently translated at 65.0% (230 of 354 strings)
Translation: Mastodon/React
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/pt/ 
* Translated using Weblate (Hebrew)
Currently translated at 61.9% (219 of 354 strings)
Translation: Mastodon/React
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/he/ 
* Translated using Weblate (Chinese (Traditional))
Currently translated at 92.9% (329 of 354 strings)
Translation: Mastodon/React
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/zh_Hant/ 
* Translated using Weblate (Dutch)
Currently translated at 94.9% (336 of 354 strings)
Translation: Mastodon/React
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/nl/ 
* Translated using Weblate (Slovak)
Currently translated at 100.0% (354 of 354 strings)
Translation: Mastodon/React
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/sk/ 
* Translated using Weblate (Slovak)
Currently translated at 100.0% (93 of 93 strings)
Translation: Mastodon/Preferences
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/sk/ 
* Translated using Weblate (Corsican)
Currently translated at 100.0% (354 of 354 strings)
Translation: Mastodon/React
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/co/ 
* Translated using Weblate (Dutch)
Currently translated at 100,0% (354 of 354 strings)
Translation: Mastodon/React
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/nl/ 
* Translated using Weblate (Dutch)
Currently translated at 100.0% (354 of 354 strings)
Translation: Mastodon/React
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/nl/ 
* Translated using Weblate (Slovak)
Currently translated at 100.0% (354 of 354 strings)
Translation: Mastodon/React
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/sk/ 
* Translated using Weblate (Arabic)
Currently translated at 97.4% (698 of 717 strings)
Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/ar/ 
* Translated using Weblate (German)
Currently translated at 100,0% (354 of 354 strings)
Translation: Mastodon/React
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/de/ 
* Added translation using Weblate (Hindi)
* Translated using Weblate (Corsican)
Currently translated at 99.9% (716 of 717 strings)
Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/co/ 
* Translated using Weblate (French)
Currently translated at 100.0% (354 of 354 strings)
Translation: Mastodon/React
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/fr/ 
* Translated using Weblate (Esperanto)
Currently translated at 100.0% (354 of 354 strings)
Translation: Mastodon/React
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/eo/ 
* Translated using Weblate (German)
Currently translated at 99.9% (716 of 717 strings)
Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/de/ 
* Translated using Weblate (Esperanto)
Currently translated at 100.0% (354 of 354 strings)
Translation: Mastodon/React
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/eo/ 
* Translated using Weblate (Esperanto)
Currently translated at 98.3% (705 of 717 strings)
Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/eo/ 
* 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 (Polish)
Currently translated at 90.3% (84 of 93 strings)
Translation: Mastodon/Preferences
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/pl/ 
* Normalize translations
* Add missing plurals, remove unused translations 
						
						
					 
					
						2018-12-27 12:25:30 +01:00 
						 
				 
			
				
					
						
							
							
								Quentí 
							
						 
					 
					
						
						
						
						
							
						
						
							f63a0134d7 
							
						 
					 
					
						
						
							
							[i18n] OC/CAT/FR «crop» => «change preview» ( #9636 )  
						
						... 
						
						
						
						* Rename "crop" to "change preview" (tootsuite#9616)
* Rename "crop" to "change preview" (tootsuite#9616)
* Rename "crop" to "change preview" (tootsuite#9616) 
						
						
					 
					
						2018-12-26 19:16:40 +01:00 
						 
				 
			
				
					
						
							
							
								Eugen Rochko 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							acf9358c52 
							
						 
					 
					
						
						
							
							Rename "crop" to "change preview" ( #9616 )  
						
						
						
						
					 
					
						2018-12-24 19:12:18 +01:00 
						 
				 
			
				
					
						
							
							
								Eugen Rochko 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							2ee779dcd3 
							
						 
					 
					
						
						
							
							Update emoji codepoint mappings to v11.0 ( #9618 )  
						
						
						
						
					 
					
						2018-12-24 19:12:00 +01:00 
						 
				 
			
				
					
						
							
							
								Thibaut Girka 
							
						 
					 
					
						
						
						
						
							
						
						
							cb98e7dbd3 
							
						 
					 
					
						
						
							
							[Glitch] Add moderation warnings  
						
						... 
						
						
						
						Port SCSS changes from 3c033c4352f8b156887cd7157b4a89c23a545838 to glitch-soc 
						
						
					 
					
						2018-12-23 12:54:09 +01:00 
						 
				 
			
				
					
						
							
							
								Thibaut Girka 
							
						 
					 
					
						
						
						
						
							
						
						
							82088f0d7d 
							
						 
					 
					
						
						
							
							[Glitch] Remove links to bridge.joinmastodon.org (non-functional)  
						
						... 
						
						
						
						Port bb62827c16dbf35c70da2dc801f602df3c76fcca to glitch-soc 
						
						
					 
					
						2018-12-23 11:43:47 +01:00 
						 
				 
			
				
					
						
							
							
								Thibaut Girka 
							
						 
					 
					
						
						
						
						
							
						
						
							c5c4450fdd 
							
						 
					 
					
						
						
							
							Remove file added by error  
						
						
						
						
					 
					
						2018-12-23 11:43:25 +01:00 
						 
				 
			
				
					
						
							
							
								Thibaut Girka 
							
						 
					 
					
						
						
						
						
							
						
						
							22dedb676b 
							
						 
					 
					
						
						
							
							[Glitch] Fix unnecessary loadMore calls when the end of a timeline has been reached  
						
						... 
						
						
						
						Port 8389b496ba9f8b5fa04a34ccc14c8e4195e03ea3 to glitch flavour 
						
						
					 
					
						2018-12-23 11:40:52 +01:00 
						 
				 
			
				
					
						
							
							
								Thibaut Girka 
							
						 
					 
					
						
						
						
						
							
						
						
							3e686beaea 
							
						 
					 
					
						
						
							
							Merge branch 'master' into glitch-soc/merge-upstream  
						
						... 
						
						
						
						Conflicts:
- config/routes.rb
  Upstream changed some admin routes, conflict was because of an added :show
  action for statuses on our side. Kept it. 
						
						
					 
					
						2018-12-23 11:28:28 +01:00 
						 
				 
			
				
					
						
							
							
								ThibG 
							
						 
					 
					
						
						
						
						
							
						
						
							e25947db4a 
							
						 
					 
					
						
						
							
							Sanitize and sandbox toot embeds ( #9552 )  
						
						
						
						
					 
					
						2018-12-23 02:16:35 +01:00 
						 
				 
			
				
					
						
							
							
								Eugen Rochko 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							bb62827c16 
							
						 
					 
					
						
						
							
							Remove links to bridge.joinmastodon.org (non-functional) ( #9608 )  
						
						... 
						
						
						
						Add link to profile directory 
						
						
					 
					
						2018-12-22 23:32:00 +01:00 
						 
				 
			
				
					
						
							
							
								Eugen Rochko 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							3c033c4352 
							
						 
					 
					
						
						
							
							Add moderation warnings ( #9519 )  
						
						... 
						
						
						
						* Add moderation warnings
Replace individual routes for disabling, silencing, and suspending
a user, as well as the report update route, with a unified account
action controller that allows you to select an action (none,
disable, silence, suspend) as well as whether it should generate an
e-mail notification with optional custom text. That notification,
with the optional custom text, is saved as a warning.
Additionally, there are warning presets you can configure to save
time when performing the above.
* Use Account#local_username_and_domain 
						
						
					 
					
						2018-12-22 20:02:09 +01:00 
						 
				 
			
				
					
						
							
							
								Quentí 
							
						 
					 
					
						
						
						
						
							
						
						
							00862dcaff 
							
						 
					 
					
						
						
							
							[i18n] Occitan update ( #9607 )  
						
						... 
						
						
						
						* Update for new On Board messages
* Update oc.json 
						
						
					 
					
						2018-12-22 18:27:03 +01:00 
						 
				 
			
				
					
						
							
							
								Thibaut Girka 
							
						 
					 
					
						
						
						
						
							
						
						
							1a3088364f 
							
						 
					 
					
						
						
							
							Fix composer not getting focus after reply confirmation dialog  
						
						... 
						
						
						
						The modal-handling code gives back focus to the element focused when the
modal opened. However, in the case of reply confirmation, it would do so
*after* the composer code itself requested focus. 
						
						
					 
					
						2018-12-21 20:00:49 +01:00 
						 
				 
			
				
					
						
							
							
								Thibaut Girka 
							
						 
					 
					
						
						
						
						
							
						
						
							0605c004a5 
							
						 
					 
					
						
						
							
							Fix incorrect and duplicate onConfirm callback  
						
						
						
						
					 
					
						2018-12-21 20:00:49 +01:00 
						 
				 
			
				
					
						
							
							
								Thibaut Girka 
							
						 
					 
					
						
						
						
						
							
						
						
							6166751f9e 
							
						 
					 
					
						
						
							
							[Glitch] Fix that translation is not applied to "joining hashtags"  
						
						... 
						
						
						
						Port bfec030a4e3be37e4986d7ec5cb1bda968ba549a to glitch-soc 
						
						
					 
					
						2018-12-21 19:54:54 +01:00 
						 
				 
			
				
					
						
							
							
								Thibaut Girka 
							
						 
					 
					
						
						
						
						
							
						
						
							3611ea02e2 
							
						 
					 
					
						
						
							
							[Glitch] Deep compare tags for hashtag column reload  
						
						... 
						
						
						
						Port 4fdefffb9906ffc3e5fde7af652674bebffd6e15 to glitch-soc 
						
						
					 
					
						2018-12-21 19:54:54 +01:00 
						 
				 
			
				
					
						
							
							
								Thibaut Girka 
							
						 
					 
					
						
						
						
						
							
						
						
							4be7313298 
							
						 
					 
					
						
						
							
							[Glitch] Allow joining several hashtags in a single column  
						
						... 
						
						
						
						Port 4c03e05a4e1a237f8a414a0861c03abe3269dbc8 to glitch-soc
This introduces new requirements in the API:
  `/api/v1/timelines/tag/:tag` now accepts new params: `any`, `all` and `none`
  It now returns status matching tag :tag or any of the :any, provided that
  they also include all tags in `all` and none of `none`. 
						
						
					 
					
						2018-12-21 19:54:54 +01:00 
						 
				 
			
				
					
						
							
							
								Marcin Mikołajczak 
							
						 
					 
					
						
						
						
						
							
						
						
							aa0e1ff286 
							
						 
					 
					
						
						
							
							i18n: Update Polish translation ( #9594 )  
						
						... 
						
						
						
						Signed-off-by: Marcin Mikołajczak <me@m4sk.in> 
						
						
					 
					
						2018-12-21 18:56:24 +01:00 
						 
				 
			
				
					
						
							
							
								ThibG 
							
						 
					 
					
						
						
						
						
							
						
						
							a6079a42b6 
							
						 
					 
					
						
						
							
							Fix composer not getting focus after reply confirmation dialog ( #9602 )  
						
						... 
						
						
						
						The modal-handling code gives back focus to the element focused when the
modal opened. However, in the case of reply confirmation, it would do so
*after* the composer code itself requested focus. 
						
						
					 
					
						2018-12-21 18:52:41 +01:00 
						 
				 
			
				
					
						
							
							
								Thibaut Girka 
							
						 
					 
					
						
						
						
						
							
						
						
							6073195a7d 
							
						 
					 
					
						
						
							
							[Glitch] Display customized mascot in web UI  
						
						... 
						
						
						
						Port relevant parts of 9d4541c612b506889675c4c19ced5cd17ad3710f to glitch-soc 
						
						
					 
					
						2018-12-20 18:39:05 +01:00 
						 
				 
			
				
					
						
							
							
								Thibaut Girka 
							
						 
					 
					
						
						
						
						
							
						
						
							fb63941c47 
							
						 
					 
					
						
						
							
							Make drawer markup and styling closer to upstream  
						
						... 
						
						
						
						WARNING: This may break some custom skins!
  `.drawer > .contents` has been moved to
  `.drawer > .drawer__pager > .drawer__iner`, and the waves have been moved
  from `.drawer > .contents` to `.drawer__inner__mastodon`! 
						
						
					 
					
						2018-12-20 18:39:05 +01:00 
						 
				 
			
				
					
						
							
							
								Thibaut Girka 
							
						 
					 
					
						
						
						
						
							
						
						
							5eaf2c9e02 
							
						 
					 
					
						
						
							
							[Glitch] Back to the getting-started when pins the timeline  
						
						... 
						
						
						
						Port 5bf100f87be571e86305f3ab244183fc46f1ede2 to glitch-soc 
						
						
					 
					
						2018-12-20 14:51:28 +01:00 
						 
				 
			
				
					
						
							
							
								Thibaut Girka 
							
						 
					 
					
						
						
						
						
							
						
						
							1b18eb49e3 
							
						 
					 
					
						
						
							
							Hide negative follower counts from glitch flavour  
						
						
						
						
					 
					
						2018-12-20 14:51:12 +01:00 
						 
				 
			
				
					
						
							
							
								ThibG 
							
						 
					 
					
						
						
						
						
							
						
						
							8389b496ba 
							
						 
					 
					
						
						
							
							Fix unnecessary loadMore calls when the end of a timeline has been reached ( #9581 )  
						
						... 
						
						
						
						Fixes  #9568  
					
						2018-12-19 22:23:16 +01:00 
						 
				 
			
				
					
						
							
							
								Renato "Lond" Cerqueira 
							
						 
					 
					
						
						
						
						
							
						
						
							af37f4a70f 
							
						 
					 
					
						
						
							
							Weblate translations (2018-12-19) ( #9578 )  
						
						... 
						
						
						
						* Translated using Weblate (Greek)
Currently translated at 99.7% (715 of 717 strings)
Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/el/ 
* Translated using Weblate (Czech)
Currently translated at 99.9% (716 of 717 strings)
Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/cs/ 
* Translated using Weblate (Japanese)
Currently translated at 97.5% (699 of 717 strings)
Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/ja/ 
* Translated using Weblate (Slovak)
Currently translated at 99.7% (715 of 717 strings)
Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/sk/ 
* Translated using Weblate (Dutch)
Currently translated at 99.7% (715 of 717 strings)
Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/nl/ 
* Translated using Weblate (Galician)
Currently translated at 99.9% (716 of 717 strings)
Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/gl/ 
* Translated using Weblate (Korean)
Currently translated at 100.0% (717 of 717 strings)
Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/ko/ 
* Translated using Weblate (Korean)
Currently translated at 100.0% (350 of 350 strings)
Translation: Mastodon/React
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/ko/ 
* Translated using Weblate (Korean)
Currently translated at 100.0% (93 of 93 strings)
Translation: Mastodon/Preferences
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/ko/ 
* Translated using Weblate (Portuguese (Brazil))
Currently translated at 98.9% (709 of 717 strings)
Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/pt_BR/ 
* Translated using Weblate (Portuguese (Brazil))
Currently translated at 97.8% (91 of 93 strings)
Translation: Mastodon/Preferences
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/pt_BR/ 
* Translated using Weblate (Corsican)
Currently translated at 99.9% (716 of 717 strings)
Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/co/ 
* Translated using Weblate (French)
Currently translated at 99.9% (716 of 717 strings)
Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/fr/ 
* Translated using Weblate (French)
Currently translated at 99.9% (716 of 717 strings)
Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/fr/ 
* Translated using Weblate (Arabic)
Currently translated at 96.8% (90 of 93 strings)
Translation: Mastodon/Preferences
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/ar/ 
* Translated using Weblate (Arabic)
Currently translated at 96.8% (694 of 717 strings)
Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/ar/ 
* Translated using Weblate (Dutch)
Currently translated at 100,0% (717 of 717 strings)
Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/nl/ 
* Translated using Weblate (Czech)
Currently translated at 99.9% (716 of 717 strings)
Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/cs/ 
* Translated using Weblate (Slovak)
Currently translated at 99.7% (715 of 717 strings)
Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/sk/ 
* Translated using Weblate (Czech)
Currently translated at 100.0% (350 of 350 strings)
Translation: Mastodon/React
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/cs/ 
* Translated using Weblate (Czech)
Currently translated at 99.9% (716 of 717 strings)
Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/cs/ 
* Translated using Weblate (Italian)
Currently translated at 100,0% (93 of 93 strings)
Translation: Mastodon/Preferences
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/it/ 
* Translated using Weblate (Czech)
Currently translated at 99,9% (716 of 717 strings)
Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/cs/ 
* Translated using Weblate (Catalan)
Currently translated at 100,0% (93 of 93 strings)
Translation: Mastodon/Preferences
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/ca/ 
* Translated using Weblate (Catalan)
Currently translated at 100,0% (717 of 717 strings)
Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/ca/ 
* Translated using Weblate (Czech)
Currently translated at 99.9% (716 of 717 strings)
Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/cs/ 
* Translated using Weblate (Occitan)
Currently translated at 100,0% (350 of 350 strings)
Translation: Mastodon/React
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/oc/ 
* Translated using Weblate (Occitan)
Currently translated at 99,7% (715 of 717 strings)
Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/oc/ 
* Translated using Weblate (Occitan)
Currently translated at 100,0% (93 of 93 strings)
Translation: Mastodon/Preferences
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/oc/ 
* Translated using Weblate (Czech)
Currently translated at 99.9% (716 of 717 strings)
Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/cs/ 
* Translated using Weblate (Greek)
Currently translated at 99.7% (715 of 717 strings)
Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/el/ 
* Translated using Weblate (Greek)
Currently translated at 100.0% (350 of 350 strings)
Translation: Mastodon/React
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/el/ 
* 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 (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 (German)
Currently translated at 99,9% (716 of 717 strings)
Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/de/ 
* Translated using Weblate (Japanese)
Currently translated at 97,5% (699 of 717 strings)
Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/ja/ 
* Translated using Weblate (Korean)
Currently translated at 100,0% (350 of 350 strings)
Translation: Mastodon/React
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/ko/ 
* Translated using Weblate (Czech)
Currently translated at 100.0% (350 of 350 strings)
Translation: Mastodon/React
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/cs/ 
* Normalize translations
* Normalize translations, remove unused, add missing plurals 
						
						
					 
					
						2018-12-19 21:07:05 +09:00 
						 
				 
			
				
					
						
							
							
								Thibaut Girka 
							
						 
					 
					
						
						
						
						
							
						
						
							2228655848 
							
						 
					 
					
						
						
							
							[Glitch] Improved appearance of notification filter on safari  
						
						... 
						
						
						
						Port 2e1b5edfea1b03f64c69266f979caee228fa90b7 to glitch-soc 
						
						
					 
					
						2018-12-19 13:00:08 +01:00 
						 
				 
			
				
					
						
							
							
								Thibaut Girka 
							
						 
					 
					
						
						
						
						
							
						
						
							add74816a5 
							
						 
					 
					
						
						
							
							Merge branch 'master' into glitch-soc/merge-upstream  
						
						
						
						
					 
					
						2018-12-19 12:58:49 +01:00 
						 
				 
			
				
					
						
							
							
								mayaeh 
							
						 
					 
					
						
						
						
						
							
						
						
							ff472d2cfb 
							
						 
					 
					
						
						
							
							Update Japanese translations. ( #9574 )  
						
						
						
						
					 
					
						2018-12-19 08:51:02 +01:00 
						 
				 
			
				
					
						
							
							
								Hinaloe 
							
						 
					 
					
						
						
						
						
							
						
						
							2e1b5edfea 
							
						 
					 
					
						
						
							
							improved appearance of notification filter on safari ( #9564 )  
						
						
						
						
					 
					
						2018-12-18 22:28:09 +01:00 
						 
				 
			
				
					
						
							
							
								ThibG 
							
						 
					 
					
						
						
						
						
							
						
						
							e70e496e29 
							
						 
					 
					
						
						
							
							Clean up dead code in public timeline code ( #9565 )  
						
						
						
						
					 
					
						2018-12-18 22:00:18 +01:00 
						 
				 
			
				
					
						
							
							
								Thibaut Girka 
							
						 
					 
					
						
						
						
						
							
						
						
							655da1be20 
							
						 
					 
					
						
						
							
							Reword confirm_before_clearing_draft description  
						
						
						
						
					 
					
						2018-12-18 21:54:34 +01:00 
						 
				 
			
				
					
						
							
							
								Thibaut Girka 
							
						 
					 
					
						
						
						
						
							
						
						
							9a7201f2ee 
							
						 
					 
					
						
						
							
							Allow disabling the reply confirmation dialog  
						
						
						
						
					 
					
						2018-12-18 21:54:34 +01:00 
						 
				 
			
				
					
						
							
							
								Thibaut Girka 
							
						 
					 
					
						
						
						
						
							
						
						
							056a8a8ee4 
							
						 
					 
					
						
						
							
							Allow disabling media confirmation from the confirmation dialog itself  
						
						
						
						
					 
					
						2018-12-18 21:54:34 +01:00 
						 
				 
			
				
					
						
							
							
								Thibaut Girka 
							
						 
					 
					
						
						
						
						
							
						
						
							490d8fff0b 
							
						 
					 
					
						
						
							
							Remove dead code  
						
						
						
						
					 
					
						2018-12-18 21:39:35 +01:00 
						 
				 
			
				
					
						
							
							
								Thibaut Girka 
							
						 
					 
					
						
						
						
						
							
						
						
							82b01a6c9f 
							
						 
					 
					
						
						
							
							[Glitch] Put "Media Only" option in column settings instead of content area headline  
						
						... 
						
						
						
						Port 4f42238c294f92dbd87db3d83f9514344fcd1f8a to glitch-soc 
						
						
					 
					
						2018-12-18 21:39:35 +01:00 
						 
				 
			
				
					
						
							
							
								Thibaut Girka 
							
						 
					 
					
						
						
						
						
							
						
						
							9fc7ad7b9c 
							
						 
					 
					
						
						
							
							[Glitch] Always display tab navigation on local/federated timeline even when empty  
						
						... 
						
						
						
						Port 90b64c006998ec3bae365007781c61e8a79eeeef to glitch-soc 
						
						
					 
					
						2018-12-18 21:39:35 +01:00 
						 
				 
			
				
					
						
							
							
								Thibaut Girka 
							
						 
					 
					
						
						
						
						
							
						
						
							c644e6ea89 
							
						 
					 
					
						
						
							
							Do not replace history state  
						
						... 
						
						
						
						This is both for consistency with account timelines and to not mess with
the logic used to decide whether going back in the browser's history is
going to make us leave the WebUI. 
						
						
					 
					
						2018-12-18 21:39:35 +01:00