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

435 Commits

Author SHA1 Message Date
David Yip
f8d50a4070
Merge pull request #509 from ThibG/glitch-soc/fixes/router-history-navigation 
Use history.state to decide whether we should goBack() or go to / (fixes #247)
 2018-06-06 23:56:48 -05:00
David Yip
cfdbb36bdf
Merge pull request #519 from ThibG/glitch-soc/fixes/status-node-null 
Prevent a rare crash when a status' root node is undefined
 2018-06-02 16:19:06 -05:00
David Yip
9ad5de8a3a
Merge pull request #501 from ThibG/glitch-soc/features/red-bookmarks 
Make active bookmarks red (fixes #493)
 2018-06-01 00:36:48 -05:00
Spencer Alves
e5f25a73f2 Adjust spacing between status icons 2018-05-31 21:55:44 -07:00
Spencer Alves
7d2e6429c2 Merge branch 'glitch' into thread-icon 2018-05-31 21:33:16 -07:00
Thibaut Girka
b9fdeceb3c Make active bookmarks red (fixes #493) 2018-05-31 14:39:48 +02:00
Thibaut Girka
cc396f085d Use history.state to decide whether we should goBack() or go to / (fixes #247) 
So far, glitch-soc used history.length to decide whether to call `goBack()` or
go to / in order to not leave the webUI. This made clicking the “Back” button
go to the “Getting started” column instead of going back in the browser's
history when such an action would leave the web UI, but also when:
- The WebUI is refreshed (F5)
- A tab is restored
- The history length reaches its maximum (e.g., 50 in Firefox)

This commit fixes these shortcomings by checking `window.history.state`.
Indeed, we only want to go back in the browser's history when the current
location has been reached from within the WebUI, which only happens via
`pushState` as far as I know. Since browser store the serialized state in
the browser history, this also survives page reload and session restoration.
 2018-05-31 14:39:02 +02:00
Thibaut Girka
f86d280fd6 Use props.router instead of context.router, as we are using withRouter 2018-05-31 14:39:02 +02:00
Thibaut Girka
893f2aff20 Prevent a rare crash when a status' root node is undefined 2018-05-31 14:38:29 +02:00
Thibaut Girka
e396fbfe3b Fix direct timeline 2018-05-31 14:37:13 +02:00
Thibaut Girka
e7b3a4263e [Glitch] Fix low-contrasted cancel button of reply indicator 
Port 86efccce2a to glitch-soc
 2018-05-29 21:25:47 +02:00
Thibaut Girka
08dbe29e29 [Glitch] Improve load gap styling in web UI 
Port 45c9f16f71 to glitch-soc
 2018-05-29 21:25:28 +02:00
Thibaut Girka
cc589d6ec0 [Glitch] Use randomized setTimeout when fallback-polling and re-add since_id 
Port dafd7afc5e to glitch-soc
 2018-05-29 21:25:28 +02:00
Thibaut Girka
fbc25bdd2d [Glitch] Do not crash in getStatusIds when there is a gap in the timeline 
Port b1938d7853 to glitch-soc
 2018-05-29 21:25:28 +02:00
Thibaut Girka
5cc4d34250 [Glitch] Fix gap insertion for timeline disconnection 
Port 66359ec522 to glitch-soc
 2018-05-29 21:25:28 +02:00
Thibaut Girka
15bef77add [Glitch] Fix ID duplication in timelines 
Port 306267dbd2 to glitch-soc
 2018-05-29 21:25:28 +02:00
Thibaut Girka
4b38ac3bed [Glitch] Fix comparing id 
Port 0ba49eca8b to glitch-soc
 2018-05-29 21:25:28 +02:00
Thibaut Girka
6020a21130 [Glitch] Fix LoadMore on account media gallery 
Port 3523aa440b to glitch-soc
 2018-05-29 21:25:28 +02:00
Thibaut Girka
5d16fd3f28 [Glitch] Add missing null handling in notification reducer 
Port 2f3ac14a43 to glitch-soc
 2018-05-29 21:25:28 +02:00
Thibaut Girka
4eba8c50c3 [Glitch] Allow clients to fetch notifications made while they were offline 
Port cbf97c03bb to glitch-soc
 2018-05-29 21:25:28 +02:00
Thibaut Girka
0ad3eedd4c [Glitch] Allow clients to fetch statuses made while they were offline 
Port 9a1a55ce52 to glitch-soc
 2018-05-29 21:25:28 +02:00
Thibaut Girka
532fb8e215 Fix error when unmuting a domain without listing muted domains first 2018-05-29 16:26:39 +02:00
Thibaut Girka
8b98afa781 [Glitch] Replace onScrollToBottom with onLoadMore 
Port b0664a5e6c to glitch-soc
 2018-05-27 20:40:58 +02:00
Thibaut Girka
a81ed7b205 Do not needlessly refresh pinned toots 
Port missing part of 6ae70a92c9 to glitch-soc
 2018-05-27 20:40:58 +02:00
Thibaut Girka
60addb14ce [Glitch] Change icon for domain blocks 
Port fa04945365 to glitch-soc
 2018-05-27 20:40:58 +02:00
Thibaut Girka
b7508940b7 [Glitch] Add option to show only local toots in timeline preview 
Port missing changes from 4e4f1b0dcb to glitch-soc
 2018-05-27 20:39:25 +02:00
Thibaut Girka
1fa3586db5 [Glitch] Use streaming API for standalone timelines on /about and /tag pages 
Port 0128b86d30 to glitch-soc
 2018-05-27 20:39:25 +02:00
Thibaut Girka
d959d04133 Change direct message warning to match upstream 2018-05-27 15:46:00 +02:00
Thibaut Girka
c2e528916c Implement client-size image resizing from upstream 2018-05-27 11:02:54 +02:00
Thibaut Girka
d253449ff0 Port upstream's result section headers (fixes #366) 2018-05-27 11:02:44 +02:00
Thibaut Girka
18d9a7fd71 Fix caret position after inserting suggestions (fixes #281) 2018-05-26 12:17:03 +02:00
Thibaut Girka
d8793e1bee Remove unneeded code now that attachment URL isn't appended to toots 2018-05-26 12:17:03 +02:00
Thibaut Girka
4c91215e1f [Glitch] Use .star-icon instead of hardcoding color in detailed statuses 
Port 2587fcdd27 to glitch-soc
 2018-05-25 11:16:11 +02:00
ThibG
7719fe0df2
Merge pull request #505 from ThibG/glitch-soc/features/fetch-relationships-on-search 
[Glitch] Fetch relationships for search results in UI
 2018-05-23 18:54:51 +02:00
Thibaut Girka
0553496b76 Change notification cleaning checkbox color (fixes #511) 2018-05-23 18:29:15 +02:00
Thibaut Girka
247f55f673 [Glitch] Fetch relationships for search results in UI 
Port webui changes from cba2897108 to glitch-soc
 2018-05-22 13:05:40 +02:00
Thibaut Girka
d0b2f71501 Fix width only being set for standalone media 2018-05-21 18:25:41 +02:00
Thibaut Girka
3ad3cee44c [Glitch] Use real container width in MediaGallery srcSet 
Port 22e067bf5c to glitch-soc
 2018-05-21 17:55:07 +02:00
Thibaut Girka
463078dcc4 [Glitch] Do not override the default push notification settings 
Port 1951ff41b3 to glitch-soc
 2018-05-21 17:52:26 +02:00
Thibaut Girka
c53aacdfa0 Recover glitch-soc specific styles that were removed by accident 2018-05-21 15:56:47 +02:00
Thibaut Girka
d250e072a2 In footer, replace text "Mastodon" with logo 
Port SCSS changes from 93c66f0c03 to glitch-soc
 2018-05-20 11:29:06 +02:00
Thibaut Girka
9ed8051961 Add preference to hide following/followers lists 
Port SCSS from 1e02dc8715
 2018-05-20 11:28:58 +02:00
Thibaut Girka
50540446f5 [Glitch] Improvements to toots display in admin view 
Port SCSS changes from 0f2fbf7d05
(I'm sorry for the animated rainbows)
 2018-05-20 11:28:58 +02:00
Thibaut Girka
9d6788b30b Prevent click on video from opening detailed toot 2018-05-18 17:49:51 +02:00
Thibaut Girka
2154bd1b5a Widen clickable area of toots 2018-05-18 17:33:58 +02:00
David Yip
023dfa119e
Merge pull request #487 from ThibG/glitch-soc/cleanup 
Remove service worker code that has never been used
 2018-05-18 08:37:31 -05:00
David Yip
81e3ec4d61
Merge pull request #488 from ThibG/glitch-soc/features/accounts-custom-emoji 
[Glitch] Enable custom emojis in profiles
 2018-05-18 07:55:00 -05:00
Thibaut Girka
07baa1ddb5 [Glitch] Open video modal on public UI 
Port d9b2f84c92 to glitch-soc
 2018-05-17 18:37:00 +02:00
Thibaut Girka
94db024e4c [Glitch] Combine similar components into one on public UI 
Port f9afd06221 to glitch-soc
 2018-05-17 18:37:00 +02:00
Thibaut Girka
dd1d98f9cf [Glitch] Show card modal on public pages 
Port 16fee0335f to glitch-soc
 2018-05-17 18:37:00 +02:00
Thibaut Girka
52b2f18b15 [Glitch] Enable custom emojis in profiles 
Port 61a9018607 to glitch-soc
 2018-05-17 15:57:16 +02:00
Thibaut Girka
ca49ad86c6 Remove service worker code that has never been used 2018-05-17 15:39:37 +02:00
ThibG
80aad16e10
Merge pull request #405 from ThibG/glitch-soc/features/dm-from-menu 
[Glitch] Feature: Direct message from menu
 2018-05-16 20:17:08 +02:00
ThibG
9712d59dda
Merge pull request #485 from ThibG/glitch-soc/fixes/light-theme-textarea-color 
Fix mastodon-light background color of the composer textarea when posting
 2018-05-16 20:16:59 +02:00
Thibaut Girka
784712791d [Glitch] Reword the direct message warning 
Port 53c2164e9c to glitch-soc
 2018-05-16 19:45:30 +02:00
Thibaut Girka
97c69de416 [Glitch] Feature: Direct message from Statuses 
Port 904a2479dd to glitch-soc
 2018-05-16 19:45:30 +02:00
Thibaut Girka
fb6de5310d [Glitch] Fix issues with sending direct messages from user profile 
Port 4fd71accd4 to glitch-soc
 2018-05-16 19:45:30 +02:00
Thibaut Girka
a5fac975f3 [Glitch] Feature: Direct message from menu 
Port d1f34151ae to glitch-soc
 2018-05-16 19:45:30 +02:00
Thibaut Girka
eb9c9855ce Fix mastodon-light background color of the composer textarea when posting 2018-05-16 19:37:44 +02:00
Thibaut Girka
dfa60cb0a8 Fix modals testing for props.noEsc (fixes #482) 2018-05-15 10:39:12 +02:00
Thibaut Girka
971218d1dc Change local settings SCSS to be more consistent with modals 2018-05-14 21:39:04 +02:00
beatrix
4665965543
Merge pull request #469 from ThibG/glitch-soc/features/glitch-light-theme 
Port Sylvhem's mastodon-light to glitch flavour
 2018-05-13 18:57:58 -04:00
ThibG
bd4decb7db
Merge pull request #479 from ThibG/glitch-soc/fixes/modal-root-keyup 
Fix root modal's keyup handling (Fixes #478)
 2018-05-11 23:04:12 +02:00
Thibaut Girka
769a48495c Fix root modal's keyup handling (Fixes #478) 2018-05-11 22:42:32 +02:00
ThibG
e7ed61917b
Merge pull request #475 from ThibG/fixes/update-scss 
Update SCSS from upstream
 2018-05-11 16:51:14 +02:00
Thibaut Girka
6284039832 [Glitch] Fix contact info styling on landing page 2018-05-11 16:05:47 +02:00
Thibaut Girka
f2e5ed6841 Update SCSS for tables 2018-05-11 14:48:19 +02:00
Thibaut Girka
8860f14ef0 Update SCSS for statuses public view 2018-05-11 14:43:26 +02:00
Thibaut Girka
4a1040c4cb [Glitch] Adjust RTL styles for landing page 
Port 8bf3e750ab to glitch-soc
 2018-05-11 14:34:23 +02:00
Thibaut Girka
e8644f3a4b Update forms SCSS from upstream 2018-05-11 14:31:18 +02:00
Thibaut Girka
4cd65fe074 Update SCSS to match “Show card modal on public pages” 2018-05-11 14:20:46 +02:00
Thibaut Girka
1a4d735b1d Update SCSS for about/landing page 2018-05-11 14:18:52 +02:00
Thibaut Girka
db73c0bc5d Update admin page SCSS from upstream 2018-05-11 14:13:59 +02:00
Thibaut Girka
f6ec8c4821 [Glitch] Use plaintext value for field value tooltips in web UI 
Port d185f3ddaf to glitch-soc

This doesn't change anything for glitch-style fields, but those will go
away eventually
 2018-05-10 14:11:23 +02:00
Thibaut Girka
5d8052e715 Add bot badge to account headers in the WebUI 2018-05-10 00:05:08 +02:00
Thibaut Girka
2f01935cba Adapt account fields rendering code in the WebUI to match upstream 2018-05-10 00:03:34 +02:00
Thibaut Girka
30bb530c70 Update glitch-soc style to match new bio fields markup 2018-05-10 00:03:34 +02:00
Spencer Alves
f2ff167c1a Add an extra icon to indicate that a status is part of a conversation 2018-05-07 22:10:34 -07:00
Thibaut Girka
8f3402b1f0 Port Sylvhem's mastodon-light to glitch flavour 2018-05-07 17:00:02 +02:00
beatrix
919e2098cb
Merge pull request #468 from ThibG/glitch-soc/features/reports-improvements 
Various improvements to the reports modal
 2018-05-07 09:45:13 -04:00
Thibaut Girka
658ac4396c Hide media in report modal regardless of whether they are marked sensitive 
The rationale behind this is that if the user wants to report violent media,
they might not want to see it repeatedly. The “sensitive” property is still
kept, displaying different messages for hidden media depending on whether
they are marked as sensitive.
 2018-05-07 15:00:55 +02:00
Thibaut Girka
6b94237810 [Glitch] Allow report modal to be up to 80% of viewport height 
Port bddb330a8a08b7459c299fb56ae8770c3ac69af5 to glitch-soc
 2018-05-07 14:59:22 +02:00
Thibaut Girka
7972464e71 [Glitch] Also display replies in report modal 
Port c88e12fca622c46a361a5c751a529e77aa5bf2ba to glitch-soc
 2018-05-07 14:55:16 +02:00
Thibaut Girka
ffdb85f859 Fix color of disabled boost buttons (fixes #466) 2018-05-07 13:37:29 +02:00
David Yip
2e25da4da0
Merge pull request #465 from ThibG/glitch-soc/rollback-scroll-changes 
Glitch soc/rollback scroll changes
 2018-05-06 17:39:07 -05:00
Thibaut Girka
de7feea30e Revert "[Glitch] Prevent timeline from moving when cursor is hovering over it" 
This reverts commit 553cc28240.
 2018-05-06 21:50:33 +02:00
Thibaut Girka
4133f70902 Revert "[Glitch] Do not re-position scroll when loading more (inserting items from below)" 
This reverts commit 32974a58dc.
 2018-05-06 21:50:26 +02:00
Thibaut Girka
1adca9b040 Fix glitch high-contrast skin text colors 
Port from 3c5006ec7f
 2018-05-06 21:00:35 +02:00
beatrix
331190e5fb
Merge pull request #462 from ThibG/glitch-soc/features/dropdowns-accessibility 
Improve accessibility of toot dropdown menu
 2018-05-06 12:12:20 -04:00
beatrix
92f192e9b1
Merge pull request #461 from ThibG/glitch-soc/fixes/emoji-picker-placement 
[Glitch] Place emoji picker top if it is closer to the bottom of the viewport
 2018-05-06 11:33:09 -04:00
beatrix
4480cd745f
Merge pull request #460 from ThibG/glitch-soc/features/do-not-scroll-when-mouse-over 
Prevent timeline from moving when cursor is hovering over it
 2018-05-06 11:32:56 -04:00
beatrix
06770656eb
Merge pull request #459 from ThibG/glitch-soc/features/text-color-variables 
Add text color variables + minor SCSS fixes + high contrast skin
 2018-05-06 11:32:42 -04:00
beatrix
35a1a3171f
Merge pull request #449 from ThibG/glitch-soc/features/upstream-account-items 
Support upstream bio items / custom account fields
 2018-05-06 11:32:05 -04:00
Thibaut Girka
65349bc155 Fix color of status icons in glitch-soc high contrast skin 2018-05-06 11:31:05 +02:00
Thibaut Girka
2d065ceaf6 minor fix 2018-05-05 22:38:15 +02:00
Thibaut Girka
f7a076eded [Glitch] Add high-contrast theme 2018-05-05 22:33:02 +02:00
Thibaut Girka
caebf69e77 Move attachment-lists out of lists.scss 2018-05-05 22:33:02 +02:00
Thibaut Girka
bd3b9bf7b9 [Glitch] Fix text color in "show more" link inside boost confirmation modal 
Port ba917e15f6 to glitch-soc
 2018-05-05 22:33:02 +02:00
Thibaut Girka
983328376b Fix link colors in report modal 2018-05-05 22:33:02 +02:00
Thibaut Girka
b3a236637e [Glitch] Add color variables of texts for better accesibility 
Port 74dae9458d and related to glitch-soc
 2018-05-05 22:33:02 +02:00