mirror/YuruToot
1
0
Fork 0
mirror of https://github.com/funamitech/mastodon synced 2024-12-11 21:29:17 +09:00
Code
6,272 Commits 1 Branch 1 Tag 337 MiB
8f1ec48cbe
Commit Graph

6272 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
beatrix
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
beatrix
125e8c7f5a
Merge pull request #427 from ThibG/glitch-soc/fixes/scroll-behavior 
Improve ScrollableList behavior
 2018-04-22 12:09:52 -04:00
beatrix
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
beatrix
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
beatrix
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
beatrix
d7ae97c10a
Merge pull request #436 from unascribed/glitchsoc-pr-better-collapsed-statuses 
Add fade and margin to collapsed statuses
 2018-04-22 12:06:37 -04:00
Una Thompson
5f9b85a0cf Add fade and margin to collapsed statuses 2018-04-22 11:34:19 -04:00
Thibaut Girka
e4dff10934 Fix video player on toot public views 2018-04-20 16:08:46 +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
Jenkins
ed17e173d6 Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master 2018-04-19 22:17:23 +00: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
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
13fa8ec2c7 [Glitch] Fix status filtering in contexts reducer 
Port 1a37d7e252 to glitch-soc
 2018-04-19 16:43:02 +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
b9c35785e2 Reports: Merge contents and comment columns (#7189) 2018-04-19 15:39:54 +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
931a4d1ebf Clean up dead code 2018-04-19 11:30:42 +02:00
Thibaut Girka
8f8b71a278 Use React's new lifecycles for scrollable lists 2018-04-19 11:29:37 +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
52229405ed [Glitch] Make detailed status' media gallery standalone 2018-04-19 11:16:18 +02:00
Thibaut Girka
dcc1c10937 [Glitch] Center thumbnails on focus point 
Port the display part of the following commits to glitch-soc:
* 90f12f2e5a
* b170627ceb
* 11697d6894
* 56eb5c3f34
 2018-04-19 11:16:18 +02:00
Thibaut Girka
f1e25b672a Use javascript to set MediaGallery height automatically 2018-04-19 11:16:18 +02:00
Thibaut Girka
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
Thibaut Girka
1822ce89f9 [Glitch] retrieve custom emoji list via API instead of before page load 
Port b08ab329f4 to glitch-soc
 2018-04-19 11:12:52 +02:00
Jenkins
d55ab8e3e8 Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master 2018-04-19 01:17:38 +00:00
Eugen Rochko
ba917e15f6
Fix text color in "show more" link inside boost confirmation modal (#7183) 2018-04-19 02:36:31 +02:00
David Yip
d2b28ea51d
Merge remote-tracking branch 'glitchsoc/master' into gs-master 2018-04-18 19:31:53 -05:00
David Yip
78c145d3cb
db: make schema.rb version subsume bookmarks migration. 2018-04-18 19:08:35 -05:00
David Yip
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
Eugen Rochko
ff87d1bc3e
Rescue SSL errors when processing mentions, remove useless line (#7184) 2018-04-19 00:53:31 +02:00
Marcin Mikołajczak
1957209efd i18n: Update Polish translation (#7181) 
Signed-off-by: Marcin Mikołajczak <me@m4sk.in>
 2018-04-19 00:14:21 +09:00
Lynx Kotoura
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
abcang
0ba49eca8b Fix comparing id (#7180) 2018-04-18 16:50:19 +02:00
Marcin Mikołajczak
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
Kaito Sinclaire
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
luzi82
aedfea3554 zh-HK translation (#7177) 
* zh-HK translation

* zh-HK fix

* zh-HK translation

* add missing zh-HK translate

* fix translate

* i18n-tasks normalize
 2018-04-18 14:28:26 +09:00
Neil Moore
fad7b9f5f2 Adds keyboard hotkey for revealing/hiding statuses (#7173) 
Resolves #5550
 2018-04-18 03:33:59 +02:00
ThibG
e5dd385431 Allow boosting own private toots (#6157) 
* Adjust policy to allow boosting own private toots

* Add ability to reblog private toots from dropdown menu
 2018-04-17 23:35:45 +02:00
Sam Schlinkert
11715454d0 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
 2018-04-17 23:25:54 +02:00
abcang
897199910f Improve web api protect (#6343) 2018-04-17 15:23:46 +02:00
Emelia Smith
204d72fbe4 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.
 2018-04-17 14:58:11 +02:00
Jennifer Kruse
ef12a2b74c Able to deactivate invites if they aren't expired (#7163) 2018-04-17 13:52:08 +02:00
Eugen Rochko
07a7d5959c
Fix missing "Administered by" when timeline preview disabled (#7161) 2018-04-17 13:51:14 +02:00
Eugen Rochko
aab5581c43
Set Referrer-Policy to origin in web UI and public pages of private toots (#7162) 
Fix #7115
 2018-04-17 13:51:01 +02:00
Eugen Rochko
bb58fc003b
Fix warning about using SQL in order for Account#partitioned (#7159) 2018-04-17 13:50:48 +02:00
abcang
727917e91e Fix caret position after inserting emoji (#7167) 2018-04-17 13:50:33 +02:00
abcang
609bf93029 Perform processing that does not use the database before connecting to the database (#7168) 2018-04-17 13:49:09 +02:00
ThibG
21837b291e
Merge pull request #430 from ThibG/glitch-soc/features/bookmarks 
Fix the bookmark column pinning fix…
 2018-04-17 11:46:31 +02:00
Thibaut Girka
1aac83ef47 Fix the bookmark column pinning fix… 2018-04-17 11:24:07 +02:00
Remi Rampin
3c722fe687 Update French javascript locale file (#7165) 
Match config/locales/fr.yml: "private" was changed to "followers-only"
by 501514960a.
 2018-04-17 11:37:51 +09:00