djsundog
/
tootlab-mastodon
mirror of https://github.com/glitch-soc/mastodon.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
6,299 Commits 69 Branches 20 Tags 353 MiB
Commit Graph

6299 Commits

Author SHA1 Message Date
David Yip 3a47842223
Merge pull request #451 from glitch-soc/450-make-non-whole-word-mutes-case-insensitive 
Also treat non-whole-word mutes as case-insensitive (#450)
 2018-04-30 22:38:10 -05:00
David Yip 5f8f481425
Also treat non-whole-word mutes as case-insensitive. #450. 2018-04-30 20:08:22 -05:00
beatrix 64be38da0c
Merge pull request #448 from m4sk1n/glitch-pl 
🌍: 🇵🇱⬆️
 2018-04-27 10:31:08 -04:00
beatrix 8de8a621f5
Merge pull request #447 from ThibG/glitch-soc/features/unfold-thread 
Fix enabling/disabling collapsed toots, as well as the unfold thread feature
 2018-04-27 10:30:26 -04:00
Marcin Mikołajczak deb91f5989 🌍: 🇵🇱⬆️ 
Signed-off-by: Marcin Mikołajczak <me@m4sk.in>
 2018-04-27 14:15:38 +02:00
Thibaut Girka 0ce06657c0 Update react-redux to 5.0.7 to fix an issue with getDerivedStateFromProps 2018-04-27 01:24:55 +02:00
Thibaut Girka 1222e0a381 Use new getDerivedStateFromProps instead of deprecated componentWillReceiveProps 
As we are already using the new getSnapshotBeforeUpdate lifecycle method,
we apparently cannot use the deprecated ones at all in this component.
 2018-04-27 01:24:55 +02:00
Thibaut Girka b39f3648a7 Tentative fix for #446 2018-04-27 00:59:36 +02:00
beatrix f4ed38272b
Merge pull request #401 from ThibG/glitch-soc/features/unfold-thread 
Port the “unfold thread” feature from Mastodon's UI to glitch-soc flavour
 2018-04-26 11:34:14 -04:00
beatrix 8f12afb599
Merge pull request #438 from ThibG/glitch-soc/fixes/j-k-hotkeys-pinned 
[Glitch] Fix the hot key (j, k) does not function correctly when ther…
 2018-04-26 11:33:48 -04:00
beatrix 1e9fe95e13
Merge pull request #439 from ThibG/glitch-soc/fixes/emoji-shortcode-inline 
[Glitch] Do not set emoji as inline-block
 2018-04-26 11:33:36 -04:00
beatrix 33691f4920
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 aebcf83b4d
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 62bea7a290 Fix fade being colored wrongly for DMs and upon focus 2018-04-24 11:34:17 -04:00
ThibG 65b8880ec9
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 240833c023 Fix actions modal on mobile (fixes #441) 2018-04-23 23:18:36 +02:00
Thibaut Girka 51d276fb98 [Glitch] Fix fullscreen video player 
Port 53b1d88873 to glitch-soc
 2018-04-23 20:38:08 +02:00
Thibaut Girka 003d114332 [Glitch] Fix the hot key (j, k) does not function correctly when there is a pinned toot in account timeline. 
Port 23106844a1 to glitch-soc
 2018-04-22 23:11:16 +02:00
Thibaut Girka 105ffaef8f [Glitch] Do not set emoji as inline-block 
Port 597948fb13 to glitch-soc
 2018-04-22 22:10:53 +02:00
Thibaut Girka b383c0688a [Glitch] Do not overwrite some status attributes in reducer 
Backport 386365090c
 2018-04-22 19:19:01 +02:00
Thibaut Girka 64d8d0464d Add show more/less toggle for entire threads in web UI 
Inspired from b6003afcdb but using component
properties instead of redux store for hidden/revealed state.
 2018-04-22 19:19:01 +02:00
Thibaut Girka 2888f74c12 Refactor the infamous three-valued boolean into two booleans, trying to simplify the logic 2018-04-22 19:18:15 +02:00
Thibaut Girka 259bc9840b [Glitch] Fix style of legacy column headers 
Backports daefbd66a6
 2018-04-22 19:17:10 +02:00
Thibaut Girka 63d671b18f [Glitch] Fix button hiding when header title is too long 
Port ffb2b8ef8c to glitch-soc
 2018-04-22 19:17:10 +02:00
Thibaut Girka abf7c5b850 [Glitch] Fix column headers accessibility 
Port 08e4c78e78 to glitch-soc.

SCSS fix inspired by 69f13e7bca.
 2018-04-22 19:17:10 +02:00
beatrix 06fc278e4c
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 8f1ec48cbe
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 125e8c7f5a
Merge pull request #427 from ThibG/glitch-soc/fixes/scroll-behavior 
Improve ScrollableList behavior
 2018-04-22 12:09:52 -04:00
beatrix cd5728b176
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 6fb610f865
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 e88ce27855
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 d7ae97c10a
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 5f9b85a0cf Add fade and margin to collapsed statuses 2018-04-22 11:34:19 -04:00
Thibaut Girka e4dff10934 Fix video player on toot public views 2018-04-20 16:08:46 +02:00
Thibaut Girka 7a68079b3f [Glitch] Show media modal on public pages 
Port ff7941e652 to glitch-soc
 2018-04-20 15:58:36 +02:00
Jenkins ed17e173d6 Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master 2018-04-19 22:17:23 +00:00
beatrix ca2cbe8f0f Fix webkit scrollbars (#7191) 
* Revert "Make scroll bars wider (#7060)"

This reverts commit 11715454d0.

* for real make webkit scrollbar wider
 2018-04-19 23:35:47 +02:00
David Yip 40006bcd03
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 13fa8ec2c7 [Glitch] Fix status filtering in contexts reducer 
Port 1a37d7e252 to glitch-soc
 2018-04-19 16:43:02 +02:00
Thibaut Girka f84b4d90cb [Glitch] Do not filter the status collection after muting and blocking 
Port fd87e5a53b to glitch-soc
 2018-04-19 16:42:27 +02:00
Emelia Smith b9c35785e2 Reports: Merge contents and comment columns (#7189) 2018-04-19 15:39:54 +02:00
Thibaut Girka 694337d9bb Fix auto-collapsed toots making the TL jump (fixes #417) 2018-04-19 11:30:42 +02:00
Thibaut Girka 931a4d1ebf Clean up dead code 2018-04-19 11:30:42 +02:00
Thibaut Girka 8f8b71a278 Use React's new lifecycles for scrollable lists 2018-04-19 11:29:37 +02:00
Thibaut Girka 3068384dbc Glitchsoc-specific changes to allow boosting own private toots 2018-04-19 11:24:29 +02:00
Thibaut Girka 779aa707ec 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 52229405ed [Glitch] Make detailed status' media gallery standalone 2018-04-19 11:16:18 +02:00
Thibaut Girka dcc1c10937 [Glitch] Center thumbnails on focus point 
Port the display part of the following commits to glitch-soc:
* 90f12f2e5a
* b170627ceb
* 11697d6894
* 56eb5c3f34
 2018-04-19 11:16:18 +02:00
Thibaut Girka f1e25b672a Use javascript to set MediaGallery height automatically 2018-04-19 11:16:18 +02:00
Thibaut Girka a95f8271be 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