ysksn 
								
							 
						 
						
							
							
							
							
								
							
							
								b93e317886 
								
							 
						 
						
							
							
								
								Add specs for policies ( #9591 )  
							
							... 
							
							
							
							* Add spec for RelayPolicy
* Add specs for SubscriptionPolicy
* Add specs for SettingsPolicy
* Add specs for TagPolicy
* Add specs for ReportPolicy 
							
						 
						
							2018-12-20 17:52:07 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									ysksn 
								
							 
						 
						
							
							
							
							
								
							
							
								be9640bfc2 
								
							 
						 
						
							
							
								
								Add specs for UserPolicy ( #9593 )  
							
							
							
						 
						
							2018-12-20 17:51:55 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Thibaut Girka 
								
							 
						 
						
							
							
							
							
								
							
							
								5eaf2c9e02 
								
							 
						 
						
							
							
								
								[Glitch] Back to the getting-started when pins the timeline  
							
							... 
							
							
							
							Port 5bf100f87b 
							
						 
						
							2018-12-20 14:51:28 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Thibaut Girka 
								
							 
						 
						
							
							
							
							
								
							
							
								bc113927d6 
								
							 
						 
						
							
							
								
								Move hide_followers_count logic to an helper  
							
							
							
						 
						
							2018-12-20 14:51:12 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Thibaut Girka 
								
							 
						 
						
							
							
							
							
								
							
							
								bd23288a52 
								
							 
						 
						
							
							
								
								Add a per-user setting to hide followers count  
							
							... 
							
							
							
							This is only available if the instance-wide setting isn't set and allows
people to hide their own followers count. This does not hide others' to
them. 
							
						 
						
							2018-12-20 14:51:12 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Thibaut Girka 
								
							 
						 
						
							
							
							
							
								
							
							
								9e04b2e8a4 
								
							 
						 
						
							
							
								
								Per-user followers count display in profile directory  
							
							
							
						 
						
							2018-12-20 14:51:12 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Thibaut Girka 
								
							 
						 
						
							
							
							
							
								
							
							
								1b18eb49e3 
								
							 
						 
						
							
							
								
								Hide negative follower counts from glitch flavour  
							
							
							
						 
						
							2018-12-20 14:51:12 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Thibaut Girka 
								
							 
						 
						
							
							
							
							
								
							
							
								a1c56fcef1 
								
							 
						 
						
							
							
								
								Add admin setting to disable followers count  
							
							
							
						 
						
							2018-12-20 14:51:12 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Thibaut Girka 
								
							 
						 
						
							
							
							
							
								
							
							
								0cd367e295 
								
							 
						 
						
							
							
								
								Refactor followers_accounts_controller  
							
							
							
						 
						
							2018-12-20 14:51:12 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									ysksn 
								
							 
						 
						
							
							
							
							
								
							
							
								d649d84594 
								
							 
						 
						
							
							
								
								Add specs for InvitePolicy ( #9589 )  
							
							
							
						 
						
							2018-12-20 04:23:09 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									ysksn 
								
							 
						 
						
							
							
							
							
								
							
							
								44189c33d1 
								
							 
						 
						
							
							
								
								Add specs for EmailDomainBlockPolicy ( #9586 )  
							
							
							
						 
						
							2018-12-20 03:51:41 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									ysksn 
								
							 
						 
						
							
							
							
							
								
							
							
								08cb8a1ff3 
								
							 
						 
						
							
							
								
								Add specs for InstancePolicy ( #9587 )  
							
							
							
						 
						
							2018-12-20 03:51:31 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									ysksn 
								
							 
						 
						
							
							
							
							
								
							
							
								e181f99739 
								
							 
						 
						
							
							
								
								Add specs for DomainBlockPolicy ( #9585 )  
							
							
							
						 
						
							2018-12-20 03:47:51 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									ysksn 
								
							 
						 
						
							
							
							
							
								
							
							
								5088213f5e 
								
							 
						 
						
							
							
								
								Add specs for CustomEmojiPolicy ( #9584 )  
							
							
							
						 
						
							2018-12-20 03:24:28 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Eugen Rochko 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								108b2139cd 
								
							 
						 
						
							
							
								
								Allow unauthenticated REST API access to GET /api/v1/accounts/:id/statuses ( #9573 )  
							
							... 
							
							
							
							Fix  #7087 
The same data is available over the ActivityPub outbox, RSS, and Atom, so
there is little benefit to keeping it limited in this method. 
						
							2018-12-20 01:30:43 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									ThibG 
								
							 
						 
						
							
							
							
							
								
							
							
								8389b496ba 
								
							 
						 
						
							
							
								
								Fix unnecessary loadMore calls when the end of a timeline has been reached ( #9581 )  
							
							... 
							
							
							
							Fixes  #9568  
						
							2018-12-19 22:23:16 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Thibaut Girka 
								
							 
						 
						
							
							
							
							
								
							
							
								c2b1e8bc43 
								
							 
						 
						
							
							
								
								Override current_user when generating static pages  
							
							
							
						 
						
							2018-12-19 20:49:58 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Thibaut Girka 
								
							 
						 
						
							
							
							
							
								
							
							
								e8d5affe06 
								
							 
						 
						
							
							
								
								Restore oops.gif animation for user who have auto_play_gif set  
							
							
							
						 
						
							2018-12-19 20:49:58 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Thibaut Girka 
								
							 
						 
						
							
							
							
							
								
							
							
								0c2d48b60a 
								
							 
						 
						
							
							
								
								Replace animated oops.gif by a non-animated image  
							
							... 
							
							
							
							Fixes  #6060  
						
							2018-12-19 20:49:58 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									ysksn 
								
							 
						 
						
							
							
							
							
								
							
							
								5d724aa129 
								
							 
						 
						
							
							
								
								Add specs for BackupPolicy ( #9576 )  
							
							
							
						 
						
							2018-12-19 18:24:15 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									ThibG 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								aae088aaf0 
								
							 
						 
						
							
							
								
								Merge pull request  #865  from ThibG/glitch-soc/merge-upstream  
							
							... 
							
							
							
							Merge upstream changes 
							
						 
						
							2018-12-19 16:19:00 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Renato "Lond" Cerqueira 
								
							 
						 
						
							
							
							
							
								
							
							
								af37f4a70f 
								
							 
						 
						
							
							
								
								Weblate translations (2018-12-19) ( #9578 )  
							
							... 
							
							
							
							* Translated using Weblate (Greek)
Currently translated at 99.7% (715 of 717 strings)
Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/el/ 
* Translated using Weblate (Czech)
Currently translated at 99.9% (716 of 717 strings)
Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/cs/ 
* Translated using Weblate (Japanese)
Currently translated at 97.5% (699 of 717 strings)
Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/ja/ 
* Translated using Weblate (Slovak)
Currently translated at 99.7% (715 of 717 strings)
Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/sk/ 
* Translated using Weblate (Dutch)
Currently translated at 99.7% (715 of 717 strings)
Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/nl/ 
* Translated using Weblate (Galician)
Currently translated at 99.9% (716 of 717 strings)
Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/gl/ 
* Translated using Weblate (Korean)
Currently translated at 100.0% (717 of 717 strings)
Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/ko/ 
* Translated using Weblate (Korean)
Currently translated at 100.0% (350 of 350 strings)
Translation: Mastodon/React
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/ko/ 
* Translated using Weblate (Korean)
Currently translated at 100.0% (93 of 93 strings)
Translation: Mastodon/Preferences
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/ko/ 
* Translated using Weblate (Portuguese (Brazil))
Currently translated at 98.9% (709 of 717 strings)
Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/pt_BR/ 
* Translated using Weblate (Portuguese (Brazil))
Currently translated at 97.8% (91 of 93 strings)
Translation: Mastodon/Preferences
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/pt_BR/ 
* Translated using Weblate (Corsican)
Currently translated at 99.9% (716 of 717 strings)
Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/co/ 
* Translated using Weblate (French)
Currently translated at 99.9% (716 of 717 strings)
Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/fr/ 
* Translated using Weblate (French)
Currently translated at 99.9% (716 of 717 strings)
Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/fr/ 
* Translated using Weblate (Arabic)
Currently translated at 96.8% (90 of 93 strings)
Translation: Mastodon/Preferences
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/ar/ 
* Translated using Weblate (Arabic)
Currently translated at 96.8% (694 of 717 strings)
Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/ar/ 
* Translated using Weblate (Dutch)
Currently translated at 100,0% (717 of 717 strings)
Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/nl/ 
* Translated using Weblate (Czech)
Currently translated at 99.9% (716 of 717 strings)
Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/cs/ 
* Translated using Weblate (Slovak)
Currently translated at 99.7% (715 of 717 strings)
Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/sk/ 
* Translated using Weblate (Czech)
Currently translated at 100.0% (350 of 350 strings)
Translation: Mastodon/React
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/cs/ 
* Translated using Weblate (Czech)
Currently translated at 99.9% (716 of 717 strings)
Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/cs/ 
* Translated using Weblate (Italian)
Currently translated at 100,0% (93 of 93 strings)
Translation: Mastodon/Preferences
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/it/ 
* Translated using Weblate (Czech)
Currently translated at 99,9% (716 of 717 strings)
Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/cs/ 
* Translated using Weblate (Catalan)
Currently translated at 100,0% (93 of 93 strings)
Translation: Mastodon/Preferences
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/ca/ 
* Translated using Weblate (Catalan)
Currently translated at 100,0% (717 of 717 strings)
Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/ca/ 
* Translated using Weblate (Czech)
Currently translated at 99.9% (716 of 717 strings)
Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/cs/ 
* Translated using Weblate (Occitan)
Currently translated at 100,0% (350 of 350 strings)
Translation: Mastodon/React
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/oc/ 
* Translated using Weblate (Occitan)
Currently translated at 99,7% (715 of 717 strings)
Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/oc/ 
* Translated using Weblate (Occitan)
Currently translated at 100,0% (93 of 93 strings)
Translation: Mastodon/Preferences
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/oc/ 
* Translated using Weblate (Czech)
Currently translated at 99.9% (716 of 717 strings)
Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/cs/ 
* Translated using Weblate (Greek)
Currently translated at 99.7% (715 of 717 strings)
Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/el/ 
* Translated using Weblate (Greek)
Currently translated at 100.0% (350 of 350 strings)
Translation: Mastodon/React
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/el/ 
* Translated using Weblate (French)
Currently translated at 100.0% (93 of 93 strings)
Translation: Mastodon/Preferences
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/fr/ 
* Translated using Weblate (German)
Currently translated at 100,0% (93 of 93 strings)
Translation: Mastodon/Preferences
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/de/ 
* Translated using Weblate (German)
Currently translated at 99,9% (716 of 717 strings)
Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/de/ 
* Translated using Weblate (Japanese)
Currently translated at 97,5% (699 of 717 strings)
Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/ja/ 
* Translated using Weblate (Korean)
Currently translated at 100,0% (350 of 350 strings)
Translation: Mastodon/React
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/ko/ 
* Translated using Weblate (Czech)
Currently translated at 100.0% (350 of 350 strings)
Translation: Mastodon/React
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/cs/ 
* Normalize translations
* Normalize translations, remove unused, add missing plurals 
							
						 
						
							2018-12-19 21:07:05 +09:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Thibaut Girka 
								
							 
						 
						
							
							
							
							
								
							
							
								2228655848 
								
							 
						 
						
							
							
								
								[Glitch] Improved appearance of notification filter on safari  
							
							... 
							
							
							
							Port 2e1b5edfea 
							
						 
						
							2018-12-19 13:00:08 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Thibaut Girka 
								
							 
						 
						
							
							
							
							
								
							
							
								add74816a5 
								
							 
						 
						
							
							
								
								Merge branch 'master' into glitch-soc/merge-upstream  
							
							
							
						 
						
							2018-12-19 12:58:49 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									ysksn 
								
							 
						 
						
							
							
							
							
								
							
							
								af56efdec5 
								
							 
						 
						
							
							
								
								Add specs for AccountPolicy ( #9575 )  
							
							
							
						 
						
							2018-12-19 08:56:59 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									mayaeh 
								
							 
						 
						
							
							
							
							
								
							
							
								ff472d2cfb 
								
							 
						 
						
							
							
								
								Update Japanese translations. ( #9574 )  
							
							
							
						 
						
							2018-12-19 08:51:02 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									ysksn 
								
							 
						 
						
							
							
							
							
								
							
							
								0a1ade4f02 
								
							 
						 
						
							
							
								
								Add specs for AccountModerationNotePolicy ( #9571 )  
							
							
							
						 
						
							2018-12-19 07:24:03 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									ysksn 
								
							 
						 
						
							
							
							
							
								
							
							
								102e4cfa32 
								
							 
						 
						
							
							
								
								Add specs for StatusPolicy ( #9569 )  
							
							
							
						 
						
							2018-12-19 05:19:20 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Hinaloe 
								
							 
						 
						
							
							
							
							
								
							
							
								2e1b5edfea 
								
							 
						 
						
							
							
								
								improved appearance of notification filter on safari ( #9564 )  
							
							
							
						 
						
							2018-12-18 22:28:09 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									ThibG 
								
							 
						 
						
							
							
							
							
								
							
							
								e70e496e29 
								
							 
						 
						
							
							
								
								Clean up dead code in public timeline code ( #9565 )  
							
							
							
						 
						
							2018-12-18 22:00:18 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Thibaut Girka 
								
							 
						 
						
							
							
							
							
								
							
							
								655da1be20 
								
							 
						 
						
							
							
								
								Reword confirm_before_clearing_draft description  
							
							
							
						 
						
							2018-12-18 21:54:34 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Thibaut Girka 
								
							 
						 
						
							
							
							
							
								
							
							
								9a7201f2ee 
								
							 
						 
						
							
							
								
								Allow disabling the reply confirmation dialog  
							
							
							
						 
						
							2018-12-18 21:54:34 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Thibaut Girka 
								
							 
						 
						
							
							
							
							
								
							
							
								056a8a8ee4 
								
							 
						 
						
							
							
								
								Allow disabling media confirmation from the confirmation dialog itself  
							
							
							
						 
						
							2018-12-18 21:54:34 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Thibaut Girka 
								
							 
						 
						
							
							
							
							
								
							
							
								490d8fff0b 
								
							 
						 
						
							
							
								
								Remove dead code  
							
							
							
						 
						
							2018-12-18 21:39:35 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Thibaut Girka 
								
							 
						 
						
							
							
							
							
								
							
							
								82b01a6c9f 
								
							 
						 
						
							
							
								
								[Glitch] Put "Media Only" option in column settings instead of content area headline  
							
							... 
							
							
							
							Port 4f42238c29 
							
						 
						
							2018-12-18 21:39:35 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Thibaut Girka 
								
							 
						 
						
							
							
							
							
								
							
							
								9fc7ad7b9c 
								
							 
						 
						
							
							
								
								[Glitch] Always display tab navigation on local/federated timeline even when empty  
							
							... 
							
							
							
							Port 90b64c0069 
							
						 
						
							2018-12-18 21:39:35 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Thibaut Girka 
								
							 
						 
						
							
							
							
							
								
							
							
								c644e6ea89 
								
							 
						 
						
							
							
								
								Do not replace history state  
							
							... 
							
							
							
							This is both for consistency with account timelines and to not mess with
the logic used to decide whether going back in the browser's history is
going to make us leave the WebUI. 
							
						 
						
							2018-12-18 21:39:35 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Thibaut Girka 
								
							 
						 
						
							
							
							
							
								
							
							
								200a8bdd3a 
								
							 
						 
						
							
							
								
								[Glitch] Enable media timeline  
							
							... 
							
							
							
							Port 8182b61518 
							
						 
						
							2018-12-18 21:39:35 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Thibaut Girka 
								
							 
						 
						
							
							
							
							
								
							
							
								a693d6e2f2 
								
							 
						 
						
							
							
								
								[Glitch] Hide section headline for timelines in production  
							
							... 
							
							
							
							Port 4eeda67727 
							
						 
						
							2018-12-18 21:39:35 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Thibaut Girka 
								
							 
						 
						
							
							
							
							
								
							
							
								593f88acb1 
								
							 
						 
						
							
							
								
								[Glitch] Change column params on pinned timeline  
							
							... 
							
							
							
							Port 06252ec71e 
							
						 
						
							2018-12-18 21:39:35 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Thibaut Girka 
								
							 
						 
						
							
							
							
							
								
							
							
								c03cbb9471 
								
							 
						 
						
							
							
								
								[Glitch] Save onlyMedia prop when pinning column  
							
							... 
							
							
							
							Port 5ea643b279 
							
						 
						
							2018-12-18 21:39:35 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Thibaut Girka 
								
							 
						 
						
							
							
							
							
								
							
							
								1a9e78b9bc 
								
							 
						 
						
							
							
								
								[Glitch] Add exact attribute to WrappedRoute for community timeline  
							
							... 
							
							
							
							Port 46061dc041 
							
						 
						
							2018-12-18 21:39:35 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Thibaut Girka 
								
							 
						 
						
							
							
							
							
								
							
							
								1fb4bf87f7 
								
							 
						 
						
							
							
								
								[Glitch] Add media timeline  
							
							... 
							
							
							
							Port 7403e5d306 
							
						 
						
							2018-12-18 21:39:35 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									ThibG 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								74ee5bdf37 
								
							 
						 
						
							
							
								
								Merge pull request  #862  from ThibG/glitch-soc/merge-upstream  
							
							... 
							
							
							
							Merge upstream changes 
							
						 
						
							2018-12-18 19:37:07 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Thibaut Girka 
								
							 
						 
						
							
							
							
							
								
							
							
								0ef2c1415a 
								
							 
						 
						
							
							
								
								[Glitch] Make notifications quick-filter use consistent style with profile tabs  
							
							... 
							
							
							
							Port 12ab15e584 
							
						 
						
							2018-12-18 17:23:04 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Thibaut Girka 
								
							 
						 
						
							
							
							
							
								
							
							
								06a7c07eda 
								
							 
						 
						
							
							
								
								[Glitch] Add notification quick-filter bar in the frontend app  
							
							... 
							
							
							
							Port 13dce12665 
							
						 
						
							2018-12-18 17:22:01 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Thibaut Girka 
								
							 
						 
						
							
							
							
							
								
							
							
								a18a46ca6e 
								
							 
						 
						
							
							
								
								[Glitch] Responsive design for profile directory  
							
							... 
							
							
							
							Port SCSS changes from 087e118971 
							
						 
						
							2018-12-18 17:03:53 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Thibaut Girka 
								
							 
						 
						
							
							
							
							
								
							
							
								034ffc079e 
								
							 
						 
						
							
							
								
								Merge branch 'master' into glitch-soc/merge-upstream  
							
							... 
							
							
							
							Conflicts:
- app/controllers/admin/base_controller.rb
  Some refactoring made upstream, no real conflict.
- app/javascript/mastodon/features/compose/components/compose_form.js
  Updated using upstream's code but using maxChars instead of the
  hardcoded length of 500 characters per toot.
- app/javascript/styles/mastodon/components.scss
  Upstream redesigned the onboarding modal. Not sure why we had a
  conflict there. 
							
						 
						
							2018-12-18 16:55:15 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									kedama 
								
							 
						 
						
							
							
							
							
								
							
							
								5bf100f87b 
								
							 
						 
						
							
							
								
								Back to the getting-started when pins the timeline. ( #9561 )  
							
							
							
						 
						
							2018-12-18 16:43:50 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									ysksn 
								
							 
						 
						
							
							
							
							
								
							
							
								dd85700a3e 
								
							 
						 
						
							
							
								
								Add spec for AccountableConcern#log_action ( #9559 )  
							
							
							
						 
						
							2018-12-18 16:43:03 +01:00