David Yip 
								
							 
						 
						
							
							
							
							
								
							
							
								dd28b94cf0 
								
							 
						 
						
							
							
								
								Merge remote-tracking branch 'origin/master' into gs-master  
							
							
							
						 
						
							2017-10-26 09:18:27 -05:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									りんすき 
								
							 
						 
						
							
							
							
							
								
							
							
								d556be2968 
								
							 
						 
						
							
							
								
								Fix column design broken with very long title ( #5493 )  
							
							... 
							
							
							
							* Fix  #5314 
* fix not beautiful code
* fix broken design with mobile view
* remove no longer needed code 
							
						 
						
							2017-10-26 22:52:48 +09:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Nolan Lawson 
								
							 
						 
						
							
							
							
							
								
							
							
								02f7f3619a 
								
							 
						 
						
							
							
								
								Remove translateZ(0) on modal overlay ( #5478 )  
							
							
							
						 
						
							2017-10-26 22:46:50 +09:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									David Yip 
								
							 
						 
						
							
							
							
							
								
							
							
								4f01e6e8d5 
								
							 
						 
						
							
							
								
								Merge remote-tracking branch 'origin/master' into gs-master  
							
							
							
						 
						
							2017-10-22 22:57:41 -05:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Ondřej Hruška 
								
							 
						 
						
							
							
							
							
								
							
							
								d589dd7cd0 
								
							 
						 
						
							
							
								
								Compose buttons bar redesign + generalize dropdown ( #194 )  
							
							... 
							
							
							
							* Generalize compose dropdown for re-use
* wip stuffs
* new tootbox look and removed old doodle button files
* use the house icon for ... 
							
						 
						
							2017-10-21 20:24:53 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Nolan Lawson 
								
							 
						 
						
							
							
							
							
								
							
							
								8392ddbf87 
								
							 
						 
						
							
							
								
								Remove unnecessary translateZ(0) when doing scale() ( #5473 )  
							
							
							
						 
						
							2017-10-19 18:27:55 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									David Yip 
								
							 
						 
						
							
							
							
							
								
							
							
								42e8c8eb0e 
								
							 
						 
						
							
							
								
								Merge tag 'v2.0.0' into gs-master  
							
							
							
						 
						
							2017-10-18 11:52:04 -05:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									YaQ 
								
							 
						 
						
							
							
							
							
								
							
							
								6e54719474 
								
							 
						 
						
							
							
								
								Make theme directory and Rename application.scss ( #5336 )  
							
							... 
							
							
							
							* Rename application.scss
* Move to 'default' directory
* Follow review
Move directory, and Rename "mastodon".
* Revert rename
* undo removal of newline 
							
						 
						
							2017-10-18 05:20:07 +09:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Nolan Lawson 
								
							 
						 
						
							
							
							
							
								
							
							
								8b22a63ab0 
								
							 
						 
						
							
							
								
								Fix scrolling of dropdown when offscreen ( #5434 )  
							
							
							
						 
						
							2017-10-17 20:38:16 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Eugen Rochko 
								
							 
						 
						
							
							
							
							
								
							
							
								05686cc99d 
								
							 
						 
						
							
							
								
								Fix unwanted content warning gap in CSS ( #5436 )  
							
							... 
							
							
							
							Fix  #5356  
						
							2017-10-17 20:07:44 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Ondřej Hruška 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								4421f6598f 
								
							 
						 
						
							
							
								
								Fix dual toot button wrong behavior after compose re-design  
							
							
							
						 
						
							2017-10-16 23:32:13 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Ondřej Hruška 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								3d7de06db4 
								
							 
						 
						
							
							
								
								rem a comment  
							
							
							
						 
						
							2017-10-16 22:12:38 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Ondřej Hruška 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								26f08f0791 
								
							 
						 
						
							
							
								
								double-decker tootbox  
							
							
							
						 
						
							2017-10-16 22:10:14 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									David Yip 
								
							 
						 
						
							
							
							
							
								
							
							
								6cd5b3bbe5 
								
							 
						 
						
							
							
								
								Merge remote-tracking branch 'origin/master' into gs-master  
							
							
							
						 
						
							2017-10-16 01:29:02 -05:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Matthew Walsh 
								
							 
						 
						
							
							
							
							
								
							
							
								56094cb4bd 
								
							 
						 
						
							
							
								
								1.6 changed files for unified avatar styling -- updated to restore unity  
							
							
							
						 
						
							2017-10-15 21:14:21 -07:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Lynx Kotoura 
								
							 
						 
						
							
							
							
							
								
							
							
								b3b4b5a2eb 
								
							 
						 
						
							
							
								
								Adjust public hashtag pages ( #5357 )  
							
							
							
						 
						
							2017-10-14 14:48:12 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Ondřej Hruška 
								
							 
						 
						
							
							
							
							
								
							
							
								cdc22d23b9 
								
							 
						 
						
							
							
								
								Doodle improvements 2 ( #176 )  
							
							... 
							
							
							
							* Fix some doodle bugs and added Background color functionality
* added protections against accidental doodle erase, screen size changing
* resolve react warning about 'selected' on <option> 
							
						 
						
							2017-10-14 12:24:35 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Ondřej Hruška 
								
							 
						 
						
							
							
							
							
								
							
							
								531dadad86 
								
							 
						 
						
							
							
								
								Doodle palette, options, fill tool ( #172 )  
							
							
							
						 
						
							2017-10-14 00:58:38 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Ondřej Hruška 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								33e806217f 
								
							 
						 
						
							
							
								
								Initial doodle support  
							
							
							
						 
						
							2017-10-13 18:07:01 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Ondřej Hruška 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								0bf9261e65 
								
							 
						 
						
							
							
								
								Merge remote-tracking branch 'upstream/master'  
							
							
							
						 
						
							2017-10-11 21:27:17 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Lynx Kotoura 
								
							 
						 
						
							
							
							
							
								
							
							
								07ea625cb2 
								
							 
						 
						
							
							
								
								Fix styles of error pages ( #5335 )  
							
							... 
							
							
							
							Signed-off-by: Lynx Kotoura <admin@sanin.link>
Signed-off-by: Lynx Kotoura <admin@sanin.link> 
							
						 
						
							2017-10-11 21:18:45 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									kibigo! 
								
							 
						 
						
							
							
							
							
								
							
							
								8d6b9ba494 
								
							 
						 
						
							
							
								
								Merge upstream 2.0ish  #165  
							
							
							
						 
						
							2017-10-11 10:43:10 -07:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Eugen Rochko 
								
							 
						 
						
							
							
							
							
								
							
							
								1c6fc0e4ce 
								
							 
						 
						
							
							
								
								Center error layout ( #5289 )  
							
							
							
						 
						
							2017-10-09 20:51:36 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Ondřej Hruška 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								92a3181dc6 
								
							 
						 
						
							
							
								
								improve static page metadata look  
							
							
							
						 
						
							2017-10-08 10:46:59 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Eugen Rochko 
								
							 
						 
						
							
							
							
							
								
							
							
								684001d729 
								
							 
						 
						
							
							
								
								Dynamically calculate card height for embeds instead of padding ( #5265 )  
							
							... 
							
							
							
							The padding trick was hard-coded to a 16:9 ratio, but we can use
width and height provided from OEmbed information and width
of the card itself to calculate a new height 
							
						 
						
							2017-10-08 02:34:49 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Eugen Rochko 
								
							 
						 
						
							
							
							
							
								
							
							
								292f3cd7e0 
								
							 
						 
						
							
							
								
								Show buffering in video player ( #5261 )  
							
							
							
						 
						
							2017-10-08 02:33:08 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Eugen Rochko 
								
							 
						 
						
							
							
							
							
								
							
							
								f486ef2666 
								
							 
						 
						
							
							
								
								Redesign public hashtag pages ( #5237 )  
							
							
							
						 
						
							2017-10-07 20:00:35 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Eugen Rochko 
								
							 
						 
						
							
							
							
							
								
							
							
								d2dee6ea43 
								
							 
						 
						
							
							
								
								Fix custom emoji in emoji picker, persist skin tone ( #5258 )  
							
							
							
						 
						
							2017-10-07 19:02:30 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									kibigo! 
								
							 
						 
						
							
							
							
							
								
							
							
								6610d57f91 
								
							 
						 
						
							
							
								
								Basic static metadata styling  
							
							
							
						 
						
							2017-10-06 22:22:34 -07:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Lynx Kotoura 
								
							 
						 
						
							
							
							
							
								
							
							
								5a2c7bd4ce 
								
							 
						 
						
							
							
								
								Fix overflowing in web UI ( #5246 )  
							
							... 
							
							
							
							* Fix overflowing in web UI
* Revert fixing dropdown menu modal 
							
						 
						
							2017-10-06 20:40:17 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Eugen Rochko 
								
							 
						 
						
							
							
							
							
								
							
							
								7db0f8dcb2 
								
							 
						 
						
							
							
								
								Implement hotkeys for web UI ( #5164 )  
							
							... 
							
							
							
							* Fix  #2102  - Implement hotkeys
Hotkeys on status list:
- r to reply
- m to mention author
- f to favourite
- b to boost
- enter to open status
- p to open author's profile
- up or k to move up in the list
- down or j to move down in the list
- 1-9 to focus a status in one of the columns
- n to focus the compose textarea
- alt+n to start a brand new toot
- backspace to navigate back
* Add navigational hotkeys
The key g followed by:
- s: start
- h: home
- n: notifications
- l: local timeline
- t: federated timeline
- f: favourites
- u: own profile
- p: pinned toots
- b: blocked users
- m: muted users
* Add hotkey for focusing search, make escape un-focus compose/search
* Fix focusing notifications column, fix hotkeys in compose textarea 
							
						 
						
							2017-10-06 01:07:59 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Lynx Kotoura 
								
							 
						 
						
							
							
							
							
								
							
							
								32e8a87830 
								
							 
						 
						
							
							
								
								adjust public profile pages 2 ( #5223 )  
							
							
							
						 
						
							2017-10-04 22:49:36 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									PFM 
								
							 
						 
						
							
							
							
							
								
							
							
								875d943c18 
								
							 
						 
						
							
							
								
								Add pagination in media modal ( #4343 )  
							
							... 
							
							
							
							* Add pagination in media modal
* Change array name
* Add an element class
* Avoid nested class
* Pull out the active class
* Use map instead of forEach
* Remove parentheses 
							
						 
						
							2017-10-03 17:11:22 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Yamagishi Kazutoshi 
								
							 
						 
						
							
							
							
							
								
							
							
								ecacb15cd5 
								
							 
						 
						
							
							
								
								Add placeholder text color to form of media attachments ( #5196 )  
							
							
							
						 
						
							2017-10-03 13:10:57 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Eugen Rochko 
								
							 
						 
						
							
							
							
							
								
							
							
								4453c9a9f5 
								
							 
						 
						
							
							
								
								Search popout ( #5170 )  
							
							
							
						 
						
							2017-10-02 18:24:05 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Nolan Lawson 
								
							 
						 
						
							
							
							
							
								
							
							
								c567c87453 
								
							 
						 
						
							
							
								
								Toggle contain:strict on fullscreen ( #5159 )  
							
							... 
							
							
							
							* Toggle contain:strict on fullscreen
* Fix scss lint issue
* fix scss whitespace lint issue 
							
						 
						
							2017-10-02 03:01:01 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Eugen Rochko 
								
							 
						 
						
							
							
							
							
								
							
							
								cdad7977fc 
								
							 
						 
						
							
							
								
								Improve privacy dropdown, remove react-simple-dropdown dependency ( #5140 )  
							
							... 
							
							
							
							* Improve privacy dropdown, remove react-simple-dropdown dependency
* Animate privacy warning
* Fix react-router-scroll 
							
						 
						
							2017-10-01 12:20:00 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Eugen Rochko 
								
							 
						 
						
							
							
							
							
								
							
							
								0b3f1ec62a 
								
							 
						 
						
							
							
								
								Reorganize preferences page ( #5161 )  
							
							
							
						 
						
							2017-10-01 10:52:39 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Nolan Lawson 
								
							 
						 
						
							
							
							
							
								
							
							
								6e0659c838 
								
							 
						 
						
							
							
								
								Improve performance of modal and swipe animations ( #5135 )  
							
							... 
							
							
							
							* Improve performance of modal and swipe animations
* Fix eslint issues 
							
						 
						
							2017-09-28 20:43:18 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Eugen Rochko 
								
							 
						 
						
							
							
							
							
								
							
							
								4ec1771165 
								
							 
						 
						
							
							
								
								Add ability to specify alternative text for media attachments ( #5123 )  
							
							... 
							
							
							
							* Fix  #117  - Add ability to specify alternative text for media attachments
- POST /api/v1/media accepts `description` straight away
- PUT /api/v1/media/:id to update `description` (only for unattached ones)
- Serialized as `name` of Document object in ActivityPub
- Uploads form adjusted for better performance and description input
* Add tests
* Change undo button blend mode to difference 
							
						 
						
							2017-09-28 15:31:31 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Ondřej Hruška 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								daad07b1d5 
								
							 
						 
						
							
							
								
								Merge remote-tracking branch 'origin/better-themeing' into merging-upstream  
							
							
							
						 
						
							2017-09-28 09:20:59 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Ondřej Hruška 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								83bda6c1a8 
								
							 
						 
						
							
							
								
								Merge commit 'b9f59ebcc68e9da0a7158741a1a2ef3564e1321e' into merging-upstream  
							
							
							
						 
						
							2017-09-28 09:18:35 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Ondřej Hruška 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								9330ea1f4d 
								
							 
						 
						
							
							
								
								Merge commit '4aea3f88a6d30f102a79c2da7fcfac96465ba1a8' into merging-upstream  
							
							
							
						 
						
							2017-09-28 09:12:17 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									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 
							
								 
							
						 
					 
				
					
						
							
								
								
									kibigo! 
								
							 
						 
						
							
							
							
							
								
							
							
								86e617a839 
								
							 
						 
						
							
							
								
								Better themeing support!!  
							
							
							
						 
						
							2017-09-25 19:24:32 -07:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Eugen Rochko 
								
							 
						 
						
							
							
							
							
								
							
							
								3b60832214 
								
							 
						 
						
							
							
								
								New error page graphic. Other error page improvements ( #5099 )  
							
							... 
							
							
							
							- 500.html generated with admin-set default locale if set
- Error page `<title>` includes Mastodon site title
- 500 title changed to "This page is not
  correct" (ref: <https://www.youtube.com/watch?v=2VCAP_seh1A >)
- 500 content appended with "on our end" to make clear it's
  not user's fault 
							
						 
						
							2017-09-25 23:05:54 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Eugen Rochko 
								
							 
						 
						
							
							
							
							
								
							
							
								2c8e3fbbfb 
								
							 
						 
						
							
							
								
								Generate 500.html with assets:precompile, remove loading from Google Fonts ( #5067 )  
							
							
							
						 
						
							2017-09-25 04:04:04 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Eugen Rochko 
								
							 
						 
						
							
							
							
							
								
							
							
								2f079573ed 
								
							 
						 
						
							
							
								
								In detail status view, display attachment uncropped if there's only one ( #5054 )  
							
							... 
							
							
							
							* In detail status view, display attachment uncropped if there's only one
* Make media spoiler the size of the media it hides, enable on static 
							
						 
						
							2017-09-24 05:58:30 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Eugen Rochko 
								
							 
						 
						
							
							
							
							
								
							
							
								dae0af1fd2 
								
							 
						 
						
							
							
								
								Change mobile layout breakpoint from 1024px to 630px ( #5063 )  
							
							... 
							
							
							
							630px = Drawer + 1 Column 
							
						 
						
							2017-09-24 01:25:07 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Eugen Rochko 
								
							 
						 
						
							
							
							
							
								
							
							
								5b8d0ad71b 
								
							 
						 
						
							
							
								
								Dropdown triangles a bit nicer, smoother scrolling on touch ( #5062 )  
							
							
							
						 
						
							2017-09-24 00:40:10 +02:00