Thibaut Girka 
								
							 
						 
						
							
							
							
							
								
							
							
								caa56b01a9 
								
							 
						 
						
							
							
								
								Switch from selects to radio buttons for local settings, improve styling  
							
							
							
						 
						
							2018-10-08 13:49:25 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Thibaut Girka 
								
							 
						 
						
							
							
							
							
								
							
							
								58cbb9ef8f 
								
							 
						 
						
							
							
								
								[Glitch] Change documentation URL  
							
							... 
							
							
							
							Port 7635a136c9 
							
						 
						
							2018-10-07 22:56:24 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Thibaut Girka 
								
							 
						 
						
							
							
							
							
								
							
							
								52f97080e7 
								
							 
						 
						
							
							
								
								[Glitch] RTL: fix margins of public-account-header__tabs  
							
							... 
							
							
							
							Port e2065ceead 
							
						 
						
							2018-10-07 22:56:24 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Thibaut Girka 
								
							 
						 
						
							
							
							
							
								
							
							
								bdbbbb1bdb 
								
							 
						 
						
							
							
								
								Merge branch 'master' into glitch-soc/merge-upstream  
							
							
							
						 
						
							2018-10-07 19:47:56 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									ThibG 
								
							 
						 
						
							
							
							
							
								
							
							
								8b48543b77 
								
							 
						 
						
							
							
								
								Ensure only toots from the reported users are reported ( #8916 )  
							
							
							
						 
						
							2018-10-07 19:45:40 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Thibaut Girka 
								
							 
						 
						
							
							
							
							
								
							
							
								b4bab7eb35 
								
							 
						 
						
							
							
								
								Do not scroll timelines when *closing* media modals  
							
							... 
							
							
							
							Media modals push an history state so that pressing back on mobile closes them.
We made sure to not scroll when opening them, but not when *closing* them,
which caused some issues in rare cases. 
							
						 
						
							2018-10-07 12:08:32 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Marcin Mikołajczak 
								
							 
						 
						
							
							
							
							
								
							
							
								07d123fd3c 
								
							 
						 
						
							
							
								
								i18n: Update Polish translation ( #8901 )  
							
							... 
							
							
							
							Signed-off-by: Marcin Mikołajczak <me@m4sk.in> 
							
						 
						
							2018-10-06 20:42:36 +09:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Eugen Rochko 
								
							 
						 
						
							
							
							
							
								
							
							
								7635a136c9 
								
							 
						 
						
							
							
								
								Change documentation URL ( #8898 )  
							
							... 
							
							
							
							* Change documentation URL
* Fix hardcoded documentation URL in locales 
							
						 
						
							2018-10-06 14:33:36 +09:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Masoud Abkenar 
								
							 
						 
						
							
							
							
							
								
							
							
								e2065ceead 
								
							 
						 
						
							
							
								
								RTL: fix margins of public-account-header__tabs ( #8897 )  
							
							... 
							
							
							
							* RTL: fix margins of public-account-header__tabs
* fix style
* even more stylish code :) 
							
						 
						
							2018-10-06 00:05:11 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Thibaut Girka 
								
							 
						 
						
							
							
							
							
								
							
							
								463f250f26 
								
							 
						 
						
							
							
								
								Merge branch 'master' into glitch-soc/merge-upstream  
							
							
							
						 
						
							2018-10-05 21:48:25 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Jeong Arm 
								
							 
						 
						
							
							
							
							
								
							
							
								708c12af1e 
								
							 
						 
						
							
							
								
								Leave unknown language as nil if account is remote ( #8861 )  
							
							... 
							
							
							
							* Force use language detector if account is remote
* Set unknown remote toot's language as nil 
							
						 
						
							2018-10-05 19:17:46 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Thibaut Girka 
								
							 
						 
						
							
							
							
							
								
							
							
								72305816ea 
								
							 
						 
						
							
							
								
								[Glitch] Add a confirmation dialog when hitting reply and the compose box isn't empty  
							
							
							
						 
						
							2018-10-05 19:08:52 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									ThibG 
								
							 
						 
						
							
							
							
							
								
							
							
								d6df42df16 
								
							 
						 
						
							
							
								
								Add a confirmation dialog when hitting reply and the compose box isn't empty ( #8893 )  
							
							... 
							
							
							
							* Add a confirmation dialog when hitting reply and the compose box isn't empty
Fixes  #878 
* Performance improvement 
							
						 
						
							2018-10-05 18:44:44 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Thibaut Girka 
								
							 
						 
						
							
							
							
							
								
							
							
								f627ea99e4 
								
							 
						 
						
							
							
								
								Merge branch 'master' into glitch-soc/merge-upstream  
							
							... 
							
							
							
							Conflicts:
	db/migrate/20170716191202_add_hide_notifications_to_mute.rb
	spec/controllers/application_controller_spec.rb
Took our version, upstream changes were only minor style linting. 
							
						 
						
							2018-10-05 15:23:57 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Eugen Rochko 
								
							 
						 
						
							
							
							
							
								
							
							
								48c2ab8cf5 
								
							 
						 
						
							
							
								
								Limit the number of people that can be followed from one account ( #8807 )  
							
							... 
							
							
							
							Configurable soft limit of 7,500, and above that, configurable
ratio of 1.1 * followers, controlled by:
- MAX_FOLLOWS_THRESHOLD
- MAX_FOLLOWS_RATIO
Fix  #2311  
							
						 
						
							2018-10-04 17:36:11 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Eugen Rochko 
								
							 
						 
						
							
							
							
							
								
							
							
								1ae62b87ed 
								
							 
						 
						
							
							
								
								Change admin accounts default sort to most recent ( #8813 )  
							
							
							
						 
						
							2018-10-04 16:05:38 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Eugen Rochko 
								
							 
						 
						
							
							
							
							
								
							
							
								24f168e58e 
								
							 
						 
						
							
							
								
								Fix link verification for remote accounts ( #8868 )  
							
							
							
						 
						
							2018-10-04 15:47:03 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									ThibG 
								
							 
						 
						
							
							
							
							
								
							
							
								47eaba870e 
								
							 
						 
						
							
							
								
								Fix handling of ActivityPub activities lacking some attributes ( #8864 )  
							
							
							
						 
						
							2018-10-03 23:44:13 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Thibaut Girka 
								
							 
						 
						
							
							
							
							
								
							
							
								1476e653ec 
								
							 
						 
						
							
							
								
								Make hidden media clickable in account media gallery  
							
							
							
						 
						
							2018-10-02 22:00:57 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Thibaut Girka 
								
							 
						 
						
							
							
							
							
								
							
							
								c2f963256c 
								
							 
						 
						
							
							
								
								Add media description (or status spoiler) in account media gallery  
							
							
							
						 
						
							2018-10-02 22:00:57 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Thibaut Girka 
								
							 
						 
						
							
							
							
							
								
							
							
								a62e47672e 
								
							 
						 
						
							
							
								
								Fix account gallery hidden media background color in mastodon-light  
							
							
							
						 
						
							2018-10-02 22:00:57 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Thibaut Girka 
								
							 
						 
						
							
							
							
							
								
							
							
								e9f2659066 
								
							 
						 
						
							
							
								
								[Glitch] Honour displayMedia setting in accountMedia gallery  
							
							... 
							
							
							
							Inspired by aeca336e22 
							
						 
						
							2018-10-02 22:00:57 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Thibaut Girka 
								
							 
						 
						
							
							
							
							
								
							
							
								536d95ae7c 
								
							 
						 
						
							
							
								
								[Glitch] Add support for new display_media setting  
							
							... 
							
							
							
							Port bb8afc4608 
							
						 
						
							2018-10-01 16:48:55 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Thibaut Girka 
								
							 
						 
						
							
							
							
							
								
							
							
								56714ef14c 
								
							 
						 
						
							
							
								
								[Glitch] RTL: fix margins: public-layout.header.nav-button  
							
							... 
							
							
							
							Port bf20094a3f 
							
						 
						
							2018-10-01 14:38:35 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Thibaut Girka 
								
							 
						 
						
							
							
							
							
								
							
							
								9bec970736 
								
							 
						 
						
							
							
								
								[Glitch] RTL: fix statubar action buttons/counter margins  
							
							... 
							
							
							
							Port b837c636ac 
							
						 
						
							2018-10-01 14:38:32 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Thibaut Girka 
								
							 
						 
						
							
							
							
							
								
							
							
								9617c07724 
								
							 
						 
						
							
							
								
								[Glitch] Separate font-family into variable  
							
							... 
							
							
							
							Port 8913189055 
							
						 
						
							2018-10-01 14:38:29 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Thibaut Girka 
								
							 
						 
						
							
							
							
							
								
							
							
								f5eaefc485 
								
							 
						 
						
							
							
								
								Merge branch 'master' into glitch-soc/merge-upstream  
							
							... 
							
							
							
							Conflicts:
	app/lib/user_settings_decorator.rb
	app/models/user.rb
	app/serializers/initial_state_serializer.rb
	app/views/stream_entries/_simple_status.html.haml
	config/locales/simple_form.en.yml
	config/locales/simple_form.ja.yml
	config/locales/simple_form.pl.yml
	config/routes.rb 
							
						 
						
							2018-10-01 12:43:20 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Eugen Rochko 
								
							 
						 
						
							
							
							
							
								
							
							
								db1a581491 
								
							 
						 
						
							
							
								
								Double the threshold for "read more" functionality ( #8835 )  
							
							
							
						 
						
							2018-10-01 03:38:10 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Spencer Alves 
								
							 
						 
						
							
							
							
							
								
							
							
								981a41ca2c 
								
							 
						 
						
							
							
								
								Add option to hide action bar in collapsed toots  
							
							
							
						 
						
							2018-09-30 08:31:50 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									David Yip 
								
							 
						 
						
							
							
							
							
								
							
							
								d698c06aa8 
								
							 
						 
						
							
							
								
								Merge pull request  #681  from ThibG/glitch-soc/fixes/accessibility  
							
							... 
							
							
							
							Port various accessibility improvements from upstream 
							
						 
						
							2018-09-29 19:01:19 -05:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									David Yip 
								
							 
						 
						
							
							
							
							
								
							
							
								278d21bb0b 
								
							 
						 
						
							
							
								
								Merge pull request  #755  from ThibG/glitch-soc/features/optional-reply-selection  
							
							... 
							
							
							
							Make pre-selection of usernames optional when replying to a toot 
							
						 
						
							2018-09-29 19:01:05 -05:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									David Yip 
								
							 
						 
						
							
							
							
							
								
							
							
								dc8da22a73 
								
							 
						 
						
							
							
								
								Merge pull request  #754  from ThibG/glitch-soc/fixes/scroll-compose-into-view  
							
							... 
							
							
							
							Scroll to textarea when composing a toot 
							
						 
						
							2018-09-29 19:00:31 -05:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									David Yip 
								
							 
						 
						
							
							
							
							
								
							
							
								a469f72e3b 
								
							 
						 
						
							
							
								
								Merge pull request  #745  from ThibG/glitch-soc/fixes/grey-out-button  
							
							... 
							
							
							
							Disable the “TOOT” button (and secondary toot button) if the toot text is empty 
							
						 
						
							2018-09-29 19:00:06 -05:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Eugen Rochko 
								
							 
						 
						
							
							
							
							
								
							
							
								92e5d6b6e5 
								
							 
						 
						
							
							
								
								Fix timeline pagination ( #8827 )  
							
							... 
							
							
							
							Ruby's ** operator does not play well with non-Hash objects, which
the params slice is
Fix  #8821  
							
						 
						
							2018-09-29 19:03:33 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Masoud Abkenar 
								
							 
						 
						
							
							
							
							
								
							
							
								bf20094a3f 
								
							 
						 
						
							
							
								
								RTL: fix margins: public-layout.header.nav-button ( #8823 )  
							
							... 
							
							
							
							* RTL: fix margins: public-layout.header.nav-button
* add empty line to meet style guides 
							
						 
						
							2018-09-29 11:04:26 +09:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Thibaut Girka 
								
							 
						 
						
							
							
							
							
								
							
							
								e7ddcf50ab 
								
							 
						 
						
							
							
								
								Make pre-selection of usernames optional when replying to a toot  
							
							... 
							
							
							
							Fixes  #751  
						
							2018-09-28 21:01:09 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Thibaut Girka 
								
							 
						 
						
							
							
							
							
								
							
							
								39b29ae6eb 
								
							 
						 
						
							
							
								
								Fix styling issue in “Compose box options” local settings page  
							
							
							
						 
						
							2018-09-28 18:55:44 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Thibaut Girka 
								
							 
						 
						
							
							
							
							
								
							
							
								d27b7d7645 
								
							 
						 
						
							
							
								
								Scroll to textarea when composing a toot  
							
							
							
						 
						
							2018-09-28 18:44:55 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Thibaut Girka 
								
							 
						 
						
							
							
							
							
								
							
							
								c454db6f11 
								
							 
						 
						
							
							
								
								[Glitch] Adjust beforeUnload conditions  
							
							... 
							
							
							
							Port 05f90e3695 
							
						 
						
							2018-09-28 17:09:25 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Thibaut Girka 
								
							 
						 
						
							
							
							
							
								
							
							
								acf5099504 
								
							 
						 
						
							
							
								
								Fix maxCharacters in vanilla front-end  
							
							
							
						 
						
							2018-09-28 17:05:19 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Eugen Rochko 
								
							 
						 
						
							
							
							
							
								
							
							
								ea769a7d02 
								
							 
						 
						
							
							
								
								Fix class autoloading issue in ActivityPub::Activity::Create ( #8820 )  
							
							
							
						 
						
							2018-09-28 17:02:53 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Eugen Rochko 
								
							 
						 
						
							
							
							
							
								
							
							
								5ddcdf3753 
								
							 
						 
						
							
							
								
								Support min_id-based pagination in REST API ( #8736 )  
							
							... 
							
							
							
							* Allow min_id pagination in Feed#get
* Add min_id pagination to home and list timeline APIs
* Add min_id pagination to account statuses, public and tag APIs
* Remove unused stub in reports API
* Use min_id pagination in notifications, favourites, and fix order
* Fix HomeFeed#from_database not using paginate_by_id 
							
						 
						
							2018-09-28 02:23:45 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Eugen Rochko 
								
							 
						 
						
							
							
							
							
								
							
							
								ad0670fe87 
								
							 
						 
						
							
							
								
								Revert Font Awesome 5 upgrade ( #8810 )  
							
							... 
							
							
							
							* Revert "Fix some icon names changed by the Font Awesome 5. (#8796 )"
This reverts commit c8a1e945d9#8799 )"
This reverts commit ae20afbc80#8792 )"
This reverts commit 30b1bb0704#8776 )"
This reverts commit 84bcf89764#8484 )"
This reverts commit cc784f3c16 
							
						 
						
							2018-09-28 02:11:14 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									cbayerlein 
								
							 
						 
						
							
							
							
							
								
							
							
								81dd71dba7 
								
							 
						 
						
							
							
								
								Exclude replies from list timelines ( #8683 )  
							
							... 
							
							
							
							* Changed list behaviour
I added the following line to the FeedManager (app/lib/feed_manager.rb) in the push_to_list function:
`return false if status.reply?`
Now all posts that are replies are filtered out, so that now only "genuine" posts are displayed in the list.
This is a first approach to solve issue #5916 
* Update feed_manager.rb
As suggested by @Gargron 
							
						 
						
							2018-09-28 00:37:21 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									mayaeh 
								
							 
						 
						
							
							
							
							
								
							
							
								c8a1e945d9 
								
							 
						 
						
							
							
								
								Fix some icon names changed by the Font Awesome 5. ( #8796 )  
							
							
							
						 
						
							2018-09-27 20:36:36 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Maciek Baron 
								
							 
						 
						
							
							
							
							
								
							
							
								4a2fe07e28 
								
							 
						 
						
							
							
								
								Add test for AutosuggestEmoji ( #8805 )  
							
							
							
						 
						
							2018-09-27 20:35:58 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Colin Dean 
								
							 
						 
						
							
							
							
							
								
							
							
								417b0416e8 
								
							 
						 
						
							
							
								
								Adds follow action timestamp to notification ( #8756 )  
							
							... 
							
							
							
							Fixes  #8755  
						
							2018-09-27 17:11:06 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Naoki Kosaka 
								
							 
						 
						
							
							
							
							
								
							
							
								ae20afbc80 
								
							 
						 
						
							
							
								
								Migrate to font-awesome 5.0. ( #8799 )  
							
							
							
						 
						
							2018-09-27 17:08:56 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Haelwenn Monnier 
								
							 
						 
						
							
							
							
							
								
							
							
								ec1119d2c9 
								
							 
						 
						
							
							
								
								Show "read more" link on overly long in-stream statuses ( #8205 )  
							
							... 
							
							
							
							Show "read more" link on overly long in-stream statuses 
							
						 
						
							2018-09-27 17:04:33 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Yamagishi Kazutoshi 
								
							 
						 
						
							
							
							
							
								
							
							
								991c4596b0 
								
							 
						 
						
							
							
								
								Fix broken report detail (regression from  #8569 ) ( #8795 )  
							
							
							
						 
						
							2018-09-26 19:48:14 +02:00