Commit Graph

441 Commits (1159490f00f5f370d8e19505518f03afce805011)

Author SHA1 Message Date
Thibaut Girka c60f97f116 [Glitch] Preserve newlines in delete & redraft and desktop notifications
Port 5d419119de to glitch-soc
2018-06-16 15:09:28 +02:00
Thibaut Girka d8c35a6b85 [Glitch] Add redraft function
Port 16173535d9 to glitch-soc
2018-06-16 15:09:28 +02:00
Thibaut Girka 31091836e9 [Glitch] Add vendor prefix for background-clip
Port 963b82f5e5 to glitch-soc
2018-06-15 22:14:48 +02:00
David Yip c3202b66f2 Port bf508b9f74 to glitch emoji picker.
Fixes #541.
2018-06-15 22:10:50 +02:00
David Yip 4cc75efb7b Port emojimart 2.6.1 changes to glitch flavour
See also the following commits:

- ae0b751a30
- 2e4a1d3109
2018-06-12 17:43:50 -05:00
Thibaut Girka 5af047df32 Delete references to removed constants (fixes #537) 2018-06-09 18:14:23 +02:00
David Yip 4b7ceed3f0 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 1a0491b3cf 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 c10df6cf00 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 559ce5c098 Adjust spacing between status icons 2018-05-31 21:55:44 -07:00
Spencer Alves c86cd2041d Merge branch 'glitch' into thread-icon 2018-05-31 21:33:16 -07:00
Thibaut Girka 93e6984be8 Make active bookmarks red (fixes #493) 2018-05-31 14:39:48 +02:00
Thibaut Girka 37dc96b71b 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 fa980f2c95 Use props.router instead of context.router, as we are using withRouter 2018-05-31 14:39:02 +02:00
Thibaut Girka 0174ca8679 Prevent a rare crash when a status' root node is undefined 2018-05-31 14:38:29 +02:00
Thibaut Girka 663c9dcf36 Fix direct timeline 2018-05-31 14:37:13 +02:00
Thibaut Girka 06a6f1759e [Glitch] Fix low-contrasted cancel button of reply indicator
Port 63f6da9a9d to glitch-soc
2018-05-29 21:25:47 +02:00
Thibaut Girka febaae28f4 [Glitch] Improve load gap styling in web UI
Port 93a1afb66c to glitch-soc
2018-05-29 21:25:28 +02:00
Thibaut Girka 14961cc8ee [Glitch] Use randomized setTimeout when fallback-polling and re-add since_id
Port 4b5cde3f2d to glitch-soc
2018-05-29 21:25:28 +02:00
Thibaut Girka 44e534c1a5 [Glitch] Do not crash in getStatusIds when there is a gap in the timeline
Port 8ccc863ae8 to glitch-soc
2018-05-29 21:25:28 +02:00
Thibaut Girka d73c0e14b0 [Glitch] Fix gap insertion for timeline disconnection
Port 575c5753e4 to glitch-soc
2018-05-29 21:25:28 +02:00
Thibaut Girka d7aac92316 [Glitch] Fix ID duplication in timelines
Port 33a8c3ab6c to glitch-soc
2018-05-29 21:25:28 +02:00
Thibaut Girka 27cf820859 [Glitch] Fix comparing id
Port 9dff61a5ba to glitch-soc
2018-05-29 21:25:28 +02:00
Thibaut Girka 54c32199af [Glitch] Fix LoadMore on account media gallery
Port 2111defbbf to glitch-soc
2018-05-29 21:25:28 +02:00
Thibaut Girka f4a929a74a [Glitch] Add missing null handling in notification reducer
Port 9487e8a4c0 to glitch-soc
2018-05-29 21:25:28 +02:00
Thibaut Girka 7096611df6 [Glitch] Allow clients to fetch notifications made while they were offline
Port 9eaa47845c to glitch-soc
2018-05-29 21:25:28 +02:00
Thibaut Girka 7a953db0b6 [Glitch] Allow clients to fetch statuses made while they were offline
Port 34cb1a5461 to glitch-soc
2018-05-29 21:25:28 +02:00
Thibaut Girka 6a0f32b359 Fix error when unmuting a domain without listing muted domains first 2018-05-29 16:26:39 +02:00
Thibaut Girka 5ad747727f [Glitch] Replace onScrollToBottom with onLoadMore
Port 01d10b0bd8 to glitch-soc
2018-05-27 20:40:58 +02:00
Thibaut Girka c7e5a0af57 Do not needlessly refresh pinned toots
Port missing part of b29feb5c67 to glitch-soc
2018-05-27 20:40:58 +02:00
Thibaut Girka 4f2bf28a86 [Glitch] Change icon for domain blocks
Port 3774cbce91 to glitch-soc
2018-05-27 20:40:58 +02:00
Thibaut Girka 89f4e0298c [Glitch] Add option to show only local toots in timeline preview
Port missing changes from 6528c0c101 to glitch-soc
2018-05-27 20:39:25 +02:00
Thibaut Girka b2a316bc16 [Glitch] Use streaming API for standalone timelines on /about and /tag pages
Port 895e3c2e6c to glitch-soc
2018-05-27 20:39:25 +02:00
Thibaut Girka 2a78acb354 Change direct message warning to match upstream 2018-05-27 15:46:00 +02:00
Thibaut Girka 185bc62a15 Implement client-size image resizing from upstream 2018-05-27 11:02:54 +02:00
Thibaut Girka dc67caa371 Port upstream's result section headers (fixes #366) 2018-05-27 11:02:44 +02:00
Thibaut Girka f9a8240394 Fix caret position after inserting suggestions (fixes #281) 2018-05-26 12:17:03 +02:00
Thibaut Girka 2e017e752f Remove unneeded code now that attachment URL isn't appended to toots 2018-05-26 12:17:03 +02:00
Thibaut Girka 2b26e7ed5f [Glitch] Use .star-icon instead of hardcoding color in detailed statuses
Port 6d50785928 to glitch-soc
2018-05-25 11:16:11 +02:00
ThibG e2697a3657 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 bdfce657fb Change notification cleaning checkbox color (fixes #511) 2018-05-23 18:29:15 +02:00
Thibaut Girka cdb1d08119 [Glitch] Fetch relationships for search results in UI
Port webui changes from 750f3e64c9 to glitch-soc
2018-05-22 13:05:40 +02:00
Thibaut Girka 3315877afe Fix width only being set for standalone media 2018-05-21 18:25:41 +02:00
Thibaut Girka df3fa2cb78 [Glitch] Use real container width in MediaGallery srcSet
Port 765a8dad9a to glitch-soc
2018-05-21 17:55:07 +02:00
Thibaut Girka 4e5afb1c41 [Glitch] Do not override the default push notification settings
Port 6bee19117f to glitch-soc
2018-05-21 17:52:26 +02:00
Thibaut Girka cabd24ffc4 Recover glitch-soc specific styles that were removed by accident 2018-05-21 15:56:47 +02:00
Thibaut Girka 8a42e4c450 In footer, replace text "Mastodon" with logo
Port SCSS changes from 95385ebe3e to glitch-soc
2018-05-20 11:29:06 +02:00
Thibaut Girka 99fccdb4e4 Add preference to hide following/followers lists
Port SCSS from aeceb63275
2018-05-20 11:28:58 +02:00
Thibaut Girka 6452d871ca [Glitch] Improvements to toots display in admin view
Port SCSS changes from 4072475241
(I'm sorry for the animated rainbows)
2018-05-20 11:28:58 +02:00
Thibaut Girka 72c5d3dd80 Prevent click on video from opening detailed toot 2018-05-18 17:49:51 +02:00
Thibaut Girka b6133837ad Widen clickable area of toots 2018-05-18 17:33:58 +02:00
David Yip d6aa91f87d 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 7deaadb048 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 4c835854d6 [Glitch] Open video modal on public UI
Port efc482361b to glitch-soc
2018-05-17 18:37:00 +02:00
Thibaut Girka 1ea94fdaee [Glitch] Combine similar components into one on public UI
Port fa7cdbeb67 to glitch-soc
2018-05-17 18:37:00 +02:00
Thibaut Girka ef620dfadd [Glitch] Show card modal on public pages
Port d006271514 to glitch-soc
2018-05-17 18:37:00 +02:00
Thibaut Girka f4a64b8091 [Glitch] Enable custom emojis in profiles
Port 4055ce490c to glitch-soc
2018-05-17 15:57:16 +02:00
Thibaut Girka 717e7d8872 Remove service worker code that has never been used 2018-05-17 15:39:37 +02:00
ThibG d3117e444d 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 ec8a7b4164 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 04eeaa0fa4 [Glitch] Reword the direct message warning
Port 53c2164e9c to glitch-soc
2018-05-16 19:45:30 +02:00
Thibaut Girka c77a4d8c51 [Glitch] Feature: Direct message from Statuses
Port 7a06bd7085 to glitch-soc
2018-05-16 19:45:30 +02:00
Thibaut Girka a8d5a4a74e [Glitch] Fix issues with sending direct messages from user profile
Port 4be5383b91 to glitch-soc
2018-05-16 19:45:30 +02:00
Thibaut Girka c5d2dcb562 [Glitch] Feature: Direct message from menu
Port df62fc20bf to glitch-soc
2018-05-16 19:45:30 +02:00
Thibaut Girka 8567ffd27d Fix mastodon-light background color of the composer textarea when posting 2018-05-16 19:37:44 +02:00
Thibaut Girka f7b9911f71 Fix modals testing for props.noEsc (fixes #482) 2018-05-15 10:39:12 +02:00
Thibaut Girka 873f33d9ff Change local settings SCSS to be more consistent with modals 2018-05-14 21:39:04 +02:00
beatrix b221cc1707 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 53c6402bd6 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 336d5fecdb Fix root modal's keyup handling (Fixes #478) 2018-05-11 22:42:32 +02:00
ThibG 692681241f Merge pull request #475 from ThibG/fixes/update-scss
Update SCSS from upstream
2018-05-11 16:51:14 +02:00
Thibaut Girka eafdb65af9 [Glitch] Fix contact info styling on landing page 2018-05-11 16:05:47 +02:00
Thibaut Girka 951dee676d Update SCSS for tables 2018-05-11 14:48:19 +02:00
Thibaut Girka fe36fabef1 Update SCSS for statuses public view 2018-05-11 14:43:26 +02:00
Thibaut Girka 944bac0b41 [Glitch] Adjust RTL styles for landing page
Port aef3f2775e to glitch-soc
2018-05-11 14:34:23 +02:00
Thibaut Girka 5c96717144 Update forms SCSS from upstream 2018-05-11 14:31:18 +02:00
Thibaut Girka 86c477df23 Update SCSS to match “Show card modal on public pages” 2018-05-11 14:20:46 +02:00
Thibaut Girka d0641e77ac Update SCSS for about/landing page 2018-05-11 14:18:52 +02:00
Thibaut Girka 2a85b97eb6 Update admin page SCSS from upstream 2018-05-11 14:13:59 +02:00
Thibaut Girka 3c7d7ec228 [Glitch] Use plaintext value for field value tooltips in web UI
Port 8b63d39427 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 0033dbd115 Add bot badge to account headers in the WebUI 2018-05-10 00:05:08 +02:00
Thibaut Girka 2e2758c25e Adapt account fields rendering code in the WebUI to match upstream 2018-05-10 00:03:34 +02:00
Thibaut Girka b8f8a3ea58 Update glitch-soc style to match new bio fields markup 2018-05-10 00:03:34 +02:00
Spencer Alves 31d760f56d Add an extra icon to indicate that a status is part of a conversation 2018-05-07 22:10:34 -07:00
Thibaut Girka dc597005b3 Port Sylvhem's mastodon-light to glitch flavour 2018-05-07 17:00:02 +02:00
beatrix e774936358 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 3333cce41e 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 49181d497f [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 d5e0e665df [Glitch] Also display replies in report modal
Port c88e12fca622c46a361a5c751a529e77aa5bf2ba to glitch-soc
2018-05-07 14:55:16 +02:00
Thibaut Girka 557db7ae6d Fix color of disabled boost buttons (fixes #466) 2018-05-07 13:37:29 +02:00
David Yip d01cb2c8e3 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 04a8aef9d2 Revert "[Glitch] Prevent timeline from moving when cursor is hovering over it"
This reverts commit 1c75c7901f.
2018-05-06 21:50:33 +02:00
Thibaut Girka 82421dc2e2 Revert "[Glitch] Do not re-position scroll when loading more (inserting items from below)"
This reverts commit ca62d8bcc6.
2018-05-06 21:50:26 +02:00
Thibaut Girka 1bc1d8e676 Fix glitch high-contrast skin text colors
Port from e0c3d950d1
2018-05-06 21:00:35 +02:00
beatrix f5f840cdb3 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 923e79ea00 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 1cd9812d52 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 c21fe3e7a0 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 3f7348c436 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 2b5821b86b Fix color of status icons in glitch-soc high contrast skin 2018-05-06 11:31:05 +02:00