treehouse
/
mastodon
21
8
Fork 5
Code Issues 32 Pull Requests Projects 1 Releases Wiki Activity
6,280 Commits
12 Branches
15 Tags
760 MiB
Commit Graph

6280 Commits (f2c6ed24d3586666d2c4a5bde97bc06e4c8e9de6)

Author SHA1 Message Date
beatrix f2c6ed24d3 Merge pull request #440 from ThibG/glitch-soc/fixes/video-fullscreen 
[Glitch] Fix fullscreen video player
 2018-04-26 11:33:24 -04:00
David Yip 77ce46b0c1 Merge pull request #443 from unascribed/glitchsoc-pr-better-collapsed-statuses-fix 
Fix fade being colored wrongly for DMs and upon focus
 2018-04-24 14:26:53 -05:00
Una Thompson c3efd20a9c Fix fade being colored wrongly for DMs and upon focus 2018-04-24 11:34:17 -04:00
ThibG 85609535cf Merge pull request #442 from ThibG/glitch-soc/fixes/actions-modal-mobile 
Fix actions modal on mobile (fixes #441)
 2018-04-23 23:42:29 +02:00
Thibaut Girka 3e703fe757 Fix actions modal on mobile (fixes #441) 2018-04-23 23:18:36 +02:00
Thibaut Girka fdb7cf8a56 [Glitch] Fix fullscreen video player 
Port 53b1d88873 to glitch-soc
 2018-04-23 20:38:08 +02:00
beatrix 64f74da493 Merge pull request #432 from ThibG/glitch-soc/features/reblog-private 
Glitchsoc-specific changes to allow boosting own private toots
 2018-04-22 12:32:58 -04:00
beatrix 4f6a459984 Merge pull request #421 from ThibG/glitch-soc/features/custom-emoji-api 
[Glitch] retrieve custom emoji list via API instead of before page load
 2018-04-22 12:10:48 -04:00
beatrix 69710cf17b Merge pull request #427 from ThibG/glitch-soc/fixes/scroll-behavior 
Improve ScrollableList behavior
 2018-04-22 12:09:52 -04:00
beatrix d53630b9ed Merge pull request #434 from ThibG/glitch-soc/fixes/public-inline-video 
Fix video player on toot public views
 2018-04-22 12:09:11 -04:00
beatrix 2273eb43e7 Merge pull request #433 from ThibG/glitch-soc/fixes/status-filtering 
Status filtering fixes from upstream
 2018-04-22 12:08:12 -04:00
beatrix 1b58c44557 Merge pull request #435 from ThibG/glitch-soc/features/public-modals 
[Glitch] Show media modal on public pages
 2018-04-22 12:07:29 -04:00
beatrix dd13a0461b Merge pull request #436 from unascribed/glitchsoc-pr-better-collapsed-statuses 
Add fade and margin to collapsed statuses
 2018-04-22 12:06:37 -04:00
Una Thompson 880db71121 Add fade and margin to collapsed statuses 2018-04-22 11:34:19 -04:00
Thibaut Girka e4b0a92c0f Fix video player on toot public views 2018-04-20 16:08:46 +02:00
Thibaut Girka d6693f3ae3 [Glitch] Show media modal on public pages 
Port 47d2277ef1 to glitch-soc
 2018-04-20 15:58:36 +02:00
Jenkins c9265e97cc Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master 2018-04-19 22:17:23 +00:00
beatrix 172ce95cd4 Fix webkit scrollbars (#7191) 
* Revert "Make scroll bars wider (#7060)"

This reverts commit c0ad48c683.

* for real make webkit scrollbar wider
 2018-04-19 23:35:47 +02:00
David Yip 589974dd9f Merge pull request #426 from ThibG/glitch-soc/features/display-focal-points 
Honor focal points when displaying media
 2018-04-19 10:03:49 -05:00
Thibaut Girka f15ee5fdb9 [Glitch] Fix status filtering in contexts reducer 
Port 899cca061b to glitch-soc
 2018-04-19 16:43:02 +02:00
Thibaut Girka f7ec78e220 [Glitch] Do not filter the status collection after muting and blocking 
Port ce0d30feb7 to glitch-soc
 2018-04-19 16:42:27 +02:00
Emelia Smith 185407d3a2 Reports: Merge contents and comment columns (#7189) 2018-04-19 15:39:54 +02:00
Thibaut Girka 74bfb1e579 Fix auto-collapsed toots making the TL jump (fixes #417) 2018-04-19 11:30:42 +02:00
Thibaut Girka f63da992fc Clean up dead code 2018-04-19 11:30:42 +02:00
Thibaut Girka fe20ada59a Use React's new lifecycles for scrollable lists 2018-04-19 11:29:37 +02:00
Thibaut Girka f83dc9507f Glitchsoc-specific changes to allow boosting own private toots 2018-04-19 11:24:29 +02:00
Thibaut Girka 9b72f23fdd Only compute height dynamically for standalone media 
This prevents changing the status' height and triggering jumps in the TL
 2018-04-19 11:16:18 +02:00
Thibaut Girka 46b36c44ce [Glitch] Make detailed status' media gallery standalone 2018-04-19 11:16:18 +02:00
Thibaut Girka e0bffe8856 [Glitch] Center thumbnails on focus point 
Port the display part of the following commits to glitch-soc:
* 865c7e7178
* 62d18a3f9b
* 15ec9431be
* c1d44284ca
 2018-04-19 11:16:18 +02:00
Thibaut Girka c4209e12f6 Use javascript to set MediaGallery height automatically 2018-04-19 11:16:18 +02:00
Thibaut Girka b283f463c9 Revert some glitch-specific refactoring 
In order to keep my sanity when porting changes between glitch-soc and upstream.
 2018-04-19 11:16:18 +02:00
Thibaut Girka 5cd64fd6c6 [Glitch] retrieve custom emoji list via API instead of before page load 
Port f3db0d6ecc to glitch-soc
 2018-04-19 11:12:52 +02:00
Jenkins a359d69b09 Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master 2018-04-19 01:17:38 +00:00
Eugen Rochko b5d0bf338c Fix text color in "show more" link inside boost confirmation modal (#7183) 2018-04-19 02:36:31 +02:00
David Yip 337662fa0c Merge remote-tracking branch 'glitchsoc/master' into gs-master 2018-04-18 19:31:53 -05:00
David Yip 48f5f736a0 db: make schema.rb version subsume bookmarks migration. 2018-04-18 19:08:35 -05:00
David Yip bae5435010 Merge remote-tracking branch 'origin/master' into gs-master 
Conflicts:
 	app/controllers/home_controller.rb
 	app/controllers/stream_entries_controller.rb
 	app/javascript/mastodon/locales/ja.json
 	app/javascript/mastodon/locales/pl.json
 2018-04-18 18:48:12 -05:00
Eugen Rochko 7cba58aeaf Rescue SSL errors when processing mentions, remove useless line (#7184) 2018-04-19 00:53:31 +02:00
Marcin Mikołajczak 7bca0f1cda i18n: Update Polish translation (#7181) 
Signed-off-by: Marcin Mikołajczak <me@m4sk.in>
 2018-04-19 00:14:21 +09:00
Lynx Kotoura e5ad96390e Add color variables of texts for better accesibility (#7125) 
* Add variables for text colors

* Change variables in sass files

* Apply text color variables for recently added colors

* Fix text colors of emoji mart anchors

* Fix text colors of search__input

* Fix text colors of text area of compose-form

* Fix icon colors of privacy dropdown and modal

* Inverted icon colors by classname

* Change variables in boost.scss

* Change action-button-color

* Fix text colors of pre-header
 2018-04-18 16:52:15 +02:00
abcang 9dff61a5ba Fix comparing id (#7180) 2018-04-18 16:50:19 +02:00
Marcin Mikołajczak 8564d2767f Add revealing/hiding statuses button to keyboard shortcuts legend column (#7178) 
Signed-off-by: Marcin Mikołajczak <me@m4sk.in>
 2018-04-18 13:15:57 +02:00
Kaito Sinclaire 447741e456 Direct messages column (#4514) 
* Added a timeline for Direct statuses
* Lists all Direct statuses you've sent and received
* Displayed in Getting Started
* Streaming server support for direct TL

* Changes to match other timelines in 2.0
 2018-04-18 13:09:06 +02:00
luzi82 9b80aede7a zh-HK translation (#7177) 
* zh-HK translation

* zh-HK fix

* zh-HK translation

* add missing zh-HK translate

* fix translate

* i18n-tasks normalize
 2018-04-18 14:28:26 +09:00
Neil Moore e0853e52d8 Adds keyboard hotkey for revealing/hiding statuses (#7173) 
Resolves #5550
 2018-04-18 03:33:59 +02:00
ThibG 8cd19d3eec Allow boosting own private toots (#6157) 
* Adjust policy to allow boosting own private toots

* Add ability to reblog private toots from dropdown menu
 2018-04-17 23:35:45 +02:00
Sam Schlinkert c0ad48c683 Make scroll bars wider (#7060) 
* Set scrollbars to 12 px wide rather than 8px

Should overwrite the setting in reset.scss. This is untested at this point.

* removes scrollbar height and width specifications from reset.scss and basics.scss
 2018-04-17 23:25:54 +02:00
abcang 5384e1e913 Improve web api protect (#6343) 2018-04-17 15:23:46 +02:00
Emelia Smith 0f9c6407e9 Feature: add count of account notes to reports (#7130) 
* Reports: Colocate account details with reports

* Reports: Add count of account moderation notes

Sometimes an account will be left with a note instead of the report, this adds a way to quickly see from a given report if this is the case.
 2018-04-17 14:58:11 +02:00
Jennifer Kruse 7f6823b149 Able to deactivate invites if they aren't expired (#7163) 2018-04-17 13:52:08 +02:00