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

4394 Commits (2ed804d4ca28434c32b641e7b3ea128536c6bc1d)

Author SHA1 Message Date
Thibaut Girka 2ed804d4ca 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 8be1573a6e Tentative fix for #446 2018-04-27 00:59:36 +02:00
beatrix cd9c602a0e 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 53c49a3f76 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 644916e33c 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 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
Una Thompson c3efd20a9c Fix fade being colored wrongly for DMs and upon focus 2018-04-24 11:34:17 -04: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
Thibaut Girka bc3be9ac5b [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 7315d4f3e7 [Glitch] Do not set emoji as inline-block 
Port 597948fb13 to glitch-soc
 2018-04-22 22:10:53 +02:00
Thibaut Girka deb6517638 [Glitch] Do not overwrite some status attributes in reducer 
Backport 59b769ff06
 2018-04-22 19:19:01 +02:00
Thibaut Girka 4e4a5fc1ad Add show more/less toggle for entire threads in web UI 
Inspired from b9b01bf14a but using component
properties instead of redux store for hidden/revealed state.
 2018-04-22 19:19:01 +02:00
Thibaut Girka 5ab80ffadd Refactor the infamous three-valued boolean into two booleans, trying to simplify the logic 2018-04-22 19:18:15 +02:00
Thibaut Girka 270d5e9b72 [Glitch] Fix style of legacy column headers 
Backports 6661ae14b0
 2018-04-22 19:17:10 +02:00
Thibaut Girka a51aa91caf [Glitch] Fix button hiding when header title is too long 
Port 95da1b3351 to glitch-soc
 2018-04-22 19:17:10 +02:00
Thibaut Girka 8c190e6235 [Glitch] Fix column headers accessibility 
Port c6d5ea8695 to glitch-soc.

SCSS fix inspired by 4cf5144099.
 2018-04-22 19:17:10 +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
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
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