597948fb13
Do not set emoji as inline-block ( fixes #5743 ) ( #7207 )
2018-04-22 12:10:37 +02:00
ca9192d9ba
Ability to specify Redis passwd on mastodon:setup ( #7222 )
...
Closes #7221
2018-04-22 11:49:16 +02:00
648d645c2f
Fix randomly fail (similar #7219 ) ( #7225 )
2018-04-22 11:41:39 +02:00
3fa3161472
Fix: Use "welches" instead of "dass" in translation ( #7185 )
2018-04-22 12:28:12 +09:00
3f6893c641
Reset locale on registration tests ( #7219 )
2018-04-21 23:37:07 +02:00
9b8bb2a5df
Replace badge to CircleCI ( #7216 )
2018-04-21 21:56:40 +02:00
b8f0cfd6e3
Add parallel test processors ( #7215 )
2018-04-21 21:36:22 +02:00
a4a36d994b
Separate high contrast theme ( #7213 )
2018-04-21 21:35:55 +02:00
d10447c3a8
Use raw status code on have_http_status ( #7214 )
2018-04-21 21:35:07 +02:00
bfe26ef67b
Force convert to JPG for preview card thumbnails to avoid animations ( #7109 )
...
* Force convert to JPG for preview card thumbnails to avoid animations
Fix #7093
* Conditionally convert to JPG only if original is GIF
Coalesce and strip on all formats to ensure no animated APNGs
2018-04-21 21:34:36 +02:00
1a27f9f46f
one grammar fix ( #7212 )
2018-04-22 03:07:25 +09:00
b438224751
Introduce rspec-retry ( #7206 )
2018-04-20 19:31:30 +02: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
87e3f0a41d
Fix spec for sr-Latn ( #7203 )
2018-04-20 18:14:31 +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
6f63cbb53c
Replace Travis to CircleCI ( #7196 )
2018-04-20 13:46:08 +02:00
084cf0babf
Add extract_foreign_key_action to Mastodon::MigrationHelpers ( #7195 )
2018-04-20 12:21:28 +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
1663368724
Replace preload link tag to Rails helper ( #7192 )
2018-04-20 02:06:53 +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
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
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
b9c35785e2
Reports: Merge contents and comment columns ( #7189 )
2018-04-19 15:39:54 +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
78c145d3cb
db: make schema.rb version subsume bookmarks migration.
2018-04-18 19:08:35 -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
ff87d1bc3e
Rescue SSL errors when processing mentions, remove useless line ( #7184 )
2018-04-19 00:53:31 +02: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
156b916caf
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
