Joachim Viide 
							
						 
					 
					
						
						
						
						
							
						
						
							ef879a8839 
							
						 
					 
					
						
						
							
							Send initial state in a <script type="application/json"> tag ( #1806 )  
						
						
						
						
					 
					
						2017-04-15 02:32:42 +02:00 
						 
				 
			
				
					
						
							
							
								Patrick Figel 
							
						 
					 
					
						
						
						
						
							
						
						
							fe8dd58bc1 
							
						 
					 
					
						
						
							
							Add list of muted user to UI and Getting Started ( #1799 )  
						
						... 
						
						
						
						Add the same UI that already exists for blocked users for muted
ones and add it to the "Getting Started" menu. 
						
						
					 
					
						2017-04-15 01:23:49 +02:00 
						 
				 
			
				
					
						
							
							
								Eugen Rochko 
							
						 
					 
					
						
						
						
						
							
						
						
							5f8155482a 
							
						 
					 
					
						
						
							
							Add overlay style to buttons, continue video after expanding it  
						
						
						
						
					 
					
						2017-04-13 17:01:09 +02:00 
						 
				 
			
				
					
						
							
							
								Eugen Rochko 
							
						 
					 
					
						
						
						
						
							
						
						
							e70b84b1dc 
							
						 
					 
					
						
						
							
							Merge branch 'videolightbox' of git://github.com/blackle/mastodon into blackle-videolightbox  
						
						
						
						
					 
					
						2017-04-13 16:14:11 +02:00 
						 
				 
			
				
					
						
							
							
								Koala Yeung 
							
						 
					 
					
						
						
						
						
							
						
						
							1206627c59 
							
						 
					 
					
						
						
							
							Add Dutch translation (nl) ( #1682 )  
						
						... 
						
						
						
						* Dutch language files for Ruby code
 * Created RoR translation ymls:
   * config/locales/devise.nl.yml
   * config/locales/doorkeeper.nl.yml
   * config/locales/nl.yml
   * config/locales/simple_form.nl.yml
 * Modified RoR config and helper
   * app/helpers/settings_helper.rb
   * config/application.rb
* Dutch language javascript locale
 * Created javascript locale files:
   * app/assets/javascripts/components/locales/index.jsx
   * app/assets/javascripts/components/locales/nl.jsx
 * Reference the newly created locale files:
   * app/assets/javascripts/components/containers/mastodon.jsx
* Fix syntax error in locale file (nl)
* Fix missing translate in js locale (nl)
* Convert all ruby Dutch locale (nl) file to utf8
Fix yml conversion issues.
* Fix duplicated key in devise.nl.yml
* Fix indentation error in doorkeeper.nl.yml 
						
						
					 
					
						2017-04-13 16:02:23 +02:00 
						 
				 
			
				
					
						
							
							
								blackle 
							
						 
					 
					
						
						
						
						
							
						
						
							00cc3066a2 
							
						 
					 
					
						
						
							
							Allow video to be expanded into lightbox  
						
						
						
						
					 
					
						2017-04-13 09:09:45 -04:00 
						 
				 
			
				
					
						
							
							
								Svetlozar Todorov 
							
						 
					 
					
						
						
						
						
							
						
						
							aa7bf1515c 
							
						 
					 
					
						
						
							
							Fix   #624  - Add localization for Bulgarian ( #645 )  
						
						... 
						
						
						
						* Add translation files and declarations for Bulgarian
* Add a bunch of translations to bg.jsx
* Add rest of translations to bg.jsx
* Add devise translations
* Fix devise translations 
						
						
					 
					
						2017-04-13 13:16:28 +02:00 
						 
				 
			
				
					
						
							
							
								Isabelle Knott 
							
						 
					 
					
						
						
						
						
							
						
						
							1ea662963f 
							
						 
					 
					
						
						
							
							Use shift+click instead of alt+click to bypass boost dialog ( #1638 )  
						
						
						
						
					 
					
						2017-04-13 02:15:45 +02:00 
						 
				 
			
				
					
						
							
							
								Thor Harald Johansen 
							
						 
					 
					
						
						
						
						
							
						
						
							1f5ff46fd9 
							
						 
					 
					
						
						
							
							Working translation for Norwegian. ( #1611 )  
						
						
						
						
					 
					
						2017-04-12 17:07:51 +02:00 
						 
				 
			
				
					
						
							
							
								Koala Yeung 
							
						 
					 
					
						
						
						
						
							
						
						
							24eb45425e 
							
						 
					 
					
						
						
							
							Add Traditional Chinese, Hong Kong translation (zh-HK) ( #1544 )  
						
						... 
						
						
						
						* Added Chinese Traditional Hong Kong (zh-HK) for Ruby
* Added translations for Ruby.
* Added Chinese Traditional Hong Kong (zh-HK) for JS
* Added translations for javascript code.
* Rearrange language references in mastodon.jsx
* Break `addLocaleData` into multiple lines. Make future commit more readable.
* Roughly re-sort the languages in alphabetical orders
  (only manually put English on top because it is default).
* Sort application.rb locale with alphabetical order
With exception that English (default language) goes first.
Improve code readability.
* Resort language selection box alphabetically
Sort HUMAN_LOCALES in the alphabetical order of display name
(except English, the default language, come first).
Improve usability. 
						
						
					 
					
						2017-04-12 08:50:50 +02:00 
						 
				 
			
				
					
						
							
							
								pinfort 
							
						 
					 
					
						
						
						
						
							
						
						
							6f5268b02d 
							
						 
					 
					
						
						
							
							Add Japanese translation ( #1552 )  
						
						... 
						
						
						
						* add device.ja.yml
* update device.ja.yml
* add file simple_form.ja.yml
* 👍 Added doorkeeper.ja.yml
* add ja.yml
* Update doorkeeper.ja.yml
fixed url to uri
* update ja.yml
* fix some translations
* fix japanese grammar of a translate
* fix some translates
* fix ja.yml
* add ja.jsx
* add Japanese user mail views
* Added japanese translate locales
* Added :ja to available_locales
こっちも
* Added "日本語" to HUMAN_LOCALES
* Imported/Added ja to addLocaleData
* update ja.jsx 
						
						
					 
					
						2017-04-11 21:52:09 +02:00 
						 
				 
			
				
					
						
							
							
								Eugen Rochko 
							
						 
					 
					
						
						
						
						
							
						
						
							2a7602cad4 
							
						 
					 
					
						
						
							
							Merge branch 'master' of  https://github.com/blackle/mastodon  into blackle-master  
						
						
						
						
					 
					
						2017-04-11 20:43:56 +02:00 
						 
				 
			
				
					
						
							
							
								blackle 
							
						 
					 
					
						
						
						
						
							
						
						
							06444bf050 
							
						 
					 
					
						
						
							
							Allow user to disable the boost confirm dialog in preferences  
						
						
						
						
					 
					
						2017-04-11 10:10:16 -04:00 
						 
				 
			
				
					
						
							
							
								blackle 
							
						 
					 
					
						
						
						
						
							
						
						
							f53fb6aa66 
							
						 
					 
					
						
						
							
							Bypass boost confirm modal if alt is pressed  
						
						
						
						
					 
					
						2017-04-11 08:34:14 -04:00 
						 
				 
			
				
					
						
							
							
								blackle 
							
						 
					 
					
						
						
						
						
							
						
						
							01e5447e35 
							
						 
					 
					
						
						
							
							Add boost confirm modal  
						
						
						
						
					 
					
						2017-04-10 22:35:55 -04:00 
						 
				 
			
				
					
						
							
							
								Ratmir Karabut 
							
						 
					 
					
						
						
						
						
							
						
						
							9043b32183 
							
						 
					 
					
						
						
							
							Add Russian translation (ru) ( #1023 )  
						
						... 
						
						
						
						* Add Russian translation (ru)
* Fix a missing comma
* Fix the wording for better consistency 
						
						
					 
					
						2017-04-10 12:52:06 +02:00 
						 
				 
			
				
					
						
							
							
								André Lewin 
							
						 
					 
					
						
						
						
						
							
						
						
							bf7cefa516 
							
						 
					 
					
						
						
							
							Merge branch 'master' into master  
						
						
						
						
					 
					
						2017-04-05 20:28:58 +02:00 
						 
				 
			
				
					
						
							
							
								axolotl 
							
						 
					 
					
						
						
						
						
							
						
						
							8736ef50ad 
							
						 
					 
					
						
						
							
							Added Esperanto translation inside the javascripts folder  
						
						
						
						
					 
					
						2017-04-04 20:54:42 +02:00 
						 
				 
			
				
					
						
							
							
								JantsoP 
							
						 
					 
					
						
						
						
						
							
						
						
							22f88b845a 
							
						 
					 
					
						
						
							
							add finnish translation  
						
						... 
						
						
						
						add finnish translation 
						
						
					 
					
						2017-04-03 13:33:43 +02:00 
						 
				 
			
				
					
						
							
							
								Eugen Rochko 
							
						 
					 
					
						
						
						
						
							
						
						
							aaa4d1b0fb 
							
						 
					 
					
						
						
							
							Keep track of which timelines are connected live to avoid redundant  
						
						... 
						
						
						
						refreshes on navigation 
						
						
					 
					
						2017-04-02 21:44:06 +02:00 
						 
				 
			
				
					
						
							
							
								Eugen Rochko 
							
						 
					 
					
						
						
						
						
							
						
						
							60ebfa182f 
							
						 
					 
					
						
						
							
							Made modal system more generic  
						
						
						
						
					 
					
						2017-04-01 22:11:28 +02:00 
						 
				 
			
				
					
						
							
							
								Kit Redgrave 
							
						 
					 
					
						
						
						
						
							
						
						
							442fdbfc53 
							
						 
					 
					
						
						
							
							Mute button progress so far. WIP, doesn't entirely work correctly.  
						
						
						
						
					 
					
						2017-03-01 22:31:21 -06:00 
						 
				 
			
				
					
						
							
							
								Eugen Rochko 
							
						 
					 
					
						
						
						
						
							
						
						
							c96fd24f48 
							
						 
					 
					
						
						
							
							Improve status reselect, do not display "load more" when no next link available  
						
						
						
						
					 
					
						2017-02-22 16:30:09 +01:00 
						 
				 
			
				
					
						
							
							
								Eugen Rochko 
							
						 
					 
					
						
						
						
						
							
						
						
							6b4ef92c6f 
							
						 
					 
					
						
						
							
							Adjust naming of public timeline -> "local timeline" vs "whole known network"  
						
						
						
						
					 
					
						2017-02-19 21:49:14 +01:00 
						 
				 
			
				
					
						
							
							
								Eugen Rochko 
							
						 
					 
					
						
						
						
						
							
						
						
							4aa5ebe591 
							
						 
					 
					
						
						
							
							Split public timeline into "public timeline" which is local, and  
						
						... 
						
						
						
						"whole known network" which is what public timeline used to be
Only domain blocks with suspend severity will block PuSH subscriptions
Silenced accounts should not appear in conversations unless followed 
						
						
					 
					
						2017-02-19 20:25:54 +01:00 
						 
				 
			
				
					
						
							
							
								Eugen Rochko 
							
						 
					 
					
						
						
						
						
							
						
						
							3b81baaaaf 
							
						 
					 
					
						
						
							
							Adding POST /api/v1/reports API, and a UI for submitting reports  
						
						
						
						
					 
					
						2017-02-14 20:59:26 +01:00 
						 
				 
			
				
					
						
							
							
								Eugen Rochko 
							
						 
					 
					
						
						
						
						
							
						
						
							02e91a96dd 
							
						 
					 
					
						
						
							
							Make streaming API use one pattern-matching redis pubsub connection  
						
						... 
						
						
						
						Refresh timelines when streaming API reconnects in the UI 
						
						
					 
					
						2017-02-07 14:39:08 +01:00 
						 
				 
			
				
					
						
							
							
								Eugen Rochko 
							
						 
					 
					
						
						
						
						
							
						
						
							920ba5fc4e 
							
						 
					 
					
						
						
							
							Fix   #61  - Add list of blocked users to the UI; clean up failed push notifications API  
						
						... 
						
						
						
						Try to fix Travis CI setup 
						
						
					 
					
						2017-02-05 19:18:11 +01:00 
						 
				 
			
				
					
						
							
							
								Eugen Rochko 
							
						 
					 
					
						
						
						
						
							
						
						
							44fad0160f 
							
						 
					 
					
						
						
							
							Add next/previous navigation in modal for media attachments  
						
						
						
						
					 
					
						2017-02-05 02:48:11 +01:00 
						 
				 
			
				
					
						
							
							
								Eugen Rochko 
							
						 
					 
					
						
						
						
						
							
						
						
							ccb8ac8573 
							
						 
					 
					
						
						
							
							Make the streaming API also handle websockets (because trying to get the browser EventSource interface to  
						
						... 
						
						
						
						work flawlessly was a nightmare). WARNING: This commit makes the web UI connect to the streaming API instead
of ActionCable like before. This means that if you are upgrading, you should set that up beforehand. 
						
						
					 
					
						2017-02-04 00:34:31 +01:00 
						 
				 
			
				
					
						
							
							
								Eugen Rochko 
							
						 
					 
					
						
						
						
						
							
						
						
							d9ca46b464 
							
						 
					 
					
						
						
							
							Cleaning up format of broadcast real-time messages, removing  
						
						... 
						
						
						
						redis-backed "mentions" timeline as redundant (given notifications) 
						
						
					 
					
						2017-02-02 00:03:31 +01:00 
						 
				 
			
				
					
						
							
							
								Eugen Rochko 
							
						 
					 
					
						
						
						
						
							
						
						
							f21e7d6ac0 
							
						 
					 
					
						
						
							
							Make profile header scroll along with contents. AccountTimeline, Followers and Following are no longer  
						
						... 
						
						
						
						nested inside a common parent (<Account>), instead they all embed <HeaderContainer /> 
						
						
					 
					
						2017-01-30 21:44:11 +01:00 
						 
				 
			
				
					
						
							
							
								Eugen Rochko 
							
						 
					 
					
						
						
						
						
							
						
						
							6cf44ca92c 
							
						 
					 
					
						
						
							
							Improve how the list entry Account component looks when target is blocked/follow is requested  
						
						
						
						
					 
					
						2017-01-16 19:36:32 +01:00 
						 
				 
			
				
					
						
							
							
								Eugen Rochko 
							
						 
					 
					
						
						
						
						
							
						
						
							7d53ee73f3 
							
						 
					 
					
						
						
							
							Fix   #238  - Add "favourites" column  
						
						
						
						
					 
					
						2017-01-16 13:28:25 +01:00 
						 
				 
			
				
					
						
							
							
								Eugen Rochko 
							
						 
					 
					
						
						
						
						
							
						
						
							1e9d2c4b1e 
							
						 
					 
					
						
						
							
							Add "not found" component to UI  
						
						
						
						
					 
					
						2017-01-10 13:50:59 +01:00 
						 
				 
			
				
					
						
							
							
								Eugen Rochko 
							
						 
					 
					
						
						
						
						
							
						
						
							3bddd647e0 
							
						 
					 
					
						
						
							
							Merge branch 'dropdown' of  https://github.com/blackle/mastodon  into blackle-dropdown  
						
						
						
						
					 
					
						2017-01-09 14:10:32 +01:00 
						 
				 
			
				
					
						
							
							
								Eugen Rochko 
							
						 
					 
					
						
						
						
						
							
						
						
							23ebf60b95 
							
						 
					 
					
						
						
							
							Improve initialState loading  
						
						
						
						
					 
					
						2017-01-09 12:37:53 +01:00 
						 
				 
			
				
					
						
							
							
								blackle 
							
						 
					 
					
						
						
						
						
							
						
						
							d64c454cfe 
							
						 
					 
					
						
						
							
							Switch to compose view when tapping 'mention' in dropdown on mobile  
						
						
						
						
					 
					
						2017-01-08 17:12:00 -05:00 
						 
				 
			
				
					
						
							
							
								Eugen Rochko 
							
						 
					 
					
						
						
						
						
							
						
						
							989c3f4002 
							
						 
					 
					
						
						
							
							Add tab bar alternative to desktop UI, upgrade react & react-redux  
						
						
						
						
					 
					
						2017-01-06 22:09:55 +01:00 
						 
				 
			
				
					
						
							
							
								Jessica Stokes 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							0c600e9db6 
							
						 
					 
					
						
						
							
							Move "getting started" to its own route  
						
						
						
						
					 
					
						2017-01-04 19:30:02 -08:00 
						 
				 
			
				
					
						
							
							
								Eugen Rochko 
							
						 
					 
					
						
						
						
						
							
						
						
							3689c119f0 
							
						 
					 
					
						
						
							
							Replacing follow requests in the settings area with in-UI column  
						
						
						
						
					 
					
						2016-12-26 21:33:51 +01:00 
						 
				 
			
				
					
						
							
							
								Stanislav Makar 
							
						 
					 
					
						
						
						
						
							
						
						
							d2ab41aea4 
							
						 
					 
					
						
						
							
							Declare Ukrainian  
						
						... 
						
						
						
						Closes : #345  
					
						2016-12-08 18:57:58 +02:00 
						 
				 
			
				
					
						
							
							
								Eugen Rochko 
							
						 
					 
					
						
						
						
						
							
						
						
							79e41fbd51 
							
						 
					 
					
						
						
							
							Forgot to enable hungarian translation in the frontend  
						
						
						
						
					 
					
						2016-11-28 13:55:45 +01:00 
						 
				 
			
				
					
						
							
							
								Eugen Rochko 
							
						 
					 
					
						
						
						
						
							
						
						
							66ab0d0d56 
							
						 
					 
					
						
						
							
							Enabling portuguese and hungarian translations, which are awfully incomplete  
						
						
						
						
					 
					
						2016-11-28 13:55:03 +01:00 
						 
				 
			
				
					
						
							
							
								Eugen Rochko 
							
						 
					 
					
						
						
						
						
							
						
						
							7cee27f517 
							
						 
					 
					
						
						
							
							Fix unfollows not clearing reblogs, fix blocks not clearing reblogs and notifications,  
						
						... 
						
						
						
						skip ActionCable for follow/unfollow/block events, instead clear UI from
blocked account's posts instantly if block request succeeds. Add forgotten
i18n for sensitive content 
						
						
					 
					
						2016-11-23 22:57:57 +01:00 
						 
				 
			
				
					
						
							
							
								nicolas 
							
						 
					 
					
						
						
						
						
							
						
						
							f9bd3d8808 
							
						 
					 
					
						
						
							
							Adding French locale to mastodon.jsx  
						
						
						
						
					 
					
						2016-11-22 10:21:56 +01:00 
						 
				 
			
				
					
						
							
							
								Eugen Rochko 
							
						 
					 
					
						
						
						
						
							
						
						
							e3665c1d67 
							
						 
					 
					
						
						
							
							Try to fix for browsers that don't support notifications  
						
						
						
						
					 
					
						2016-11-21 10:59:59 +01:00 
						 
				 
			
				
					
						
							
							
								Eugen Rochko 
							
						 
					 
					
						
						
						
						
							
						
						
							d32e0364f9 
							
						 
					 
					
						
						
							
							Switch to compose route when replying and compose is not mounted  
						
						
						
						
					 
					
						2016-11-21 10:52:11 +01:00 
						 
				 
			
				
					
						
							
							
								Eugen Rochko 
							
						 
					 
					
						
						
						
						
							
						
						
							fb48cc3b74 
							
						 
					 
					
						
						
							
							Desktop notifications  
						
						
						
						
					 
					
						2016-11-21 10:24:50 +01:00 
						 
				 
			
				
					
						
							
							
								Eugen Rochko 
							
						 
					 
					
						
						
						
						
							
						
						
							38dd85daab 
							
						 
					 
					
						
						
							
							Adding notifications column  
						
						
						
						
					 
					
						2016-11-20 19:39:58 +01:00