Thibaut Girka 
								
							 
						 
						
							
							
							
							
								
							
							
								c40ba63f42 
								
							 
						 
						
							
							
								
								Add support for hints (or extended descriptions) in local-settings pages  
							
							
							
						 
						
							2018-10-09 18:10:54 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Thibaut Girka 
								
							 
						 
						
							
							
							
							
								
							
							
								c598692cdf 
								
							 
						 
						
							
							
								
								When screen width is too narrow, hide local-settings page text, keep only icons  
							
							
							
						 
						
							2018-10-09 18:10:54 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Thibaut Girka 
								
							 
						 
						
							
							
							
							
								
							
							
								56773bc55c 
								
							 
						 
						
							
							
								
								Change “preferences” icon to match settings page icon  
							
							
							
						 
						
							2018-10-09 18:10:54 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Thibaut Girka 
								
							 
						 
						
							
							
							
							
								
							
							
								065a19b18b 
								
							 
						 
						
							
							
								
								Add icons for each of the local-setting pages  
							
							
							
						 
						
							2018-10-09 18:10:54 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									ThibG 
								
							 
						 
						
							
							
							
							
								
							
							
								02422158ae 
								
							 
						 
						
							
							
								
								Merge pull request  #774  from ThibG/glitch-soc/merge-upstream  
							
							... 
							
							
							
							Merge upstream changes 
							
						 
						
							2018-10-09 13:23:01 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									dependabot[bot] 
								
							 
						 
						
							
							
							
							
								
							
							
								4580979e28 
								
							 
						 
						
							
							
								
								Bump faker from 1.8.7 to 1.9.1 ( #8935 )  
							
							... 
							
							
							
							Bumps [faker](https://github.com/stympy/faker ) from 1.8.7 to 1.9.1.
- [Release notes](https://github.com/stympy/faker/releases )
- [Changelog](https://github.com/stympy/faker/blob/master/CHANGELOG.md )
- [Commits](https://github.com/stympy/faker/compare/v1.8.7...v1.9.1 )
Signed-off-by: dependabot[bot] <support@dependabot.com> 
							
						 
						
							2018-10-09 19:59:34 +09:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									dependabot[bot] 
								
							 
						 
						
							
							
							
							
								
							
							
								dbaded7ed2 
								
							 
						 
						
							
							
								
								Bump memory_profiler from 0.9.11 to 0.9.12 ( #8937 )  
							
							... 
							
							
							
							Bumps [memory_profiler](https://github.com/SamSaffron/memory_profiler ) from 0.9.11 to 0.9.12.
- [Release notes](https://github.com/SamSaffron/memory_profiler/releases )
- [Changelog](https://github.com/SamSaffron/memory_profiler/blob/master/CHANGELOG.md )
- [Commits](https://github.com/SamSaffron/memory_profiler/compare/v0.9.11...v0.9.12 )
Signed-off-by: dependabot[bot] <support@dependabot.com> 
							
						 
						
							2018-10-09 19:39:46 +09:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Thibaut Girka 
								
							 
						 
						
							
							
							
							
								
							
							
								f09150f2a9 
								
							 
						 
						
							
							
								
								Merge branch 'master' into glitch-soc/merge-upstream  
							
							
							
						 
						
							2018-10-09 12:12:03 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									ThibG 
								
							 
						 
						
							
							
							
							
								
							
							
								d73c1df33b 
								
							 
						 
						
							
							
								
								Merge pull request  #770  from ThibG/glitch-soc/merge-upstream  
							
							... 
							
							
							
							Merge upstream changes 
							
						 
						
							2018-10-09 12:11:14 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Thibaut Girka 
								
							 
						 
						
							
							
							
							
								
							
							
								e968dcea13 
								
							 
						 
						
							
							
								
								Fix app-wide hotkeys randomly failing to work  
							
							
							
						 
						
							2018-10-09 12:10:51 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Sascha 
								
							 
						 
						
							
							
							
							
								
							
							
								b7a337f63c 
								
							 
						 
						
							
							
								
								add ffmpeg initializer ( #8855 )  
							
							... 
							
							
							
							* add ffmpeg initializer
* use different expression to check for environment var 
							
						 
						
							2018-10-09 03:02:52 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									mayaeh 
								
							 
						 
						
							
							
							
							
								
							
							
								bcb43baf50 
								
							 
						 
						
							
							
								
								Add Japanese translations. ( #8927 )  
							
							
							
						 
						
							2018-10-09 07:12:37 +09:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Thibaut Girka 
								
							 
						 
						
							
							
							
							
								
							
							
								683608dd60 
								
							 
						 
						
							
							
								
								Merge branch 'master' into glitch-soc/merge-upstream  
							
							
							
						 
						
							2018-10-08 15:34:53 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									mayaeh 
								
							 
						 
						
							
							
							
							
								
							
							
								96a313d02b 
								
							 
						 
						
							
							
								
								Fixed error occurrence when pinning the DM column. ( #8922 )  
							
							
							
						 
						
							2018-10-08 14:43:38 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Thibaut Girka 
								
							 
						 
						
							
							
							
							
								
							
							
								74e411f4e8 
								
							 
						 
						
							
							
								
								Merge branch 'master' into glitch-soc/merge-upstream  
							
							
							
						 
						
							2018-10-08 13:51:33 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Thibaut Girka 
								
							 
						 
						
							
							
							
							
								
							
							
								3f68e9ed11 
								
							 
						 
						
							
							
								
								Move “Show action buttons in collapsed toots” option  
							
							
							
						 
						
							2018-10-08 13:49:25 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Thibaut Girka 
								
							 
						 
						
							
							
							
							
								
							
							
								caa56b01a9 
								
							 
						 
						
							
							
								
								Switch from selects to radio buttons for local settings, improve styling  
							
							
							
						 
						
							2018-10-08 13:49:25 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									dependabot[bot] 
								
							 
						 
						
							
							
							
							
								
							
							
								e303c0730f 
								
							 
						 
						
							
							
								
								Bump capybara from 3.8.2 to 3.9.0 ( #8924 )  
							
							... 
							
							
							
							Bumps [capybara](https://github.com/teamcapybara/capybara ) from 3.8.2 to 3.9.0.
- [Release notes](https://github.com/teamcapybara/capybara/releases )
- [Changelog](https://github.com/teamcapybara/capybara/blob/master/History.md )
- [Commits](https://github.com/teamcapybara/capybara/compare/3.8.2...3.9.0 )
Signed-off-by: dependabot[bot] <support@dependabot.com> 
							
						 
						
							2018-10-08 07:45:31 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									dependabot[bot] 
								
							 
						 
						
							
							
							
							
								
							
							
								7e089b5a31 
								
							 
						 
						
							
							
								
								Bump tty-prompt from 0.17.0 to 0.17.1 ( #8925 )  
							
							... 
							
							
							
							Bumps [tty-prompt](https://github.com/piotrmurach/tty-prompt ) from 0.17.0 to 0.17.1.
- [Release notes](https://github.com/piotrmurach/tty-prompt/releases )
- [Changelog](https://github.com/piotrmurach/tty-prompt/blob/master/CHANGELOG.md )
- [Commits](https://github.com/piotrmurach/tty-prompt/compare/v0.17.0...v0.17.1 )
Signed-off-by: dependabot[bot] <support@dependabot.com> 
							
						 
						
							2018-10-08 07:45:08 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									dependabot[bot] 
								
							 
						 
						
							
							
							
							
								
							
							
								63581a9262 
								
							 
						 
						
							
							
								
								Bump aws-sdk-s3 from 1.20.0 to 1.21.0 ( #8926 )  
							
							... 
							
							
							
							Bumps [aws-sdk-s3](https://github.com/aws/aws-sdk-ruby ) from 1.20.0 to 1.21.0.
- [Release notes](https://github.com/aws/aws-sdk-ruby/releases )
- [Changelog](https://github.com/aws/aws-sdk-ruby/blob/master/gems/aws-sdk-s3/CHANGELOG.md )
- [Commits](https://github.com/aws/aws-sdk-ruby/commits )
Signed-off-by: dependabot[bot] <support@dependabot.com> 
							
						 
						
							2018-10-08 07:44:53 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									dependabot[bot] 
								
							 
						 
						
							
							
							
							
								
							
							
								098012ab39 
								
							 
						 
						
							
							
								
								Bump i18n-tasks from 0.9.21 to 0.9.25 ( #8923 )  
							
							... 
							
							
							
							Bumps [i18n-tasks](https://github.com/glebm/i18n-tasks ) from 0.9.21 to 0.9.25.
- [Release notes](https://github.com/glebm/i18n-tasks/releases )
- [Changelog](https://github.com/glebm/i18n-tasks/blob/master/CHANGES.md )
- [Commits](https://github.com/glebm/i18n-tasks/compare/v0.9.21...v0.9.25 )
Signed-off-by: dependabot[bot] <support@dependabot.com> 
							
						 
						
							2018-10-08 14:24:07 +09:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									ashleyhull-versent 
								
							 
						 
						
							
							
							
							
								
							
							
								00d31a292c 
								
							 
						 
						
							
							
								
								rubocop issues - Cleaning up ( #8912 )  
							
							... 
							
							
							
							* cleanup pass
* undo mistakes
* fixed.
* revert 
							
						 
						
							2018-10-08 04:50:11 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Eugen Rochko 
								
							 
						 
						
							
							
							
							
								
							
							
								65d1a2d10a 
								
							 
						 
						
							
							
								
								Remove dead code ( #8919 )  
							
							... 
							
							
							
							SignatureVerification#matches_time_window? is not called anywhere. 
							
						 
						
							2018-10-08 04:48:54 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									ashleyhull-versent 
								
							 
						 
						
							
							
							
							
								
							
							
								ea57aca5e1 
								
							 
						 
						
							
							
								
								Replace SVG asset with Custom mascot ( #8766 )  
							
							
							
						 
						
							2018-10-08 00:20:45 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Eugen Rochko 
								
							 
						 
						
							
							
							
							
								
							
							
								c9b5168ebd 
								
							 
						 
						
							
							
								
								Add conversations API ( #8832 )  
							
							... 
							
							
							
							* Add conversations API
* Add web UI for conversations
* Add test for conversations API
* Add tests for ConversationAccount
* Improve web UI
* Rename ConversationAccount to AccountConversation
* Remove conversations on block and mute
* Change last_status_id to be a denormalization of status_ids
* Add optimistic locking 
							
						 
						
							2018-10-07 23:44:58 +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 
							
								 
							
						 
					 
				
					
						
							
								
								
									ThibG 
								
							 
						 
						
							
							
							
							
								
							
							
								c8690cc917 
								
							 
						 
						
							
							
								
								Merge pull request  #768  from ThibG/glitch-soc/merge-upstream  
							
							... 
							
							
							
							Merge upstream changes 
							
						 
						
							2018-10-07 20:13:07 +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 
							
								 
							
						 
					 
				
					
						
							
								
								
									Eugen Rochko 
								
							 
						 
						
							
							
							
							
								
							
							
								95d977e51e 
								
							 
						 
						
							
							
								
								Add POST /api/v1/notifications/:id/dismiss ( #8905 )  
							
							... 
							
							
							
							POST /api/v1/notifications/dismiss was a mistake in #2251  
							
						 
						
							2018-10-07 18:26:26 +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 
							
								 
							
						 
					 
				
					
						
							
								
								
									Eugen Rochko 
								
							 
						 
						
							
							
							
							
								
							
							
								97ca9b60a4 
								
							 
						 
						
							
							
								
								Add fallback for PostgreSQL without upsert in CopyStatusStats ( #8903 )  
							
							... 
							
							
							
							Fix  #8590  
						
							2018-10-07 04:40:37 +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 
							
								 
							
						 
					 
				
					
						
							
								
								
									bsky 
								
							 
						 
						
							
							
							
							
								
							
							
								5569769737 
								
							 
						 
						
							
							
								
								Improve production build config ( #8899 )  
							
							
							
						 
						
							2018-10-06 15:12:05 +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 
							
								 
							
						 
					 
				
					
						
							
								
								
									Eugen Rochko 
								
							 
						 
						
							
							
							
							
								
							
							
								6c328374b4 
								
							 
						 
						
							
							
								
								Remove unused ruby-progressbar dependency ( #8896 )  
							
							... 
							
							
							
							* Remove unused ruby-progressbar dependency
* Remove unused colorize dependency 
							
						 
						
							2018-10-06 08:33:26 +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 
							
								 
							
						 
					 
				
					
						
							
								
								
									ThibG 
								
							 
						 
						
							
							
							
							
								
							
							
								086cf8a8d7 
								
							 
						 
						
							
							
								
								Merge pull request  #764  from ThibG/glitch-soc/merge-upstream  
							
							... 
							
							
							
							Merge upstream changes 
							
						 
						
							2018-10-05 21:58:23 +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 
								
							 
						 
						
							
							
							
							
								
							
							
								f8bae11885 
								
							 
						 
						
							
							
								
								Merge pull request  #762  from ThibG/glitch-soc/merge-upstream  
							
							... 
							
							
							
							Merge upstream changes 
							
						 
						
							2018-10-05 19:01:44 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									dependabot[bot] 
								
							 
						 
						
							
							
							
							
								
							
							
								645442b1af 
								
							 
						 
						
							
							
								
								Bump omniauth-saml from 1.10.0 to 1.10.1 ( #8885 )  
							
							... 
							
							
							
							Bumps [omniauth-saml](https://github.com/omniauth/omniauth-saml ) from 1.10.0 to 1.10.1.
- [Release notes](https://github.com/omniauth/omniauth-saml/releases )
- [Changelog](https://github.com/omniauth/omniauth-saml/blob/master/CHANGELOG.md )
- [Commits](https://github.com/omniauth/omniauth-saml/compare/v1.10.0...v1.10.1 )
Signed-off-by: dependabot[bot] <support@dependabot.com> 
							
						 
						
							2018-10-05 19:01:00 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									dependabot[bot] 
								
							 
						 
						
							
							
							
							
								
							
							
								524282ff6b 
								
							 
						 
						
							
							
								
								Bump parallel_tests from 2.21.3 to 2.23.0 ( #8884 )  
							
							... 
							
							
							
							Bumps [parallel_tests](https://github.com/grosser/parallel_tests ) from 2.21.3 to 2.23.0.
- [Release notes](https://github.com/grosser/parallel_tests/releases )
- [Commits](https://github.com/grosser/parallel_tests/compare/v2.21.3...v2.23.0 )
Signed-off-by: dependabot[bot] <support@dependabot.com> 
							
						 
						
							2018-10-05 18:59:35 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									dependabot[bot] 
								
							 
						 
						
							
							
							
							
								
							
							
								b4fedcc15e 
								
							 
						 
						
							
							
								
								Bump puma from 3.11.4 to 3.12.0 ( #8883 )  
							
							... 
							
							
							
							Bumps [puma](https://github.com/puma/puma ) from 3.11.4 to 3.12.0.
- [Release notes](https://github.com/puma/puma/releases )
- [Changelog](https://github.com/puma/puma/blob/master/History.md )
- [Commits](https://github.com/puma/puma/compare/v3.11.4...v3.12.0 )
Signed-off-by: dependabot[bot] <support@dependabot.com> 
							
						 
						
							2018-10-05 18:58:13 +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 
							
								 
							
						 
					 
				
					
						
							
								
								
									dependabot[bot] 
								
							 
						 
						
							
							
							
							
								
							
							
								5cdaec1ec2 
								
							 
						 
						
							
							
								
								[Security] Bump nokogiri from 1.8.4 to 1.8.5 ( #8881 )  
							
							... 
							
							
							
							Bumps [nokogiri](https://github.com/sparklemotion/nokogiri ) from 1.8.4 to 1.8.5. **This update includes security fixes.**
- [Release notes](https://github.com/sparklemotion/nokogiri/releases )
- [Changelog](https://github.com/sparklemotion/nokogiri/blob/master/CHANGELOG.md )
- [Commits](https://github.com/sparklemotion/nokogiri/compare/v1.8.4...v1.8.5 )
Signed-off-by: dependabot[bot] <support@dependabot.com> 
							
						 
						
							2018-10-05 04:07:44 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									aus-social 
								
							 
						 
						
							
							
							
							
								
							
							
								c883b1ffc9 
								
							 
						 
						
							
							
								
								lint pass 2 ( #8878 )  
							
							... 
							
							
							
							* Code quality pass
* Typofix
* Update applications_controller_spec.rb
* Update applications_controller_spec.rb 
							
						 
						
							2018-10-04 17:38:04 +02:00