beatrix
64f74da493
Merge pull request #432 from ThibG/glitch-soc/features/reblog-private
...
Glitchsoc-specific changes to allow boosting own private toots
7 years ago
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
7 years ago
beatrix
69710cf17b
Merge pull request #427 from ThibG/glitch-soc/fixes/scroll-behavior
...
Improve ScrollableList behavior
7 years ago
beatrix
d53630b9ed
Merge pull request #434 from ThibG/glitch-soc/fixes/public-inline-video
...
Fix video player on toot public views
7 years ago
beatrix
2273eb43e7
Merge pull request #433 from ThibG/glitch-soc/fixes/status-filtering
...
Status filtering fixes from upstream
7 years ago
beatrix
1b58c44557
Merge pull request #435 from ThibG/glitch-soc/features/public-modals
...
[Glitch] Show media modal on public pages
7 years ago
beatrix
dd13a0461b
Merge pull request #436 from unascribed/glitchsoc-pr-better-collapsed-statuses
...
Add fade and margin to collapsed statuses
7 years ago
Una Thompson
880db71121
Add fade and margin to collapsed statuses
7 years ago
Thibaut Girka
e4b0a92c0f
Fix video player on toot public views
7 years ago
Thibaut Girka
d6693f3ae3
[Glitch] Show media modal on public pages
...
Port 47d2277ef1
to glitch-soc
7 years ago
Jenkins
c9265e97cc
Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master
7 years ago
beatrix
172ce95cd4
Fix webkit scrollbars ( #7191 )
...
* Revert "Make scroll bars wider (#7060 )"
This reverts commit c0ad48c683
.
* for real make webkit scrollbar wider
7 years ago
David Yip
589974dd9f
Merge pull request #426 from ThibG/glitch-soc/features/display-focal-points
...
Honor focal points when displaying media
7 years ago
Thibaut Girka
f15ee5fdb9
[Glitch] Fix status filtering in contexts reducer
...
Port 899cca061b
to glitch-soc
7 years ago
Thibaut Girka
f7ec78e220
[Glitch] Do not filter the status collection after muting and blocking
...
Port ce0d30feb7
to glitch-soc
7 years ago
Emelia Smith
185407d3a2
Reports: Merge contents and comment columns ( #7189 )
7 years ago
Thibaut Girka
74bfb1e579
Fix auto-collapsed toots making the TL jump ( fixes #417 )
7 years ago
Thibaut Girka
f63da992fc
Clean up dead code
7 years ago
Thibaut Girka
fe20ada59a
Use React's new lifecycles for scrollable lists
7 years ago
Thibaut Girka
f83dc9507f
Glitchsoc-specific changes to allow boosting own private toots
7 years ago
Thibaut Girka
9b72f23fdd
Only compute height dynamically for standalone media
...
This prevents changing the status' height and triggering jumps in the TL
7 years ago
Thibaut Girka
46b36c44ce
[Glitch] Make detailed status' media gallery standalone
7 years ago
Thibaut Girka
e0bffe8856
[Glitch] Center thumbnails on focus point
...
Port the display part of the following commits to glitch-soc:
* 865c7e7178
* 62d18a3f9b
* 15ec9431be
* c1d44284ca
7 years ago
Thibaut Girka
c4209e12f6
Use javascript to set MediaGallery height automatically
7 years ago
Thibaut Girka
b283f463c9
Revert some glitch-specific refactoring
...
In order to keep my sanity when porting changes between glitch-soc and upstream.
7 years ago
Thibaut Girka
5cd64fd6c6
[Glitch] retrieve custom emoji list via API instead of before page load
...
Port f3db0d6ecc
to glitch-soc
7 years ago
Jenkins
a359d69b09
Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master
7 years ago
Eugen Rochko
b5d0bf338c
Fix text color in "show more" link inside boost confirmation modal ( #7183 )
7 years ago
David Yip
337662fa0c
Merge remote-tracking branch 'glitchsoc/master' into gs-master
7 years ago
David Yip
48f5f736a0
db: make schema.rb version subsume bookmarks migration.
7 years ago
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
7 years ago
Eugen Rochko
7cba58aeaf
Rescue SSL errors when processing mentions, remove useless line ( #7184 )
7 years ago
Marcin Mikołajczak
7bca0f1cda
i18n: Update Polish translation ( #7181 )
...
Signed-off-by: Marcin Mikołajczak <me@m4sk.in>
7 years ago
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
7 years ago
abcang
9dff61a5ba
Fix comparing id ( #7180 )
7 years ago
Marcin Mikołajczak
8564d2767f
Add revealing/hiding statuses button to keyboard shortcuts legend column ( #7178 )
...
Signed-off-by: Marcin Mikołajczak <me@m4sk.in>
7 years ago
Kaito Sinclaire
447741e456
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
7 years ago
luzi82
9b80aede7a
zh-HK translation ( #7177 )
...
* zh-HK translation
* zh-HK fix
* zh-HK translation
* add missing zh-HK translate
* fix translate
* i18n-tasks normalize
7 years ago
Neil Moore
e0853e52d8
Adds keyboard hotkey for revealing/hiding statuses ( #7173 )
...
Resolves #5550
7 years ago
ThibG
8cd19d3eec
Allow boosting own private toots ( #6157 )
...
* Adjust policy to allow boosting own private toots
* Add ability to reblog private toots from dropdown menu
7 years ago
Sam Schlinkert
c0ad48c683
Make scroll bars wider ( #7060 )
...
* Set scrollbars to 12 px wide rather than 8px
Should overwrite the setting in reset.scss. This is untested at this point.
* removes scrollbar height and width specifications from reset.scss and basics.scss
7 years ago
abcang
5384e1e913
Improve web api protect ( #6343 )
7 years ago
Emelia Smith
0f9c6407e9
Feature: add count of account notes to reports ( #7130 )
...
* Reports: Colocate account details with reports
* Reports: Add count of account moderation notes
Sometimes an account will be left with a note instead of the report, this adds a way to quickly see from a given report if this is the case.
7 years ago
Jennifer Kruse
7f6823b149
Able to deactivate invites if they aren't expired ( #7163 )
7 years ago
Eugen Rochko
0cdf4567c7
Fix missing "Administered by" when timeline preview disabled ( #7161 )
7 years ago
Eugen Rochko
6e051e9c55
Set Referrer-Policy to origin in web UI and public pages of private toots ( #7162 )
...
Fix #7115
7 years ago
Eugen Rochko
4f460eba18
Fix warning about using SQL in order for Account#partitioned ( #7159 )
7 years ago
abcang
e6138441b7
Fix caret position after inserting emoji ( #7167 )
7 years ago
abcang
ebc8475572
Perform processing that does not use the database before connecting to the database ( #7168 )
7 years ago
ThibG
ccb708e614
Merge pull request #430 from ThibG/glitch-soc/features/bookmarks
...
Fix the bookmark column pinning fix…
7 years ago