660cb058e1
Improve relative timestamps in web UI ( #7233 )
...
Use short instead of numeric month, display year when different year
E.g.: "Apr 4" instead of "4/4", "Apr 4, 2017" if different year
2018-04-23 00:43:53 +02:00
05fb6f096d
Resize images before upload in web UI to reduce bandwidth ( #7223 )
...
* Resize images before upload in web UI to reduce bandwidth
Fix #7218
* Fix issues
* Do not resize GIFs in JS
2018-04-23 00:43:36 +02:00
003d114332
[Glitch] Fix the hot key (j, k) does not function correctly when there is a pinned toot in account timeline.
...
Port 23106844a1
2018-04-22 23:11:16 +02:00
105ffaef8f
[Glitch] Do not set emoji as inline-block
...
Port 597948fb13
2018-04-22 22:10:53 +02:00
b383c0688a
[Glitch] Do not overwrite some status attributes in reducer
...
Backport 386365090c
2018-04-22 19:19:01 +02:00
64d8d0464d
Add show more/less toggle for entire threads in web UI
...
Inspired from b6003afcdb
2018-04-22 19:19:01 +02:00
2888f74c12
Refactor the infamous three-valued boolean into two booleans, trying to simplify the logic
2018-04-22 19:18:15 +02:00
259bc9840b
[Glitch] Fix style of legacy column headers
...
Backports daefbd66a6
2018-04-22 19:17:10 +02:00
63d671b18f
[Glitch] Fix button hiding when header title is too long
...
Port ffb2b8ef8c
2018-04-22 19:17:10 +02:00
abf7c5b850
[Glitch] Fix column headers accessibility
...
Port 08e4c78e7869f13e7bca
2018-04-22 19:17:10 +02:00
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
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
125e8c7f5a
Merge pull request #427 from ThibG/glitch-soc/fixes/scroll-behavior
...
Improve ScrollableList behavior
2018-04-22 12:09:52 -04:00
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
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
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
5f9b85a0cf
Add fade and margin to collapsed statuses
2018-04-22 11:34:19 -04:00
3c5006ec7f
Fix text colors ( #7227 )
2018-04-22 14:29:40 +02:00
597948fb13
Do not set emoji as inline-block ( fixes #5743 ) ( #7207 )
2018-04-22 12:10:37 +02:00
a4a36d994b
Separate high contrast theme ( #7213 )
2018-04-21 21:35:55 +02:00
1a27f9f46f
one grammar fix ( #7212 )
2018-04-22 03:07:25 +09:00
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
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
e4dff10934
Fix video player on toot public views
2018-04-20 16:08:46 +02:00
7a68079b3f
[Glitch] Show media modal on public pages
...
Port ff7941e652
2018-04-20 15:58:36 +02:00
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
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
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
ed17e173d6
Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master
2018-04-19 22:17:23 +00:00
ca2cbe8f0f
Fix webkit scrollbars ( #7191 )
...
* Revert "Make scroll bars wider (#7060 )"
This reverts commit 11715454d0
2018-04-19 23:35:47 +02:00
13fa8ec2c7
[Glitch] Fix status filtering in contexts reducer
...
Port 1a37d7e252
2018-04-19 16:43:02 +02:00
f84b4d90cb
[Glitch] Do not filter the status collection after muting and blocking
...
Port fd87e5a53b
2018-04-19 16:42:27 +02:00
694337d9bb
Fix auto-collapsed toots making the TL jump ( fixes #417 )
2018-04-19 11:30:42 +02:00
931a4d1ebf
Clean up dead code
2018-04-19 11:30:42 +02:00
8f8b71a278
Use React's new lifecycles for scrollable lists
2018-04-19 11:29:37 +02:00
3068384dbc
Glitchsoc-specific changes to allow boosting own private toots
2018-04-19 11:24:29 +02:00
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
52229405ed
[Glitch] Make detailed status' media gallery standalone
2018-04-19 11:16:18 +02:00
dcc1c10937
[Glitch] Center thumbnails on focus point
...
Port the display part of the following commits to glitch-soc:
* 90f12f2e5ab170627ceb11697d689456eb5c3f34
2018-04-19 11:16:18 +02:00
f1e25b672a
Use javascript to set MediaGallery height automatically
2018-04-19 11:16:18 +02:00
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
1822ce89f9
[Glitch] retrieve custom emoji list via API instead of before page load
...
Port b08ab329f4
2018-04-19 11:12:52 +02:00
d55ab8e3e8
Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master
2018-04-19 01:17:38 +00:00
ba917e15f6
Fix text color in "show more" link inside boost confirmation modal ( #7183 )
2018-04-19 02:36:31 +02:00
d2b28ea51d
Merge remote-tracking branch 'glitchsoc/master' into gs-master
2018-04-18 19:31:53 -05:00
16d5217502
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
1957209efd
i18n: Update Polish translation ( #7181 )
...
Signed-off-by: Marcin Mikołajczak <me@m4sk.in >
2018-04-19 00:14:21 +09:00
74dae9458d
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
0ba49eca8b
Fix comparing id ( #7180 )
2018-04-18 16:50:19 +02:00
7162a28c34
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
