André Lewin 
								
							 
						 
						
							
							
							
							
								
							
							
								783de713cd 
								
							 
						 
						
							
							
								
								Merge branch 'master' into master  
							
							
							
						 
						
							2017-04-05 20:28:58 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									axolotl 
								
							 
						 
						
							
							
							
							
								
							
							
								f6463e595f 
								
							 
						 
						
							
							
								
								Added Esperanto translation inside the javascripts folder  
							
							
							
						 
						
							2017-04-04 20:54:42 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									JantsoP 
								
							 
						 
						
							
							
							
							
								
							
							
								4949cc46d8 
								
							 
						 
						
							
							
								
								add finnish translation  
							
							... 
							
							
							
							add finnish translation 
							
						 
						
							2017-04-03 13:33:43 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Eugen Rochko 
								
							 
						 
						
							
							
							
							
								
							
							
								eb85833dc7 
								
							 
						 
						
							
							
								
								Keep track of which timelines are connected live to avoid redundant  
							
							... 
							
							
							
							refreshes on navigation 
							
						 
						
							2017-04-02 21:44:06 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Eugen Rochko 
								
							 
						 
						
							
							
							
							
								
							
							
								b794690bfe 
								
							 
						 
						
							
							
								
								Made modal system more generic  
							
							
							
						 
						
							2017-04-01 22:11:28 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Kit Redgrave 
								
							 
						 
						
							
							
							
							
								
							
							
								4554ccd5d0 
								
							 
						 
						
							
							
								
								Mute button progress so far. WIP, doesn't entirely work correctly.  
							
							
							
						 
						
							2017-03-01 22:31:21 -06:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Eugen Rochko 
								
							 
						 
						
							
							
							
							
								
							
							
								95407b7c8e 
								
							 
						 
						
							
							
								
								Improve status reselect, do not display "load more" when no next link available  
							
							
							
						 
						
							2017-02-22 16:30:09 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Eugen Rochko 
								
							 
						 
						
							
							
							
							
								
							
							
								36faf4e55f 
								
							 
						 
						
							
							
								
								Adjust naming of public timeline -> "local timeline" vs "whole known network"  
							
							
							
						 
						
							2017-02-19 21:49:14 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Eugen Rochko 
								
							 
						 
						
							
							
							
							
								
							
							
								c7427bf3c9 
								
							 
						 
						
							
							
								
								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 
								
							 
						 
						
							
							
							
							
								
							
							
								2cc31b3194 
								
							 
						 
						
							
							
								
								Adding POST /api/v1/reports API, and a UI for submitting reports  
							
							
							
						 
						
							2017-02-14 20:59:26 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Eugen Rochko 
								
							 
						 
						
							
							
							
							
								
							
							
								1f106f7955 
								
							 
						 
						
							
							
								
								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 
								
							 
						 
						
							
							
							
							
								
							
							
								d384845469 
								
							 
						 
						
							
							
								
								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 
								
							 
						 
						
							
							
							
							
								
							
							
								97bbbcb06c 
								
							 
						 
						
							
							
								
								Add next/previous navigation in modal for media attachments  
							
							
							
						 
						
							2017-02-05 02:48:11 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Eugen Rochko 
								
							 
						 
						
							
							
							
							
								
							
							
								9bd2b6be86 
								
							 
						 
						
							
							
								
								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 
								
							 
						 
						
							
							
							
							
								
							
							
								727d236fcc 
								
							 
						 
						
							
							
								
								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 
								
							 
						 
						
							
							
							
							
								
							
							
								b9ec5973eb 
								
							 
						 
						
							
							
								
								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 
								
							 
						 
						
							
							
							
							
								
							
							
								3f30e91462 
								
							 
						 
						
							
							
								
								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 
								
							 
						 
						
							
							
							
							
								
							
							
								f4d7f4c687 
								
							 
						 
						
							
							
								
								Fix   #238  - Add "favourites" column  
							
							
							
						 
						
							2017-01-16 13:28:25 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Eugen Rochko 
								
							 
						 
						
							
							
							
							
								
							
							
								15b183117c 
								
							 
						 
						
							
							
								
								Add "not found" component to UI  
							
							
							
						 
						
							2017-01-10 13:50:59 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Eugen Rochko 
								
							 
						 
						
							
							
							
							
								
							
							
								a1783b80b2 
								
							 
						 
						
							
							
								
								Merge branch 'dropdown' of  https://github.com/blackle/mastodon  into blackle-dropdown  
							
							
							
						 
						
							2017-01-09 14:10:32 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Eugen Rochko 
								
							 
						 
						
							
							
							
							
								
							
							
								c1c814e6a1 
								
							 
						 
						
							
							
								
								Improve initialState loading  
							
							
							
						 
						
							2017-01-09 12:37:53 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									blackle 
								
							 
						 
						
							
							
							
							
								
							
							
								a697b5473a 
								
							 
						 
						
							
							
								
								Switch to compose view when tapping 'mention' in dropdown on mobile  
							
							
							
						 
						
							2017-01-08 17:12:00 -05:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Eugen Rochko 
								
							 
						 
						
							
							
							
							
								
							
							
								0dac73b5cc 
								
							 
						 
						
							
							
								
								Add tab bar alternative to desktop UI, upgrade react & react-redux  
							
							
							
						 
						
							2017-01-06 22:09:55 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Jessica Stokes 
								
							 
						 
						
							
							
							
							
								
							
							
								b02a33430f 
								
							 
						 
						
							
							
								
								Move "getting started" to its own route  
							
							
							
						 
						
							2017-01-04 19:30:02 -08:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Eugen Rochko 
								
							 
						 
						
							
							
							
							
								
							
							
								6a54df90c8 
								
							 
						 
						
							
							
								
								Replacing follow requests in the settings area with in-UI column  
							
							
							
						 
						
							2016-12-26 21:33:51 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Stanislav Makar 
								
							 
						 
						
							
							
							
							
								
							
							
								fffd718696 
								
							 
						 
						
							
							
								
								Declare Ukrainian  
							
							... 
							
							
							
							Closes : #345  
						
							2016-12-08 18:57:58 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Eugen Rochko 
								
							 
						 
						
							
							
							
							
								
							
							
								3439869ca1 
								
							 
						 
						
							
							
								
								Forgot to enable hungarian translation in the frontend  
							
							
							
						 
						
							2016-11-28 13:55:45 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Eugen Rochko 
								
							 
						 
						
							
							
							
							
								
							
							
								ef93efbb5b 
								
							 
						 
						
							
							
								
								Enabling portuguese and hungarian translations, which are awfully incomplete  
							
							
							
						 
						
							2016-11-28 13:55:03 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Eugen Rochko 
								
							 
						 
						
							
							
							
							
								
							
							
								f6d196255c 
								
							 
						 
						
							
							
								
								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 
								
							 
						 
						
							
							
							
							
								
							
							
								1555bf8400 
								
							 
						 
						
							
							
								
								Adding French locale to mastodon.jsx  
							
							
							
						 
						
							2016-11-22 10:21:56 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Eugen Rochko 
								
							 
						 
						
							
							
							
							
								
							
							
								3624a8b6dd 
								
							 
						 
						
							
							
								
								Try to fix for browsers that don't support notifications  
							
							
							
						 
						
							2016-11-21 10:59:59 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Eugen Rochko 
								
							 
						 
						
							
							
							
							
								
							
							
								524847e4e1 
								
							 
						 
						
							
							
								
								Switch to compose route when replying and compose is not mounted  
							
							
							
						 
						
							2016-11-21 10:52:11 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Eugen Rochko 
								
							 
						 
						
							
							
							
							
								
							
							
								80d58c6c04 
								
							 
						 
						
							
							
								
								Desktop notifications  
							
							
							
						 
						
							2016-11-21 10:24:50 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Eugen Rochko 
								
							 
						 
						
							
							
							
							
								
							
							
								951843e646 
								
							 
						 
						
							
							
								
								Adding notifications column  
							
							
							
						 
						
							2016-11-20 19:39:58 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Eugen Rochko 
								
							 
						 
						
							
							
							
							
								
							
							
								42fb16ec3a 
								
							 
						 
						
							
							
								
								Activating Spanish i18n  
							
							
							
						 
						
							2016-11-19 00:10:47 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Eugen Rochko 
								
							 
						 
						
							
							
							
							
								
							
							
								a82a15a38e 
								
							 
						 
						
							
							
								
								Adding german localization  
							
							
							
						 
						
							2016-11-18 15:53:46 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Eugen Rochko 
								
							 
						 
						
							
							
							
							
								
							
							
								2096fc62ec 
								
							 
						 
						
							
							
								
								Add an Intl polyfill  
							
							
							
						 
						
							2016-11-17 16:34:36 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Eugen Rochko 
								
							 
						 
						
							
							
							
							
								
							
							
								43daf0be85 
								
							 
						 
						
							
							
								
								Adding react-intl i18n to the frontend. No translations yet  
							
							
							
						 
						
							2016-11-16 17:20:52 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Eugen Rochko 
								
							 
						 
						
							
							
							
							
								
							
							
								0f7a388de6 
								
							 
						 
						
							
							
								
								Fix   #110  - Make web UI use browser history, change links in e-mails to link to that  
							
							
							
						 
						
							2016-11-13 14:02:34 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Eugen Rochko 
								
							 
						 
						
							
							
							
							
								
							
							
								cb22dce970 
								
							 
						 
						
							
							
								
								Adding hashtags  
							
							
							
						 
						
							2016-11-05 17:13:14 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Eugen Rochko 
								
							 
						 
						
							
							
							
							
								
							
							
								5285e9b1f9 
								
							 
						 
						
							
							
								
								Adding list of who favourited status  
							
							
							
						 
						
							2016-11-04 13:39:24 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Eugen Rochko 
								
							 
						 
						
							
							
							
							
								
							
							
								ef16a48c5f 
								
							 
						 
						
							
							
								
								Optimize how statuses are re-rendered and relative time intervals  
							
							
							
						 
						
							2016-11-04 12:48:53 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Eugen Rochko 
								
							 
						 
						
							
							
							
							
								
							
							
								1f9aaede07 
								
							 
						 
						
							
							
								
								Add list of who reblogged status  
							
							
							
						 
						
							2016-11-03 20:16:14 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Eugen Rochko 
								
							 
						 
						
							
							
							
							
								
							
							
								53de3b66ce 
								
							 
						 
						
							
							
								
								Refactoring redux state into different reducers  
							
							
							
						 
						
							2016-10-30 15:06:43 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Eugen Rochko 
								
							 
						 
						
							
							
							
							
								
							
							
								b3aab1f3bc 
								
							 
						 
						
							
							
								
								Adding following/followers lists to the UI  
							
							
							
						 
						
							2016-10-27 21:59:56 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Eugen Rochko 
								
							 
						 
						
							
							
							
							
								
							
							
								68535f58cd 
								
							 
						 
						
							
							
								
								Add opening images in a modal window  
							
							
							
						 
						
							2016-10-24 18:08:23 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Eugen Rochko 
								
							 
						 
						
							
							
							
							
								
							
							
								5bea337189 
								
							 
						 
						
							
							
								
								Move status components inside individual containers. We still need to select  
							
							... 
							
							
							
							all statuses/accounts to assemble, but at least lists don't have to be
re-rendered all the time now. Also add "mention" dropdown option 
							
						 
						
							2016-10-24 18:08:23 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Eugen Rochko 
								
							 
						 
						
							
							
							
							
								
							
							
								4470966cd9 
								
							 
						 
						
							
							
								
								Fix   #100  - Add "back" button to certain views  
							
							... 
							
							
							
							Also fix reloading of timelines after merge-type events 
							
						 
						
							2016-10-19 18:20:19 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Eugen Rochko 
								
							 
						 
						
							
							
							
							
								
							
							
								fac770fccd 
								
							 
						 
						
							
							
								
								Remember scroll position when navigating back, do not needlessly reload  
							
							... 
							
							
							
							entire timelines (only fetch since last known ID). Side effect: account
timelines no longer update in real-time 
							
						 
						
							2016-10-18 23:06:28 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Eugen Rochko 
								
							 
						 
						
							
							
							
							
								
							
							
								7b52b5ab9e 
								
							 
						 
						
							
							
								
								Don't preload timelines as props, load them when timeline component is mounted  
							
							... 
							
							
							
							This prevents the bug where if you go "back" to the UI after navigating to
another page it loads with the old set of statuses 
							
						 
						
							2016-10-16 19:23:17 +02:00