Thibaut Girka 
								
							 
						 
						
							
							
							
							
								
							
							
								0ead513c58 
								
							 
						 
						
							
							
								
								Fix settings/flavours  
							
							... 
							
							
							
							Update theming system to use new paths for media files 
							
						 
						
							2019-03-16 16:21:20 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Eugen Rochko 
								
							 
						 
						
							
							
							
							
								
							
							
								929b66be61 
								
							 
						 
						
							
							
								
								[Glitch] Add relationship manager UI  
							
							... 
							
							
							
							Port SCSS changes from 4fa2d55d4e 
							
						 
						
							2019-03-16 14:36:29 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Eugen Rochko 
								
							 
						 
						
							
							
							
							
								
							
							
								80ae1f7bcf 
								
							 
						 
						
							
							
								
								[Glitch] Admission-based registrations mode  
							
							... 
							
							
							
							Port SCSS changes from 73fb7bfa0f 
							
						 
						
							2019-03-14 17:54:44 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Eugen Rochko 
								
							 
						 
						
							
							
							
							
								
							
							
								c128abc413 
								
							 
						 
						
							
							
								
								[Glitch] Improve invites list with click-to-copy inputs  
							
							... 
							
							
							
							Port 2e6c6ce855 
							
						 
						
							2019-03-14 17:44:39 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									ThibG 
								
							 
						 
						
							
							
							
							
								
							
							
								0381a07606 
								
							 
						 
						
							
							
								
								[Glitch] Add UI for enabling/disabling poll notifications  
							
							
							
						 
						
							2019-03-13 22:21:52 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Eugen Rochko 
								
							 
						 
						
							
							
							
							
								
							
							
								177258aa57 
								
							 
						 
						
							
							
								
								[Glitch] Add muted style for polls in web UI  
							
							... 
							
							
							
							Port de50bc6def 
							
						 
						
							2019-03-13 16:02:36 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Eugen Rochko 
								
							 
						 
						
							
							
							
							
								
							
							
								ac5169aa31 
								
							 
						 
						
							
							
								
								[Glitch] Fix public timeline page not paginating correctly  
							
							... 
							
							
							
							Port 3a435fa130 
							
						 
						
							2019-03-13 15:56:51 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Eugen Rochko 
								
							 
						 
						
							
							
							
							
								
							
							
								21366f9e05 
								
							 
						 
						
							
							
								
								[Glitch] Redesign landing page  
							
							... 
							
							
							
							Port 56822606f4 
							
						 
						
							2019-03-13 15:53:00 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Thibaut Girka 
								
							 
						 
						
							
							
							
							
								
							
							
								043978a20e 
								
							 
						 
						
							
							
								
								Remove leftover console.log  
							
							
							
						 
						
							2019-03-11 14:39:45 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Thibaut Girka 
								
							 
						 
						
							
							
							
							
								
							
							
								1e4ea4f391 
								
							 
						 
						
							
							
								
								Make clicking on the account and status column headers scroll to top  
							
							
							
						 
						
							2019-03-11 14:19:16 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									ThibG 
								
							 
						 
						
							
							
							
							
								
							
							
								91045bef61 
								
							 
						 
						
							
							
								
								Merge pull request  #953  from ThibG/glitch-soc/merge-upstream  
							
							... 
							
							
							
							Merge upstream changes 
							
						 
						
							2019-03-11 13:23:54 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Thibaut Girka 
								
							 
						 
						
							
							
							
							
								
							
							
								3a7fb657f3 
								
							 
						 
						
							
							
								
								[Glitch] Add support for poll ending notifications  
							
							... 
							
							
							
							Port front-end parts of 11ce444b8b 
							
						 
						
							2019-03-11 13:08:21 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									ash lea 
								
							 
						 
						
							
							
							
							
								
							
							
								00bc35891b 
								
							 
						 
						
							
							
								
								add local setting to auto reveal media behind cw  
							
							
							
						 
						
							2019-03-11 12:14:45 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Kirishima21 
								
							 
						 
						
							
							
							
							
								
							
							
								2172dec88d 
								
							 
						 
						
							
							
								
								fix poll fotter layout  
							
							... 
							
							
							
							画面の幅が充分でないときに
表示外にまでボタンが拡大されてしまわないように修正。 
							
						 
						
							2019-03-11 12:09:30 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Eugen Rochko 
								
							 
						 
						
							
							
							
							
								
							
							
								b9a799c343 
								
							 
						 
						
							
							
								
								[Glitch] Fix NaN in Poll component  
							
							... 
							
							
							
							Port 19cccea89a 
							
						 
						
							2019-03-08 01:01:19 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Eugen Rochko 
								
							 
						 
						
							
							
							
							
								
							
							
								7565b8afa3 
								
							 
						 
						
							
							
								
								[Glitch] Fix public timelines being broken by new toots when they are not mounted  
							
							... 
							
							
							
							Port 8e9db67a6a 
							
						 
						
							2019-03-08 01:00:14 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Thibaut Girka 
								
							 
						 
						
							
							
							
							
								
							
							
								a9597fd8a6 
								
							 
						 
						
							
							
								
								Allow setting whether this is a single choice poll or multiple choices one  
							
							
							
						 
						
							2019-03-06 23:56:53 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Thibaut Girka 
								
							 
						 
						
							
							
							
							
								
							
							
								81a92465f2 
								
							 
						 
						
							
							
								
								Disable file upload when there is a poll  
							
							
							
						 
						
							2019-03-06 23:56:53 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Thibaut Girka 
								
							 
						 
						
							
							
							
							
								
							
							
								49c4e57973 
								
							 
						 
						
							
							
								
								Use server-provided poll limits instead of hardcoded ones  
							
							... 
							
							
							
							Also does not enable polls if no limits are provided by the server 
							
						 
						
							2019-03-06 23:56:53 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Thibaut Girka 
								
							 
						 
						
							
							
							
							
								
							
							
								e2d56cc90d 
								
							 
						 
						
							
							
								
								[Glitch] Port polls creation UI from upstream  
							
							
							
						 
						
							2019-03-06 23:56:53 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									ThibG 
								
							 
						 
						
							
							
							
							
								
							
							
								6b4eb1ac96 
								
							 
						 
						
							
							
								
								[Glitch] Disable the underlying button element when an ItemButton is disabled  
							
							... 
							
							
							
							Port 365f875f57 
							
						 
						
							2019-03-06 22:40:17 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Thibaut Girka 
								
							 
						 
						
							
							
							
							
								
							
							
								8d82e153f3 
								
							 
						 
						
							
							
								
								Add an icon to highlight polls behind a Content Warning  
							
							
							
						 
						
							2019-03-06 13:01:27 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Eugen Rochko 
								
							 
						 
						
							
							
							
							
								
							
							
								9844b44e99 
								
							 
						 
						
							
							
								
								Fix poll options not rendering text after vote/refresh  
							
							... 
							
							
							
							Port 9cae3a3b48 
							
						 
						
							2019-03-06 11:44:27 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Eugen Rochko 
								
							 
						 
						
							
							
							
							
								
							
							
								31017d18a5 
								
							 
						 
						
							
							
								
								Avoid line breaks in poll options  
							
							... 
							
							
							
							Port 0d8890f073 
							
						 
						
							2019-03-06 11:43:14 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Eugen Rochko 
								
							 
						 
						
							
							
							
							
								
							
							
								3ce4d88e6c 
								
							 
						 
						
							
							
								
								Render unicode emoji in polls using emoji pack  
							
							... 
							
							
							
							Port 73d3bb4a2c 
							
						 
						
							2019-03-06 11:42:25 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Thibaut Girka 
								
							 
						 
						
							
							
							
							
								
							
							
								bd97259b57 
								
							 
						 
						
							
							
								
								Fix toots opening in dynamic column when trying to interact with them  
							
							... 
							
							
							
							This fixes inline preview cards and polls, preventing them from opening
the toot in detailed view when clicking on an interactive element. 
							
						 
						
							2019-03-06 00:20:43 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Thibaut Girka 
								
							 
						 
						
							
							
							
							
								
							
							
								6ad1fc3254 
								
							 
						 
						
							
							
								
								[Glitch] Perform deep comparison for card data when receiving new props  
							
							... 
							
							
							
							Prevents embedded players from resetting when interacting with the toot 
							
						 
						
							2019-03-05 23:22:29 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Eugen Rochko 
								
							 
						 
						
							
							
							
							
								
							
							
								ec787e4205 
								
							 
						 
						
							
							
								
								Fix various issues in polls  
							
							... 
							
							
							
							Port front-end changes from 1321801577 
							
						 
						
							2019-03-05 21:35:03 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									ThibG 
								
							 
						 
						
							
							
							
							
								
							
							
								25ef8dffbc 
								
							 
						 
						
							
							
								
								Display closed polls as such  
							
							... 
							
							
							
							Port 674d232cd1 
							
						 
						
							2019-03-05 21:35:03 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									ThibG 
								
							 
						 
						
							
							
							
							
								
							
							
								469e5af537 
								
							 
						 
						
							
							
								
								Fixes to the polls UI  
							
							... 
							
							
							
							Port 4987602069 
							
						 
						
							2019-03-05 21:35:03 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Eugen Rochko 
								
							 
						 
						
							
							
							
							
								
							
							
								c156b6d696 
								
							 
						 
						
							
							
								
								Fix web UI crash on page load when detailed status has a poll  
							
							... 
							
							
							
							Port 21246d861e 
							
						 
						
							2019-03-05 21:35:03 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									ThibG 
								
							 
						 
						
							
							
							
							
								
							
							
								e31450e8ad 
								
							 
						 
						
							
							
								
								Insert polls in redux stores before statuses so it avoids crashes  
							
							... 
							
							
							
							Port 6d08fd5170 
							
						 
						
							2019-03-05 21:35:03 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Eugen Rochko 
								
							 
						 
						
							
							
							
							
								
							
							
								342d9d25bb 
								
							 
						 
						
							
							
								
								Add polls  
							
							... 
							
							
							
							Port front-end parts of 4a3acdc916 
							
						 
						
							2019-03-05 21:35:03 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Thibaut Girka 
								
							 
						 
						
							
							
							
							
								
							
							
								69fd801c8e 
								
							 
						 
						
							
							
								
								Port upstream refactoring of reducers and actions  
							
							... 
							
							
							
							Also includes 4923646361 
							
						 
						
							2019-03-05 21:35:03 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Eugen Rochko 
								
							 
						 
						
							
							
							
							
								
							
							
								0dc5c2a4a5 
								
							 
						 
						
							
							
								
								Fix home timeline perpetually reloading when empty  
							
							... 
							
							
							
							Port 0c8d1435c5 
							
						 
						
							2019-03-05 19:30:11 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Mélanie Chauvel (ariasuni) 
								
							 
						 
						
							
							
							
							
								
							
							
								c02d1558f1 
								
							 
						 
						
							
							
								
								[Glitch] Fix errors found by eslint  
							
							... 
							
							
							
							Signed-off-by: Thibaut Girka <thib@sitedethib.com> 
							
						 
						
							2019-03-01 14:01:51 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Mélanie Chauvel (ariasuni) 
								
							 
						 
						
							
							
							
							
								
							
							
								f01d004a1a 
								
							 
						 
						
							
							
								
								[Glitch] Make the column header of profile view look like the others, too  
							
							... 
							
							
							
							Signed-off-by: Thibaut Girka <thib@sitedethib.com> 
							
						 
						
							2019-03-01 14:01:51 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Mélanie Chauvel (ariasuni) 
								
							 
						 
						
							
							
							
							
								
							
							
								2a7690601a 
								
							 
						 
						
							
							
								
								[Glitch] Make the column header of toot/thread view look like the others  
							
							... 
							
							
							
							Signed-off-by: Thibaut Girka <thib@sitedethib.com> 
							
						 
						
							2019-03-01 14:01:51 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Thibaut Girka 
								
							 
						 
						
							
							
							
							
								
							
							
								bdc5cd092e 
								
							 
						 
						
							
							
								
								Port public page mastodon-light fixes from upstream  
							
							
							
						 
						
							2019-02-27 16:24:57 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Eugen Rochko 
								
							 
						 
						
							
							
							
							
								
							
							
								df01d5181e 
								
							 
						 
						
							
							
								
								Fix web UI not removing notifications after block ( #10108 )  
							
							... 
							
							
							
							Regression from #7311  
							
						 
						
							2019-02-26 19:33:59 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									abcang 
								
							 
						 
						
							
							
							
							
								
							
							
								6f471916f5 
								
							 
						 
						
							
							
								
								Keep notification when muting_notifications is true ( #7311 )  
							
							... 
							
							
							
							* Keep notification when muting_notifications is true
* Retrun mute object
* Fix test 
							
						 
						
							2019-02-26 19:33:42 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Thibaut Girka 
								
							 
						 
						
							
							
							
							
								
							
							
								fa1b843522 
								
							 
						 
						
							
							
								
								Fix non-numeric account identifiers leading to /web/accounts/NaN  
							
							... 
							
							
							
							I'm not sure what purpose these “+” served?! 
							
						 
						
							2019-02-22 17:52:21 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Thibaut Girka 
								
							 
						 
						
							
							
							
							
								
							
							
								8ded9a0c02 
								
							 
						 
						
							
							
								
								[Glitch] Internationalize unexpected error message  
							
							... 
							
							
							
							Port e8a1d0b4d4 
							
						 
						
							2019-02-18 19:49:06 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Eugen Rochko 
								
							 
						 
						
							
							
							
							
								
							
							
								e34c5db19e 
								
							 
						 
						
							
							
								
								Fix hashtag column not subscribing to stream on mount ( #10040 )  
							
							... 
							
							
							
							Fix  #9895  
						
							2019-02-18 18:16:35 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Thibaut Girka 
								
							 
						 
						
							
							
							
							
								
							
							
								2bf47542f3 
								
							 
						 
						
							
							
								
								Fix video player width not being updated to fit container width  
							
							
							
						 
						
							2019-02-18 10:44:37 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Ben Lubar 
								
							 
						 
						
							
							
							
							
								
							
							
								9ad1ca9a2b 
								
							 
						 
						
							
							
								
								Allow multi-line image descriptions. (Glitch)  
							
							
							
						 
						
							2019-02-17 15:19:12 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Thibaut Girka 
								
							 
						 
						
							
							
							
							
								
							
							
								e8ae6b050b 
								
							 
						 
						
							
							
								
								[Glitch] Fix crash on public hashtag pages when streaming fails  
							
							... 
							
							
							
							Port 3547e3e59e 
							
						 
						
							2019-02-17 14:28:25 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Thibaut Girka 
								
							 
						 
						
							
							
							
							
								
							
							
								09c6d1c534 
								
							 
						 
						
							
							
								
								[Glitch] Change buttons on timeline preview to open the interaction dialog  
							
							... 
							
							
							
							Port 6534acc019 
							
						 
						
							2019-02-17 12:39:44 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Thibaut Girka 
								
							 
						 
						
							
							
							
							
								
							
							
								9b89a7b2f2 
								
							 
						 
						
							
							
								
								Port upstream's javascript to the error page  
							
							
							
						 
						
							2019-02-17 12:27:01 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Thibaut Girka 
								
							 
						 
						
							
							
							
							
								
							
							
								da24c6aced 
								
							 
						 
						
							
							
								
								Merge branch 'master' into glitch-soc/merge-upstream  
							
							... 
							
							
							
							Conflicts:
- app/serializers/rest/instance_serializer.rb
- app/views/layouts/error.html.haml
- public/oops.png
  Took our version (same as upstream but without the things that only
  make sense in an animation).
Additional changes:
- app/javascript/flavours/vanilla/theme.yml
  Include upstream's javascript in error pages. 
							
						 
						
							2019-02-17 12:26:55 +01:00