Ondřej Hruška 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								8a24ad5828 
								
							 
						 
						
							
							
								
								Revert "Merge pull request  #149  from glitch-soc/mojon-suggest"  
							
							... 
							
							
							
							This reverts commit fa3587645d15c9c2fd7e 
							
						 
						
							2017-09-28 08:55:53 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Ondřej Hruška 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								1924a71b5a 
								
							 
						 
						
							
							
								
								Make secondary toot button work nicer with file attachments & revert to the original behavior if it's disabled  
							
							
							
						 
						
							2017-09-23 23:38:24 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Ondřej Hruška 
								
							 
						 
						
							
							
							
							
								
							
							
								67f8277526 
								
							 
						 
						
							
							
								
								Add secondary toot button (opt-in) ( #153 )  
							
							... 
							
							
							
							Add secondary toot button + other toot button enhancements. 
Squashing so it's easy to revert if needed. 
							
						 
						
							2017-09-23 23:11:02 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Ondřej Hruška 
								
							 
						 
						
							
							
							
							
								
							
							
								169d83f532 
								
							 
						 
						
							
							
								
								Remove "extra clickable spaces" made obsolete by status re-design  
							
							
							
						 
						
							2017-09-23 00:33:35 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Ondřej Hruška 
								
							 
						 
						
							
							
							
							
								
							
							
								31dd261375 
								
							 
						 
						
							
							
								
								applied blackle's fix for gallery offset with full-width media  
							
							
							
						 
						
							2017-09-22 21:47:14 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									kibigo! 
								
							 
						 
						
							
							
							
							
								
							
							
								c2b479efec 
								
							 
						 
						
							
							
								
								Long display names now ellipsis properly  
							
							
							
						 
						
							2017-09-21 16:55:32 -07:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									kibigo! 
								
							 
						 
						
							
							
							
							
								
							
							
								a94dc21c79 
								
							 
						 
						
							
							
								
								Styling fixes for header redesign  
							
							
							
						 
						
							2017-09-21 16:46:18 -07:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									David Yip 
								
							 
						 
						
							
							
							
							
								
							
							
								9512db920c 
								
							 
						 
						
							
							
								
								Merge pull request  #148  from glitch-soc/better-header  
							
							... 
							
							
							
							Improvements to status headers and content 
							
						 
						
							2017-09-21 16:11:03 -05:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									beatrix 
								
							 
						 
						
							
							
							
							
								
							
							
								fa3587645d 
								
							 
						 
						
							
							
								
								Merge pull request  #149  from glitch-soc/mojon-suggest  
							
							... 
							
							
							
							Emoji and Hashtag autocomplete 
							
						 
						
							2017-09-20 23:02:23 -04:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									kibigo! 
								
							 
						 
						
							
							
							
							
								
							
							
								9ed51cecd0 
								
							 
						 
						
							
							
								
								Fixed notification appearance  
							
							
							
						 
						
							2017-09-20 14:52:01 -07:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Ondřej Hruška 
								
							 
						 
						
							
							
							
							
								
							
							
								cbf00168f1 
								
							 
						 
						
							
							
								
								add scrollbar to mojon suggestions list when too long  
							
							
							
						 
						
							2017-09-20 21:53:08 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									kibigo! 
								
							 
						 
						
							
							
							
							
								
							
							
								769f62d96f 
								
							 
						 
						
							
							
								
								Improvements to status headers  
							
							
							
						 
						
							2017-09-20 01:57:08 -07:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									kibigo! 
								
							 
						 
						
							
							
							
							
								
							
							
								003bfd094e 
								
							 
						 
						
							
							
								
								Fixed disabled boost SVG ( #106 )  
							
							
							
						 
						
							2017-09-20 00:40:54 -07:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Surinna Curtis 
								
							 
						 
						
							
							
							
							
								
							
							
								b0487488a7 
								
							 
						 
						
							
							
								
								Re-center hidden media text vertical  
							
							
							
						 
						
							2017-09-16 11:44:31 -05:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Surinna Curtis 
								
							 
						 
						
							
							
							
							
								
							
							
								7ebd6ed03c 
								
							 
						 
						
							
							
								
								Apply white-space: nowrap to account relationships icons  
							
							
							
						 
						
							2017-09-14 07:37:39 -05:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Surinna Curtis 
								
							 
						 
						
							
							
							
							
								
							
							
								4612f7caea 
								
							 
						 
						
							
							
								
								Break out a separate mute modal with a hide-notifications checkbox.  
							
							
							
						 
						
							2017-09-13 21:47:30 -05:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									David Yip 
								
							 
						 
						
							
							
							
							
								
							
							
								67ad453373 
								
							 
						 
						
							
							
								
								Merge tag 'v1.6.0rc4' into sync/upstream-1.6.0rc4  
							
							... 
							
							
							
							Conflicts:
      app/javascript/mastodon/features/getting_started/index.js
      app/javascript/packs/public.js
      app/javascript/styles/components.scss 
							
						 
						
							2017-09-09 23:56:21 -05:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									David Yip 
								
							 
						 
						
							
							
							
							
								
							
							
								514fc908a3 
								
							 
						 
						
							
							
								
								Merge tag 'v1.6.0rc3' into sync/upstream  
							
							
							
						 
						
							2017-09-09 14:28:08 -05:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									David Yip 
								
							 
						 
						
							
							
							
							
								
							
							
								b9f7bc149b 
								
							 
						 
						
							
							
								
								Merge branch 'origin/master' into sync/upstream  
							
							... 
							
							
							
							Conflicts:
	app/javascript/mastodon/components/status_list.js
	app/javascript/mastodon/features/notifications/index.js
	app/javascript/mastodon/features/ui/components/modal_root.js
	app/javascript/mastodon/features/ui/components/onboarding_modal.js
	app/javascript/mastodon/features/ui/index.js
	app/javascript/styles/about.scss
	app/javascript/styles/accounts.scss
	app/javascript/styles/components.scss
	app/presenters/instance_presenter.rb
	app/services/post_status_service.rb
	app/services/reblog_service.rb
	app/views/about/more.html.haml
	app/views/about/show.html.haml
	app/views/accounts/_header.html.haml
	config/webpack/loaders/babel.js
	spec/controllers/api/v1/accounts/credentials_controller_spec.rb 
							
						 
						
							2017-09-09 14:27:47 -05:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Eugen Rochko 
								
							 
						 
						
							
							
							
							
								
							
							
								6867681c7c 
								
							 
						 
						
							
							
								
								Add script to make embedded iframes autosize ( #4853 )  
							
							
							
						 
						
							2017-09-09 16:23:44 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Lynx Kotoura 
								
							 
						 
						
							
							
							
							
								
							
							
								3c45d3963a 
								
							 
						 
						
							
							
								
								Scrollable tables in settings pages ( #4857 )  
							
							... 
							
							
							
							* Scrollable tables in settings pages
* Add space before curly brace 
							
						 
						
							2017-09-09 02:26:58 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									PFM 
								
							 
						 
						
							
							
							
							
								
							
							
								7d853b514a 
								
							 
						 
						
							
							
								
								Use <button> instead of <div role="button"> ( #4835 )  
							
							
							
						 
						
							2017-09-07 16:18:41 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									voidSatisfaction 
								
							 
						 
						
							
							
							
							
								
							
							
								13ffa3c59e 
								
							 
						 
						
							
							
								
								Add Smartphone screen favourite back button and adjust styles ( #4813 )  
							
							... 
							
							
							
							* Feat add get-back button on favourite columnHeader
* Style adjust nice looking get-back button
* Fix delete media query and add padding right
* fix: restore padding and add lastchild style for back-button 
							
						 
						
							2017-09-06 17:32:15 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									PFM 
								
							 
						 
						
							
							
							
							
								
							
							
								d8d2a54741 
								
							 
						 
						
							
							
								
								fix text position of NSFW for video file ( #4819 )  
							
							
							
						 
						
							2017-09-06 13:55:47 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Lynx Kotoura 
								
							 
						 
						
							
							
							
							
								
							
							
								4c3dd0b254 
								
							 
						 
						
							
							
								
								Adjust status embeds ( #4808 )  
							
							... 
							
							
							
							* Adjust status embeds
Adjust styles of embed code. Adjust styles of embed pages. Fix overflow of embed-modal.
* Remove trailing whitespace
* Using width from the variable 
							
						 
						
							2017-09-05 12:31:24 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									PFM 
								
							 
						 
						
							
							
							
							
								
							
							
								2a5d1d5a1b 
								
							 
						 
						
							
							
								
								fix text position of NSFW in Safari (Mac/iPhone) ( #4570 )  
							
							
							
						 
						
							2017-09-02 18:52:56 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Lynx Kotoura 
								
							 
						 
						
							
							
							
							
								
							
							
								cfe39fb58d 
								
							 
						 
						
							
							
								
								Adjust settings pages ( #4765 )  
							
							... 
							
							
							
							* views: Adjust heading positions
* Adjust settings pages
Adjust label. Adjust tables. Adjust admin/reports/* pages. Fix 2FA QR code style for narrow devices. Widen several pages. Increase contrast.
* Remove trailing whitespace 
							
						 
						
							2017-09-02 15:49:28 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Yamagishi Kazutoshi 
								
							 
						 
						
							
							
							
							
								
							
							
								ba8fb2fd0f 
								
							 
						 
						
							
							
								
								Add text color style for noscript link ( #4772 )  
							
							
							
						 
						
							2017-09-02 14:02:15 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Cygnan 
								
							 
						 
						
							
							
							
							
								
							
							
								a75aa62f5b 
								
							 
						 
						
							
							
								
								Adjust padding on the public profile page ( #4757 )  
							
							... 
							
							
							
							* Fix a style issue on the public profile page for some mobile browsers
Signed-off-by: Cygnan <email@cygnan.com>
* Set padding-bottom to 20px
Signed-off-by: Cygnan <email@cygnan.com> 
							
						 
						
							2017-09-01 21:01:23 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Eugen Rochko 
								
							 
						 
						
							
							
							
							
								
							
							
								7dc5035031 
								
							 
						 
						
							
							
								
								Make PreviewCard records reuseable between statuses ( #4642 )  
							
							... 
							
							
							
							* Make PreviewCard records reuseable between statuses
**Warning!** Migration truncates preview_cards tablec
* Allow a wider thumbnail for link preview, display it in horizontal layout (#4648 )
* Delete preview cards files before truncating
* Rename old table instead of truncating it
* Add mastodon:maintenance:remove_deprecated_preview_cards
* Ignore deprecated_preview_cards in schema definition
* Fix null behaviour 
							
						 
						
							2017-09-01 16:20:16 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Yamagishi Kazutoshi 
								
							 
						 
						
							
							
							
							
								
							
							
								2305f7c391 
								
							 
						 
						
							
							
								
								Use system's default font on non web UI pages ( #4553 )  
							
							... 
							
							
							
							* Use system's default font on non web UI pages
* Remove import for Redirect 
							
						 
						
							2017-09-01 16:13:31 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Eugen Rochko 
								
							 
						 
						
							
							
							
							
								
							
							
								d1a78eba15 
								
							 
						 
						
							
							
								
								Embed modal ( #4748 )  
							
							... 
							
							
							
							* Embed modal
* Proxy OEmbed requests from web UI 
							
						 
						
							2017-08-31 03:38:35 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Eugen Rochko 
								
							 
						 
						
							
							
							
							
								
							
							
								e95bdec7c5 
								
							 
						 
						
							
							
								
								Update status embeds ( #4742 )  
							
							... 
							
							
							
							- Use statuses controller for embeds instead of stream entries controller
- Prefer /@:username/:id/embed URL for embeds
- Use /@:username as author_url in OEmbed
- Add follow link to embeds which opens web intent in new window
- Use redis cache in development
- Cache entire embed 
							
						 
						
							2017-08-30 10:23:43 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Lynx Kotoura 
								
							 
						 
						
							
							
							
							
								
							
							
								07994eed00 
								
							 
						 
						
							
							
								
								Adjust "signed in as" pages ( #4720 )  
							
							... 
							
							
							
							* Adjust "signed in as" pages
Fix min-width
Set width of .account-header .name
To apply text-overflow and overflow settings
Set overflow for detailed-status__display-name
* Remove trailing whitespace 
							
						 
						
							2017-08-28 00:01:07 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Lynx Kotoura 
								
							 
						 
						
							
							
							
							
								
							
							
								bab9afaa09 
								
							 
						 
						
							
							
								
								Adjust public profile pages ( #4713 )  
							
							... 
							
							
							
							* Adjust account-grid in public profiles
Full-width card on mobile UI. Set break-word for long name and ID. Fix margin.
* Reduce padding-bottom of public profiles
* Revive next prev buttons in mobile public profiles
In followers followees pages.
* Revert break-word for username
* Fix overflow of display_name
Need re-setting text-overflow and overflow in display: block; 
							
						 
						
							2017-08-27 23:59:51 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Eugen Rochko 
								
							 
						 
						
							
							
							
							
								
							
							
								26402ee2cb 
								
							 
						 
						
							
							
								
								Adjust RTL styles ( #4712 )  
							
							
							
						 
						
							2017-08-27 13:35:18 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Lynx Kotoura 
								
							 
						 
						
							
							
							
							
								
							
							
								8ecfdd8795 
								
							 
						 
						
							
							
								
								Set margin between character-counter and compose-form__buttons ( #4698 )  
							
							... 
							
							
							
							For some languages publish translation is long. 
							
						 
						
							2017-08-26 14:23:20 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Lynx Kotoura 
								
							 
						 
						
							
							
							
							
								
							
							
								18f69fb964 
								
							 
						 
						
							
							
								
								Adjust styles of landing pages. ( #4682 )  
							
							... 
							
							
							
							* Adjust about.scss
* Delete trailing whitespace. 
							
						 
						
							2017-08-25 17:19:35 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Damien Erambert 
								
							 
						 
						
							
							
							
							
								
							
							
								f72ed21cd6 
								
							 
						 
						
							
							
								
								Don't load Roboto webfont when system font is used in the app ( #4591 )  
							
							... 
							
							
							
							* Don't load Roboto webfont when system font is used in the app
* remove trailing whitespace 
							
						 
						
							2017-08-24 19:28:49 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Lynx Kotoura 
								
							 
						 
						
							
							
							
							
								
							
							
								143b77e10d 
								
							 
						 
						
							
							
								
								Increase contrast in landing pages ( #4567 )  
							
							... 
							
							
							
							* Increase contrast in about and about/more page
* Lighten em color in landing pages
* Increase contrast in landing pages
Fix about.scss 
							
						 
						
							2017-08-21 21:59:03 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Eugen Rochko 
								
							 
						 
						
							
							
							
							
								
							
							
								4cbb638604 
								
							 
						 
						
							
							
								
								Fix visual line-break glitch with .invisible parts of links ( #4655 )  
							
							
							
						 
						
							2017-08-21 17:59:34 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									unarist 
								
							 
						 
						
							
							
							
							
								
							
							
								f26758dc01 
								
							 
						 
						
							
							
								
								Fix .information-board style for Safari ( #4602 )  
							
							... 
							
							
							
							flex-basis: 0 allows make flexbox smaller than its contents on Safari <10.
https://github.com/philipwalton/flexbugs#1-minimum-content-sizing-of-flex-items-not-honored  
							
						 
						
							2017-08-20 20:45:44 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Eugen Rochko 
								
							 
						 
						
							
							
							
							
								
							
							
								ca7ea1aba9 
								
							 
						 
						
							
							
								
								Redesign public profiles ( #4608 )  
							
							... 
							
							
							
							* Redesign public profiles
* Responsive design
* Change public profile status filtering defaults and add options
- No longer displays private/direct toots even if you are permitted access
- By default omits replies
- "With replies" option
- "Media only" option
* Redesign account grid cards
* Fix style issues 
							
						 
						
							2017-08-16 17:12:58 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Clworld 
								
							 
						 
						
							
							
							
							
								
							
							
								f814661fca 
								
							 
						 
						
							
							
								
								Make share intent modal to make "signed in as" shown. ( #4611 )  
							
							... 
							
							
							
							* Make share intent modal to make "signed in as" shown.
* fix glitch on mobile. 
							
						 
						
							2017-08-16 16:48:44 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Eugen Rochko 
								
							 
						 
						
							
							
							
							
								
							
							
								3c6503038e 
								
							 
						 
						
							
							
								
								Add protocol handler. Handle follow intents ( #4511 )  
							
							... 
							
							
							
							* Add protocol handler. Handle follow intents
* Add share intent
* Improve code in intents controller
* Adjust share form CSS 
							
						 
						
							2017-08-14 04:53:31 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Yamagishi Kazutoshi 
								
							 
						 
						
							
							
							
							
								
							
							
								d9a1fb134a 
								
							 
						 
						
							
							
								
								Fix emoji picker scrollbar style ( #4572 )  
							
							
							
						 
						
							2017-08-10 13:41:12 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									TheInventrix 
								
							 
						 
						
							
							
							
							
								
							
							
								c9fd6f386c 
								
							 
						 
						
							
							
								
								unify short description styling ( #4548 )  
							
							... 
							
							
							
							apply same style class to the About description on both the landing page
and the about/more page 
							
						 
						
							2017-08-08 01:50:15 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Ondřej Hruška 
								
							 
						 
						
							
							
							
							
								
							
							
								4dc0ddc601 
								
							 
						 
						
							
							
								
								fix regression - collapse button not working  
							
							
							
						 
						
							2017-08-07 22:46:24 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Ondřej Hruška 
								
							 
						 
						
							
							
							
							
								
							
							
								7a1ca8b0df 
								
							 
						 
						
							
							
								
								Merge remote-tracking branch 'upstream/master'  
							
							
							
						 
						
							2017-08-07 22:43:52 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Ondřej Hruška 
								
							 
						 
						
							
							
							
							
								
							
							
								b8791ae79b 
								
							 
						 
						
							
							
								
								always put @handles on a new line. undo some needless changes from prev cmmt  
							
							
							
						 
						
							2017-08-07 21:59:49 +02:00