me/glitchier-soc
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity
39694 commits 2 branches 0 tags 429 MiB
Commit graph

39694 commits

This branch
This branch
All branches
Author SHA1 Message Date
goofy-bz
1a27f9f46f one grammar fix (#7212) 2018-04-22 03:07:25 +09:00
Yamagishi Kazutoshi
0d4342e146 Introduce rspec-retry (#7206) 2018-04-20 19:31:30 +02:00
Yamagishi Kazutoshi
b438224751 Introduce rspec-retry (#7206) 2018-04-20 19:31:30 +02:00
unarist
456fff2bba Ignore keyevents during text composition (#7205) 
KeyboardEvent.key may be physical key name (Escape, Tab, etc.)
even in text composition and it causes hotkeys or suggestion selection.
So we need to check e.which or e.isComposing.

Checking e.which also allows us to avoid Esc key on compositionend in Safari.
 2018-04-20 18:36:52 +02:00
unarist
84214b864c Ignore keyevents during text composition (#7205) 
KeyboardEvent.key may be physical key name (Escape, Tab, etc.)
even in text composition and it causes hotkeys or suggestion selection.
So we need to check e.which or e.isComposing.

Checking e.which also allows us to avoid Esc key on compositionend in Safari.
 2018-04-20 18:36:52 +02:00
Yamagishi Kazutoshi
0939d9ede6 Fix spec for sr-Latn (#7203) 2018-04-20 18:14:31 +02:00
Yamagishi Kazutoshi
87e3f0a41d Fix spec for sr-Latn (#7203) 2018-04-20 18:14:31 +02:00
TakesxiSximada
937c93e8d9 Fix the hot key (j, k) does not function correctly when there is a pinned toot in account timeline. (#7202) 
* Fix the hot key (j, k) does not function correctly when there is a pinned toot in account timeline.

* Fix typo

* Add custom attribute prefix
 2018-04-20 18:14:21 +02:00
TakesxiSximada
23106844a1 Fix the hot key (j, k) does not function correctly when there is a pinned toot in account timeline. (#7202) 
* Fix the hot key (j, k) does not function correctly when there is a pinned toot in account timeline.

* Fix typo

* Add custom attribute prefix
 2018-04-20 18:14:21 +02:00
Thibaut Girka
e4b0a92c0f Fix video player on toot public views 2018-04-20 16:08:46 +02:00
Thibaut Girka
e4dff10934 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
Thibaut Girka
7a68079b3f [Glitch] Show media modal on public pages 
Port ff7941e652 to glitch-soc
 2018-04-20 15:58:36 +02:00
mayaeh
1b881b585d Fix #6157: boosting own private toots (#7200) 
* Fix boosting own private toots.

* Run yarn manage:translations and update Japanese translations.
 2018-04-20 14:58:33 +02:00
mayaeh
ee2e0f694a Fix #6157: boosting own private toots (#7200) 
* Fix boosting own private toots.

* Run yarn manage:translations and update Japanese translations.
 2018-04-20 14:58:33 +02:00
unarist
42d7307565 Fix Esc hotkey behavior (#7199) 
This fixes following cases which causes hotkey action accidentally:

* hitting Esc key to cancel text composition (mostly in CJK)

  Although events on cancelling composition are still heavily
  browser / input method dependent, but this implementation would
  covers current UI Events spec and some exceptions.

* hitting Esc key to close autocomplete suggestions

This PR changes to use keydown event instead of keyup event as well as other hotkeys.
 2018-04-20 14:04:16 +02:00
unarist
4e35ce8269 Fix Esc hotkey behavior (#7199) 
This fixes following cases which causes hotkey action accidentally:

* hitting Esc key to cancel text composition (mostly in CJK)

  Although events on cancelling composition are still heavily
  browser / input method dependent, but this implementation would
  covers current UI Events spec and some exceptions.

* hitting Esc key to close autocomplete suggestions

This PR changes to use keydown event instead of keyup event as well as other hotkeys.
 2018-04-20 14:04:16 +02:00
Yamagishi Kazutoshi
efa4eb4d13 Replace Travis to CircleCI (#7196) 2018-04-20 13:46:08 +02:00
Yamagishi Kazutoshi
6f63cbb53c Replace Travis to CircleCI (#7196) 2018-04-20 13:46:08 +02:00
Yamagishi Kazutoshi
3aee1034e5 Add extract_foreign_key_action to Mastodon::MigrationHelpers (#7195) 2018-04-20 12:21:28 +02:00
Yamagishi Kazutoshi
084cf0babf Add extract_foreign_key_action to Mastodon::MigrationHelpers (#7195) 2018-04-20 12:21:28 +02:00
Eugen Rochko
354a6e4026 Improve report layout (#7188) 
* Use table for statuses in report

* Display reported account and reporter in the same table

* Split accounts and general report info into two tables again

* Redesign report statuses table, notes, merge notes and action log

* Remove unused translations

* Fix code style issue

* Fix code style issue

* Fix code style issue
 2018-04-20 02:28:48 +02:00
Eugen Rochko
a9c440637c
Improve report layout (#7188) 
* Use table for statuses in report

* Display reported account and reporter in the same table

* Split accounts and general report info into two tables again

* Redesign report statuses table, notes, merge notes and action log

* Remove unused translations

* Fix code style issue

* Fix code style issue

* Fix code style issue
 2018-04-20 02:28:48 +02:00
Yamagishi Kazutoshi
7a8c526709 Replace preload link tag to Rails helper (#7192) 2018-04-20 02:06:53 +02:00
Yamagishi Kazutoshi
1663368724 Replace preload link tag to Rails helper (#7192) 2018-04-20 02:06:53 +02:00
Jenkins
c9265e97cc Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master 2018-04-19 22:17:23 +00:00
Jenkins
ed17e173d6 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
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
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
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
f15ee5fdb9 [Glitch] Fix status filtering in contexts reducer 
Port 899cca061b to glitch-soc
 2018-04-19 16:43:02 +02: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
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
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
185407d3a2 Reports: Merge contents and comment columns (#7189) 2018-04-19 15:39:54 +02:00
Emelia Smith
b9c35785e2 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
694337d9bb 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
931a4d1ebf 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
8f8b71a278 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
3068384dbc 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
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
46b36c44ce [Glitch] Make detailed status' media gallery standalone 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
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