ThibG 
								
							 
						 
						
							
							
							
							
								
							
							
								38272bbeb1 
								
							 
						 
						
							
							
								
								Merge pull request  #1049  from ThibG/glitch-soc/merge-upstream  
							
							... 
							
							
							
							Merge upstream changes 
							
						 
						
							2019-05-15 18:44:21 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Thibaut Girka 
								
							 
						 
						
							
							
							
							
								
							
							
								422dd06806 
								
							 
						 
						
							
							
								
								Merge branch 'master' into glitch-soc/merge-upstream  
							
							
							
						 
						
							2019-05-15 17:11:40 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Neil Moore 
								
							 
						 
						
							
							
							
							
								
							
							
								59f6637559 
								
							 
						 
						
							
							
								
								Adds click-able div that expands status ( #10733 ) ( #10766 )  
							
							... 
							
							
							
							The clickable div is positioned under the account avatar and covers
all empty space below it to the end of the status. 
							
						 
						
							2019-05-15 06:53:23 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Thibaut Girka 
								
							 
						 
						
							
							
							
							
								
							
							
								d8e9a04354 
								
							 
						 
						
							
							
								
								Fix rich text style in reply indicator  
							
							
							
						 
						
							2019-05-13 17:13:02 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Thibaut Girka 
								
							 
						 
						
							
							
							
							
								
							
							
								9f0ff9b6ea 
								
							 
						 
						
							
							
								
								Fix rich text styling on public pages  
							
							
							
						 
						
							2019-05-13 17:13:02 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Thibaut Girka 
								
							 
						 
						
							
							
							
							
								
							
							
								6e625755a6 
								
							 
						 
						
							
							
								
								Fix text color of some formatted elements in notifications  
							
							
							
						 
						
							2019-05-12 19:23:32 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									nzws 
								
							 
						 
						
							
							
							
							
								
							
							
								f79d089b65 
								
							 
						 
						
							
							
								
								Fix some colors in light theme ( #10754 )  
							
							... 
							
							
							
							* Fix typo in light theme
* Fix background color of empty column 
							
						 
						
							2019-05-12 05:15:42 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									ThibG 
								
							 
						 
						
							
							
							
							
								
							
							
								cfb69164ad 
								
							 
						 
						
							
							
								
								Fix incorrect reference to raw_content (it is raw_text instead) ( #10753 )  
							
							
							
						 
						
							2019-05-11 23:56:07 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									ThibG 
								
							 
						 
						
							
							
							
							
								
							
							
								c8195e2da1 
								
							 
						 
						
							
							
								
								[Glitch] Use raw content if available on Delete & Redraft  
							
							... 
							
							
							
							Port front-end changes from 2a917031c9 
							
						 
						
							2019-05-11 21:46:23 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Thibaut Girka 
								
							 
						 
						
							
							
							
							
								
							
							
								5262820fae 
								
							 
						 
						
							
							
								
								Merge branch 'master' into glitch-soc/merge-upstream  
							
							
							
						 
						
							2019-05-11 18:23:46 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Thibaut Girka 
								
							 
						 
						
							
							
							
							
								
							
							
								46b5085ced 
								
							 
						 
						
							
							
								
								Use a checkbox for the “Mark media as sensitive” composer button  
							
							... 
							
							
							
							Fixes  #1039  
						
							2019-05-11 12:35:38 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									ThibG 
								
							 
						 
						
							
							
							
							
								
							
							
								0bb3ba2406 
								
							 
						 
						
							
							
								
								Merge pull request  #1043  from ThibG/glitch-soc/merge-upstream  
							
							... 
							
							
							
							Merge upstream changes 
							
						 
						
							2019-05-11 12:35:25 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									ThibG 
								
							 
						 
						
							
							
							
							
								
							
							
								2a917031c9 
								
							 
						 
						
							
							
								
								Add toot source to delete result to ease Delete & Redraft ( #10669 )  
							
							... 
							
							
							
							* Return Status with raw text in raw_content when deleting a status
* Use raw content if available on delete & redraft
* Rename raw_content to text; do not serialize formatted content when source is requested 
							
						 
						
							2019-05-11 06:46:43 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Maciek Baron 
								
							 
						 
						
							
							
							
							
								
							
							
								e060819020 
								
							 
						 
						
							
							
								
								[Glitch] Improve poll link accessibility  
							
							... 
							
							
							
							Port fc40391743 
							
						 
						
							2019-05-10 19:05:57 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									nzws 
								
							 
						 
						
							
							
							
							
								
							
							
								f625501c05 
								
							 
						 
						
							
							
								
								[Glitch] Fix some colors of high contrast theme  
							
							... 
							
							
							
							Signed-off-by: Thibaut Girka <thib@sitedethib.com> 
							
						 
						
							2019-05-10 18:59:12 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Aurélien Reeves 
								
							 
						 
						
							
							
							
							
								
							
							
								22541e98e2 
								
							 
						 
						
							
							
								
								[Glitch] Add confirm modal for unboosting toots  
							
							... 
							
							
							
							Port d225a952a8 
							
						 
						
							2019-05-10 18:56:01 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Alix Rossi 
								
							 
						 
						
							
							
							
							
								
							
							
								062684bcf8 
								
							 
						 
						
							
							
								
								i18n: Update French translations ( #10747 )  
							
							... 
							
							
							
							* Update French JSON
* i18n: Update fr.yml
* i18n: Update simple_form.fr.yml
* Update simple_form.fr.yml
* Update fr.yml 
							
						 
						
							2019-05-10 18:09:46 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Alix Rossi 
								
							 
						 
						
							
							
							
							
								
							
							
								1959e4e5ec 
								
							 
						 
						
							
							
								
								i18n: Update Corsican translations ( #10746 )  
							
							... 
							
							
							
							* i18n: Update Corsican translations
* Update co.yml
* Fix a translation in co.yml 
							
						 
						
							2019-05-10 18:09:34 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									ThibG 
								
							 
						 
						
							
							
							
							
								
							
							
								01ba6c5d83 
								
							 
						 
						
							
							
								
								Change icon and label depending on whether media is marked as sensitive ( #10748 )  
							
							... 
							
							
							
							* Change icon and label depending on whether media is marked as sensitive
* WiP use a checkbox 
							
						 
						
							2019-05-10 17:59:57 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Thibaut Girka 
								
							 
						 
						
							
							
							
							
								
							
							
								1bf48b01e3 
								
							 
						 
						
							
							
								
								Merge branch 'master' into glitch-soc/merge-upstream  
							
							... 
							
							
							
							Conflicts:
- app/controllers/statuses_controller.rb
  minor conflict because of glitch-soc's theming system
- app/controllers/stream_entries_controller.rb
  minor conflict because of glitch-soc's theming system 
							
						 
						
							2019-05-10 17:09:12 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Thibaut Girka 
								
							 
						 
						
							
							
							
							
								
							
							
								e55cf0042f 
								
							 
						 
						
							
							
								
								Fix media description confirmation modal  
							
							... 
							
							
							
							Fixes  #1040  
						
							2019-05-10 11:49:00 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Aurélien Reeves 
								
							 
						 
						
							
							
							
							
								
							
							
								d225a952a8 
								
							 
						 
						
							
							
								
								Add confirm modal for unboosting toots ( #10287 )  
							
							... 
							
							
							
							[#3815 ]
Display the boost modal also when unboosting toots. 
							
						 
						
							2019-05-09 22:39:26 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									ThibG 
								
							 
						 
						
							
							
							
							
								
							
							
								5cf2f8c646 
								
							 
						 
						
							
							
								
								Add emoji suggestions to CW and poll option fields ( #10555 )  
							
							... 
							
							
							
							* Refactor selectComposeSuggestion so that different paths can be updated
* Add suggestions in CW field
* Add emoji suggestion to poll options
* Attempt to fix CSS
* Hide suggestions by default
They will be enabled if the input has focus 
							
						 
						
							2019-05-09 22:10:27 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Maciek Baron 
								
							 
						 
						
							
							
							
							
								
							
							
								fc40391743 
								
							 
						 
						
							
							
								
								Improve poll link accessibility ( #10720 )  
							
							... 
							
							
							
							* Add distinction between hover and active/focus states
* Resolves  #10198  
							
						 
						
							2019-05-09 22:03:32 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Jeong Arm 
								
							 
						 
						
							
							
							
							
								
							
							
								3288f4a571 
								
							 
						 
						
							
							
								
								Bring back crossed eye icon on gallery ( #10715 )  
							
							
							
						 
						
							2019-05-08 18:01:33 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Thibaut Girka 
								
							 
						 
						
							
							
							
							
								
							
							
								e9f0c31dc6 
								
							 
						 
						
							
							
								
								Fix tabs bar on mobile  
							
							... 
							
							
							
							Fixes  #1037  
						
							2019-05-08 00:32:53 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									nzws 
								
							 
						 
						
							
							
							
							
								
							
							
								6b71076391 
								
							 
						 
						
							
							
								
								Fix some colors of high contrast theme ( #10711 )  
							
							... 
							
							
							
							* Fix "nothing here" text color of high contrast
* Fix counter border color of high contrast 
							
						 
						
							2019-05-07 23:53:58 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Thibaut Girka 
								
							 
						 
						
							
							
							
							
								
							
							
								40a480ea34 
								
							 
						 
						
							
							
								
								Fix front-end crash when a video has a blurhash and is hidden behind a CW  
							
							
							
						 
						
							2019-05-07 22:33:37 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									spla 
								
							 
						 
						
							
							
							
							
								
							
							
								13244f7bb3 
								
							 
						 
						
							
							
								
								i18n Update Catalan translation ( #10719 )  
							
							... 
							
							
							
							* Updated Catalan strings
* Update ca.yml
* Update ca.yml
* Update ca.yml
* Update ca.yml
* Update ca.yml
* Update ca.yml
* Update ca.yml
* Update simple_form.ca.yml
* Update simple_form.ca.yml
* Update simple_form.ca.yml
* bundle exec i18n-tasks
* Update ca.json
* Update simple_form.ca.yml
* i18n: Update Catalan translations
* i18n: Update Catalan translations
* i18n: Update Catalan translations
* i18n: Update Catalan translations
* i18n: Update Catalan translations
* i18n: Update Catalan translations
* i18n: Update Catalan translations
* i18n: Update Catalan translations
* i18n: Update Catalan translations
* i18n: Update Catalan translation
* i18n Update Catalan translation 
							
						 
						
							2019-05-07 00:55:37 +09:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									ThibG 
								
							 
						 
						
							
							
							
							
								
							
							
								139ef769f7 
								
							 
						 
						
							
							
								
								Add description on hover in media gallery ( #10713 )  
							
							
							
						 
						
							2019-05-06 05:33:56 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Thibaut Girka 
								
							 
						 
						
							
							
							
							
								
							
							
								5052b8c29f 
								
							 
						 
						
							
							
								
								Fix content warning button displaying a link icon when no status card is set  
							
							
							
						 
						
							2019-05-05 21:47:05 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									mayaeh 
								
							 
						 
						
							
							
							
							
								
							
							
								683a5ae765 
								
							 
						 
						
							
							
								
								i18n: Update Japanese translations ( #10706 )  
							
							... 
							
							
							
							* Update Japanese translations.
run yarn manage:translations
This commit includes translations by some users that were done at the transifex.
* Reduce translation text because it becomes two lines. 
							
						 
						
							2019-05-06 04:34:32 +09:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									jeroenpraat 
								
							 
						 
						
							
							
							
							
								
							
							
								027f35c6a5 
								
							 
						 
						
							
							
								
								1 NL string update ( #10709 )  
							
							... 
							
							
							
							* 1 NL string update
No that weblate isn't used anymore, it would be fine if, or the english strings are update, or there is somewhere an explanation how to generate new strings for a language
* Update nl.json 
							
						 
						
							2019-05-06 04:33:24 +09:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Kirishima21 
								
							 
						 
						
							
							
							
							
								
							
							
								1592cab613 
								
							 
						 
						
							
							
								
								fix pinned columns ’s Media-only button  
							
							... 
							
							
							
							Media-only toggles could not be used on pinned columns.
The commit fixes this problem. 
							
						 
						
							2019-05-05 20:54:21 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Baptiste Gelez 
								
							 
						 
						
							
							
							
							
								
							
							
								83665f0357 
								
							 
						 
						
							
							
								
								[Glitch] Make sure the instance banner is never cropped  
							
							... 
							
							
							
							Port 05b2a77a6d 
							
						 
						
							2019-05-05 12:29:06 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Thibaut Girka 
								
							 
						 
						
							
							
							
							
								
							
							
								23829e09f5 
								
							 
						 
						
							
							
								
								Merge branch 'master' into glitch-soc/merge-upstream  
							
							
							
						 
						
							2019-05-05 12:28:10 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Aditoo17 
								
							 
						 
						
							
							
							
							
								
							
							
								71fd62835e 
								
							 
						 
						
							
							
								
								I18n: Update Czech translation  🇨🇿  ( #10704 )  
							
							... 
							
							
							
							* I18n: Update Czech translation
* Tiny fix 
							
						 
						
							2019-05-05 15:33:33 +09:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Baptiste Gelez 
								
							 
						 
						
							
							
							
							
								
							
							
								05b2a77a6d 
								
							 
						 
						
							
							
								
								Make sure the instance banner is never cropped ( #10702 )  
							
							
							
						 
						
							2019-05-05 01:07:15 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Thibaut Girka 
								
							 
						 
						
							
							
							
							
								
							
							
								850f8195fd 
								
							 
						 
						
							
							
								
								Minor style fixes  
							
							
							
						 
						
							2019-05-04 23:05:43 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Eugen Rochko 
								
							 
						 
						
							
							
							
							
								
							
							
								5df7b98c2b 
								
							 
						 
						
							
							
								
								[Glitch] Change font weight of sensitive button to 500  
							
							... 
							
							
							
							Port f7879bbe08 
							
						 
						
							2019-05-04 20:41:21 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Eugen Rochko 
								
							 
						 
						
							
							
							
							
								
							
							
								8050f86d04 
								
							 
						 
						
							
							
								
								[Glitch] Make the "mark media as sensitive" button more obvious in web UI  
							
							... 
							
							
							
							Port cc39785d45 
							
						 
						
							2019-05-04 20:41:21 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Thibaut Girka 
								
							 
						 
						
							
							
							
							
								
							
							
								167808363d 
								
							 
						 
						
							
							
								
								Add visibility icon back in media gallery  
							
							
							
						 
						
							2019-05-04 20:06:17 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Thibaut Girka 
								
							 
						 
						
							
							
							
							
								
							
							
								43dc5ad0e5 
								
							 
						 
						
							
							
								
								Add back description on hover  
							
							
							
						 
						
							2019-05-04 20:03:37 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									ThibG 
								
							 
						 
						
							
							
							
							
								
							
							
								d0342a1a63 
								
							 
						 
						
							
							
								
								[Glitch] Fix transition: all  
							
							... 
							
							
							
							Port 9e044c9649 
							
						 
						
							2019-05-04 19:53:09 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									ThibG 
								
							 
						 
						
							
							
							
							
								
							
							
								09d6a2920d 
								
							 
						 
						
							
							
								
								[Glitch] Make the cursor icon consistant across media types in account media gallery  
							
							
							
						 
						
							2019-05-04 19:16:51 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Thibaut Girka 
								
							 
						 
						
							
							
							
							
								
							
							
								5d6f4ef070 
								
							 
						 
						
							
							
								
								Merge branch 'master' into glitch-soc/merge-upstream  
							
							
							
						 
						
							2019-05-04 19:15:50 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Eugen Rochko 
								
							 
						 
						
							
							
							
							
								
							
							
								52c09770fe 
								
							 
						 
						
							
							
								
								[Glitch] Add button to view context to media modal  
							
							... 
							
							
							
							Port 4aabc452d0 
							
						 
						
							2019-05-04 19:10:24 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Eugen Rochko 
								
							 
						 
						
							
							
							
							
								
							
							
								6138cad296 
								
							 
						 
						
							
							
								
								[Glitch] Fix alignment of items in the account gallery in web UI and load more per page  
							
							... 
							
							
							
							Port 78f5b96bf6 
							
						 
						
							2019-05-04 18:59:11 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Eugen Rochko 
								
							 
						 
						
							
							
							
							
								
							
							
								3b9ff1fa34 
								
							 
						 
						
							
							
								
								[Glitch] Change account gallery in web UI  
							
							... 
							
							
							
							Port db73f8e585 
							
						 
						
							2019-05-04 18:54:57 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Thibaut Girka 
								
							 
						 
						
							
							
							
							
								
							
							
								61b5fd518c 
								
							 
						 
						
							
							
								
								Minor CSS fixes  
							
							
							
						 
						
							2019-05-04 18:18:15 +02:00