3g0st
/
mastodon-docker-playground
forked from treehouse/mastodon
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
10,162 Commits
8 Branches
0 Tags
183 MiB
Commit Graph

1134 Commits (ed4317b549bb1140aaa4c968afe07c5d1a28adf4)

Author SHA1 Message Date
Thibaut Girka cbda1b8b66 Add back description on hover 2019-05-04 20:03:37 +02:00
ThibG 8e221cd22b [Glitch] Fix transition: all 
Port 7aa749ab46 to glitch-soc
 2019-05-04 19:53:09 +02:00
ThibG b7f69beebe [Glitch] Make the cursor icon consistant across media types in account media gallery 2019-05-04 19:16:51 +02:00
Eugen Rochko bc97fd641f [Glitch] Add button to view context to media modal 
Port eb63217210 to glitch-soc

Signed-off-by: Thibaut Girka <thib@sitedethib.com>
 2019-05-04 19:10:24 +02:00
Eugen Rochko 209c080280 [Glitch] Fix alignment of items in the account gallery in web UI and load more per page 
Port 967e419f8f to glitch-soc

Signed-off-by: Thibaut Girka <thib@sitedethib.com>
 2019-05-04 18:59:11 +02:00
Eugen Rochko a5da59f140 [Glitch] Change account gallery in web UI 
Port 3f143606fa to glitch-soc

Signed-off-by: Thibaut Girka <thib@sitedethib.com>
 2019-05-04 18:54:57 +02:00
Thibaut Girka 373dd1fdf1 Minor CSS fixes 2019-05-04 18:18:15 +02:00
Eugen Rochko ccf4f3240a [Glitch] Add blurhash 
Port front-end changes from fba96c808d to glitch-soc

Signed-off-by: Thibaut Girka <thib@sitedethib.com>
 2019-05-04 18:07:44 +02:00
ThibG 1149ddd3da Fix glitch SCSS for links in error messages in admin interface 
Port SCSS changes from 011b032300
 2019-05-04 16:43:08 +02:00
Thibaut Girka 9f25ab9792 Fix polls icon not showing in CW button in detailed statuses 2019-05-03 21:55:50 +02:00
Thibaut Girka 7617f78359 Fix crash in onboarding modal 
Fixes #1027
 2019-05-03 19:24:54 +02:00
Thibaut Girka cc5a81b7d8 Make hi-color privacy icons opt-in instead of opt-out 2019-05-01 20:23:25 +02:00
Thibaut Girka ac54292d69 Add high color privacy icons 
Fixes #1015
 2019-05-01 16:38:01 +02:00
Thibaut Girka d4c95e6a8a When selecting a toot via keyboard, ensure it is scrolled into view 
Fixes detailed status column
 2019-04-29 20:28:38 +02:00
Thibaut Girka 3e095cab83 Add support for missing formatting tags 2019-04-29 19:31:09 +02:00
Thibaut Girka 67fb9a8679 Add keyboard shortcut to collapse/uncollapse toots 2019-04-28 20:23:04 +02:00
Thibaut Girka f3acf8f414 Add hotkey for bookmarking a toot 2019-04-28 20:23:04 +02:00
Thibaut Girka cd9a284702 Fix regression with textarea's caret position when selecting a suggestion 2019-04-27 21:40:42 +02:00
Thibaut Girka aa1832ac4d Hide suggestions by default 
They will be enabled if the input has focus
 2019-04-26 22:38:03 +02:00
Thibaut Girka fddd8251dd Attempt to fix CSS 2019-04-26 22:38:03 +02:00
Thibaut Girka d7e4be285a Add emoji suggestion to poll options 2019-04-26 22:38:03 +02:00
Thibaut Girka df52004fe6 Add suggestions in CW field 2019-04-26 22:38:03 +02:00
Thibaut Girka 3a671470ec Refactor selectComposeSuggestion so that different paths can be updated 2019-04-26 22:38:03 +02:00
Thibaut Girka 1c0402c103 Do not ask to register web intent handler 2019-04-24 23:05:11 +02:00
Thibaut Girka b13c90f3e3 Fix color of muted statuses content not wrapped in a p tag 2019-04-24 22:40:17 +02:00
Thibaut Girka e4b65e6349 Redesign blockquote styling 2019-04-24 22:40:17 +02:00
Thibaut Girka 8753e5317f Better distinguish titles from text 2019-04-24 22:40:17 +02:00
Thibaut Girka 3631c3314a Remove extra margin in paragraphs inside blockquotes 2019-04-24 22:40:17 +02:00
Thibaut Girka 9b86707b1e Make bold text bolder 2019-04-24 22:40:17 +02:00
Thibaut Girka 5a8495dabe Remove margins around `p` tags in lists 2019-04-24 22:40:17 +02:00
Thibaut Girka ef249a2718 Rename status__text to status__content__text for consistency with upstream 2019-04-24 22:40:17 +02:00
Thibaut Girka adbb174c9c Fix status header display in toot mobile menu 2019-04-24 20:21:19 +02:00
Thibaut Girka ef1504d625 Fix upload progressbar when image resizing is involved 2019-04-24 20:19:23 +02:00
Thibaut Girka ffab9d626a Hide media upload form if no media are attached 2019-04-24 19:47:11 +02:00
Thibaut Girka 416aa832e5 Fix file upload 2019-04-24 07:57:28 +02:00
Thibaut Girka 3d722b0c4e Fix settings modal 2019-04-23 18:31:13 +02:00
Thibaut Girka 27e8354914 Add support for lists in statuses 2019-04-22 23:07:14 +02:00
Thibaut Girka 659f972bed Do not switch to italic for status media buttons 2019-04-22 23:07:14 +02:00
Thibaut Girka 2e3640ecbb Accept richer text from remote statuses 
Support abbr, del, pre, blockquote, code, strong, b, em, i, and h1…h5
HTML elements in remote statuses, add corresponding CSS.
 2019-04-22 23:07:14 +02:00
kedama 039e35560c [Glitch] Fix modal items cannot scroll on touch devices 
Port d763d39d26 to glitch-soc
 2019-04-22 22:57:39 +02:00
Thibaut Girka c3fa4e8e07 Fix ReferenceError in dropdown 2019-04-22 20:15:47 +02:00
Thibaut Girka d779ec1f0e Fix broken reference to handleSubmit 2019-04-22 20:15:47 +02:00
Thibaut Girka e949861176 Cleanup 2019-04-22 20:15:47 +02:00
Thibaut Girka faff152ae5 Move ComposerPublisher to Compose 2019-04-22 20:15:47 +02:00
Thibaut Girka df951c319c Add OptionsContainer 2019-04-22 20:15:47 +02:00
Thibaut Girka 14028655df Move composer Dropdown from features/composer to features/compose 2019-04-22 20:15:47 +02:00
Thibaut Girka 4c6221929f Move ComposerTextareaIcons to TextareaIcons 2019-04-22 20:15:47 +02:00
Thibaut Girka 47faf47ed5 ComposerTextarea → AutosuggestTextarea 2019-04-22 20:15:47 +02:00
Thibaut Girka a243567a3e ComposerUploadForm → UploadForm + UploadFormContainer 2019-04-22 20:15:47 +02:00
Thibaut Girka c5f49a92dc Move PollForm from features/composer to features/compose 2019-04-22 20:15:47 +02:00
Thibaut Girka f1a22e33e2 Inline spoiler input 2019-04-22 20:15:47 +02:00
Thibaut Girka 8fd599fb40 ComposerReply → ReplyIndicator 2019-04-22 20:15:47 +02:00
Thibaut Girka f72af5794d Refactor Compose*Warning → ContainerWarning 
Regression: only one warning at a time
 2019-04-22 20:15:47 +02:00
Thibaut Girka 1bc4b8a0a5 features/composer/index.js → ComposeForm 2019-04-22 20:15:47 +02:00
Thibaut Girka 281a82d878 DrawerHeader → Header + HeaderContainer 2019-04-22 20:15:47 +02:00
Thibaut Girka 9a2f10fe8b DrawerAccount → NavigationBar + NavigationContainer 2019-04-22 20:15:47 +02:00
Eugen Rochko 9b9816aba6 [Glitch] Show suggested follows on search screen in mobile layout 
Port ad510db3a1 to glitch-soc
 2019-04-22 20:15:47 +02:00
Thibaut Girka 149aa07409 DrawerResults → SearchResults + SearchResultsContainer 2019-04-22 20:15:47 +02:00
Thibaut Girka 67771e6d65 Rework DrawerResults to make them closer to upstream 2019-04-22 20:15:47 +02:00
Thibaut Girka ab3e8fc542 Move DrawerSearch to Search + SearchContainer 2019-04-22 20:15:47 +02:00
Thibaut Girka c92ab35b19 Inline DrawerSearchPopout in DrawerSearch 2019-04-22 20:15:47 +02:00
Thibaut Girka c19b983986 Refactor a bit DrawerSearch to make it closer to upstream 2019-04-22 20:15:47 +02:00
Thibaut Girka eed2c9dd44 Rename flavours/glitch/features/drawer to flavours/glitch/features/compose 2019-04-22 20:15:47 +02:00
Thibaut Girka 8b7b65e995 [Glitch] Allow modal secondary button to shrink and allow wider confirmation modals 
Port 7f75792bf3 to glitch-soc
 2019-04-19 10:48:54 +02:00
Thibaut Girka e3c1472040 Shift+click on column Back button to return to last pinable column 2019-04-17 18:40:40 +02:00
Thibaut Girka 8d57c0e70e When selecting a toot via keyboard, ensure it is scrolled into view 2019-04-17 10:07:33 +02:00
Thibaut Girka fbec0edf08 Fix opening/closing gifv sometimes making the timeline scroll 2019-04-16 22:20:23 +02:00
Eugen Rochko 92e1950194 [Glitch] Fix glitched out "not found" message for non-existing profiles in web UI 
Port 56f29c38b6 to glitch-soc
 2019-04-10 09:33:47 +02:00
Eugen Rochko fa4b51a110 [Glitch] Add "why do you want to join" field to invite requests 
Port SCSS changes from 8b69a66380 to glitch-soc
 2019-04-10 09:22:45 +02:00
Thibaut Girka cb410f80a4 Add column title to “Favourited by” and “Boosted by” columns 2019-04-08 21:59:30 +02:00
ashleyhull-versent ac071d65de [Glitch] Duplicate values 
Port bd365cc38b to glitch-soc
 2019-04-08 16:22:20 +02:00
Eugen Rochko df42de68e5 [Glitch] Port SCSS changes from "Improve blocked view of profiles" 
Port public pages SCSS changes from 67b3b62b98
 2019-04-08 16:20:46 +02:00
ThibG 30500dff7c
Merge pull request #981 from ThibG/glitch-soc/merge-upstream 
Merge upstream changes
 2019-04-04 15:13:18 +02:00
ThibG be6885eb93 [Glitch] Update poll remaining time just like with status timestamps 
Port daab45d4ae to glitch-soc
 2019-04-04 14:58:11 +02:00
Thibaut Girka 14bad3f472 Do not handle clicks in detailed status content 2019-04-03 19:58:18 +02:00
Eugen Rochko b9b472d519 [Glitch] Fix transparent avatars showing underlying elements in avatar stack and profile 
Port 79227d153b to glitch-soc
 2019-03-30 18:19:40 +01:00
Eugen Rochko 59551ece31 [Glitch] Fix search in web UI not setting a limit, restore limit of 10 
Port 379c3e237f to glitch-soc, but changing
the 5 limit to 10, since that's what we had previously
 2019-03-30 12:56:34 +01:00
Alex Gessner b6fa500806 [Glitch] squashed identity proof updates 
Port JS from 69141dca26 to glitch-soc
 2019-03-29 10:13:44 +01:00
Thibaut Girka a74d300b68 Fix background color transition in destructive buttons 2019-03-28 20:45:10 +01:00
ThibG f4b038f779 [Glitch] Fix opacity of relationship tags 
Port 58667072d9 to glitch-soc
 2019-03-28 19:56:40 +01:00
Thibaut Girka 0318b23395 Fix left border of profile navigation tab 2019-03-28 19:56:40 +01:00
Thibaut Girka ab39ffb175 Add fa-info-circle to disclaimer 2019-03-28 19:56:40 +01:00
Thibaut Girka 6c58367f36 Fix double border for account disclaimer 2019-03-28 19:56:40 +01:00
slice 6fdd829d8c [Glitch] Add rel='noopener' to redesigned profile column header avatar link 
Port 73f5711fb8 to glitch-soc
 2019-03-28 19:56:40 +01:00
ThibG 841d2c9f23 [Glitch] Move the account dropdown menubar to the right, make sure it doesn't move 
Port a91acf79b5 to glitch-soc
 2019-03-28 19:56:40 +01:00
Aditoo17 37ad0478ef [Glitch] Make clicking on avatar open public profile in new tab 
Port 6f6abc369f to glitch-soc
 2019-03-28 19:56:40 +01:00
mayaeh cf3f063e10 [Glitch] Fix menu items that don't action 
Port 186f7bcbb6 to glitch-soc
 2019-03-28 19:56:40 +01:00
Eugen Rochko 00f251b8fe [Glitch] Redesign profile column in web UI to match design on public pages 
Port a96181f16f to glitch-soc
 2019-03-28 19:56:40 +01:00
Thibaut Girka abb53fa338 Fix centering on public pages 2019-03-28 19:56:03 +01:00
Thibaut Girka 60fc04756a Fix padding and centering of display names 2019-03-28 19:56:03 +01:00
Thibaut Girka 58da5e93c0 Port search results styling to glitch-soc 2019-03-28 19:56:03 +01:00
Thibaut Girka 355d384d8d Revert "[Glitch] fix: update to emoji-mart 2.10.0" 
This reverts commit 49bea8c46b.
 2019-03-27 14:04:52 +01:00
ThibG 9e80b34a95 [Glitch] Add a “Block & Report” button to the block confirmation dialog 
Port 6df4a82969 to glitch-soc
 2019-03-26 17:44:00 +01:00
Hinaloe 872eab5784 [Glitch] Do not set CSRF Token when no csrf header 
Port 68f2211f00 to glitch-soc
 2019-03-26 16:12:46 +01:00
Eugen Rochko 89a0fa3053 [Glitch] Change icons of features on admin dashboard to remove bias 
Port SCSS changes from e117964325 to glitch-soc
 2019-03-26 16:11:30 +01:00
Eugen Rochko 614bd3f8d4 [Glitch] Add `lang` attribute to statuses in web UI 
Port JS changes from e6cfa7ab89 to glitch-soc
 2019-03-26 16:09:59 +01:00
ThibG d680c61993 [Glitch] Do not empty timeline of blocked users on block 
Port 94aceb85ad to glitch-soc
 2019-03-26 16:07:47 +01:00
Eugen Rochko 648cf8bfd5 [Glitch] Add custom closed registrations message to landing page when set 
Port SCSS changes from 55a9658ad8 to glitch-soc
 2019-03-26 16:01:59 +01:00
ThibG 8b5b686f08 [Glitch] Add support for custom emojis in poll options 
Fixes #956

Port 80f0910e21 to glitch-soc
 2019-03-20 17:34:32 +01:00
ThibG 803c350ef5 [Glitch] Reduce padding around logo on landing page 
Port 158c31b9df to glitch-soc
 2019-03-20 14:54:52 +01:00
Eugen Rochko 4d01d9c46f [Glitch] Add Keybase integration 
Port SCSS changes from 9c4cbdbafb to glitch-soc
 2019-03-20 14:54:19 +01:00
Eugen Rochko 2a93c88015 [Glitch] Disable real-time updates on public pages to improve readability 
Port 42c581c458 to glitch-soc
 2019-03-20 14:51:25 +01:00
Eugen Rochko 841b920af5 [Glitch] Fix relationship manager on narrow screens 
Port 7130d6e512 to glitch-soc
 2019-03-18 18:07:03 +01:00
ThibG 200cd3b5a7 [Glitch] Save quick filter settings when selecting a different filter 
Port 7477db7268 to glitch-soc
 2019-03-18 18:06:26 +01:00
Nolan Lawson 49bea8c46b [Glitch] fix: update to emoji-mart 2.10.0 
Port db06b25376 to glitch-soc
 2019-03-16 21:39:13 +01:00
Eugen Rochko e900b03e38 [Glitch] Fix scrollbar styles on compose textarea, small bugs 
Port 6a3f08661f to glitch-soc
 2019-03-16 21:07:50 +01:00
Thibaut Girka 0fbe90e2d3 Fix settings/flavours 
Update theming system to use new paths for media files
 2019-03-16 16:21:20 +01:00
Eugen Rochko 47c8707f01 [Glitch] Add relationship manager UI 
Port SCSS changes from 1c113fd72d to glitch-soc
 2019-03-16 14:36:29 +01:00
Eugen Rochko 338f1327e9 [Glitch] Admission-based registrations mode 
Port SCSS changes from 51e154f5e8 to glitch-soc
 2019-03-14 17:54:44 +01:00
Eugen Rochko d8b43f4bd6 [Glitch] Improve invites list with click-to-copy inputs 
Port 6e3936aa6f to glitch-soc
 2019-03-14 17:44:39 +01:00
ThibG 931ecc8824 [Glitch] Add UI for enabling/disabling poll notifications 2019-03-13 22:21:52 +01:00
Eugen Rochko 387f253f31 [Glitch] Add muted style for polls in web UI 
Port 5b50c2cbaa to glitch-soc
 2019-03-13 16:02:36 +01:00
Eugen Rochko 458db4333a [Glitch] Fix public timeline page not paginating correctly 
Port da45b8b4c9 to glitch-soc
 2019-03-13 15:56:51 +01:00
Eugen Rochko bbb9ff0e84 [Glitch] Redesign landing page 
Port 65fffeac3f to glitch-soc
 2019-03-13 15:53:00 +01:00
Thibaut Girka a1c6e6de1b Remove leftover console.log 2019-03-11 14:39:45 +01:00
Thibaut Girka 4849eb8e7f Make clicking on the account and status column headers scroll to top 2019-03-11 14:19:16 +01:00
ThibG 45e4c90a23
Merge pull request #953 from ThibG/glitch-soc/merge-upstream 
Merge upstream changes
 2019-03-11 13:23:54 +01:00
Thibaut Girka 9c620fc5c8 [Glitch] Add support for poll ending notifications 
Port front-end parts of 3a92885a86 to glitch-soc
 2019-03-11 13:08:21 +01:00
ash lea f534f4869e add local setting to auto reveal media behind cw 2019-03-11 12:14:45 +01:00
Kirishima21 1bf035fb67 fix poll fotter layout 
画面の幅が充分でないときに
表示外にまでボタンが拡大されてしまわないように修正。
 2019-03-11 12:09:30 +01:00
Eugen Rochko ca45198ccb [Glitch] Fix NaN in Poll component 
Port 75cb93676b to glitch-soc
 2019-03-08 01:01:19 +01:00
Eugen Rochko 6fe48dd050 [Glitch] Fix public timelines being broken by new toots when they are not mounted 
Port be1c634b2b to glitch-soc
 2019-03-08 01:00:14 +01:00
Thibaut Girka 84c807a0dc Allow setting whether this is a single choice poll or multiple choices one 2019-03-06 23:56:53 +01:00
Thibaut Girka cb6e351f4d Disable file upload when there is a poll 2019-03-06 23:56:53 +01:00
Thibaut Girka 235be596bc Use server-provided poll limits instead of hardcoded ones 
Also does not enable polls if no limits are provided by the server
 2019-03-06 23:56:53 +01:00
Thibaut Girka 8fe86cebaa [Glitch] Port polls creation UI from upstream 2019-03-06 23:56:53 +01:00
ThibG 6e295beab2 [Glitch] Disable the underlying button element when an ItemButton is disabled 
Port b3668a79ec to glitch-soc
 2019-03-06 22:40:17 +01:00
Thibaut Girka 1bb23100b1 Add an icon to highlight polls behind a Content Warning 2019-03-06 13:01:27 +01:00
Eugen Rochko 94a0149ff3 Fix poll options not rendering text after vote/refresh 
Port fd128b9c7a to glitch-soc
 2019-03-06 11:44:27 +01:00
Eugen Rochko 94f1a751bf Avoid line breaks in poll options 
Port 57643557b6 to glitch-soc
 2019-03-06 11:43:14 +01:00
Eugen Rochko 7f32d675b0 Render unicode emoji in polls using emoji pack 
Port 4407f07014 to glitch-soc
 2019-03-06 11:42:25 +01:00
Thibaut Girka e80fabfd84 Fix toots opening in dynamic column when trying to interact with them 
This fixes inline preview cards and polls, preventing them from opening
the toot in detailed view when clicking on an interactive element.
 2019-03-06 00:20:43 +01:00
Thibaut Girka ff827c1f38 [Glitch] Perform deep comparison for card data when receiving new props 
Prevents embedded players from resetting when interacting with the toot
 2019-03-05 23:22:29 +01:00
Eugen Rochko ba6ca3cd69 Fix various issues in polls 
Port front-end changes from a198add83b to glitch-soc
 2019-03-05 21:35:03 +01:00
ThibG 7f27ee35a8 Display closed polls as such 
Port cda6ece760 to glitch-soc
 2019-03-05 21:35:03 +01:00
ThibG 530151466e Fixes to the polls UI 
Port 4ced609497 to glitch-soc
 2019-03-05 21:35:03 +01:00
Eugen Rochko f14eda23e9 Fix web UI crash on page load when detailed status has a poll 
Port 5dfa433698 to glitch-soc
 2019-03-05 21:35:03 +01:00
ThibG 2156765448 Insert polls in redux stores before statuses so it avoids crashes 
Port 26c56d0c10 to glitch-soc
 2019-03-05 21:35:03 +01:00
Eugen Rochko 8d70a8a19b Add polls 
Port front-end parts of 230a012f00 to glitch-soc
 2019-03-05 21:35:03 +01:00
Thibaut Girka 0d19fcc2fb Port upstream refactoring of reducers and actions 
Also includes 9e45b051cf
 2019-03-05 21:35:03 +01:00
Eugen Rochko cce1c3252f Fix home timeline perpetually reloading when empty 
Port 3e0ed36e8e to glitch-soc
 2019-03-05 19:30:11 +01:00
Mélanie Chauvel (ariasuni) 2a4ce7458a [Glitch] Fix errors found by eslint 
Signed-off-by: Thibaut Girka <thib@sitedethib.com>
 2019-03-01 14:01:51 +01:00
Mélanie Chauvel (ariasuni) 282ac61500 [Glitch] Make the column header of profile view look like the others, too 
Signed-off-by: Thibaut Girka <thib@sitedethib.com>
 2019-03-01 14:01:51 +01:00
Mélanie Chauvel (ariasuni) 12a0dd71be [Glitch] Make the column header of toot/thread view look like the others 
Signed-off-by: Thibaut Girka <thib@sitedethib.com>
 2019-03-01 14:01:51 +01:00
Thibaut Girka 76ed481aa7 Port public page mastodon-light fixes from upstream 2019-02-27 16:24:57 +01:00
Eugen Rochko 1e06ca1c0a Fix web UI not removing notifications after block (#10108) 
Regression from #7311
 2019-02-26 19:33:59 +01:00
abcang 7209a8b32f Keep notification when muting_notifications is true (#7311) 
* Keep notification when muting_notifications is true

* Retrun mute object

* Fix test
 2019-02-26 19:33:42 +01:00
Thibaut Girka d82de360c1 Fix non-numeric account identifiers leading to /web/accounts/NaN 
I'm not sure what purpose these “+” served?!
 2019-02-22 17:52:21 +01:00
Thibaut Girka 896beb16c5 [Glitch] Internationalize unexpected error message 
Port 4e71b104e6 to glitch-soc,
fixing a crash in the process
 2019-02-18 19:49:06 +01:00
Eugen Rochko be9352266c Fix hashtag column not subscribing to stream on mount (#10040) 
Fix #9895
 2019-02-18 18:16:35 +01:00
Thibaut Girka d974988541 Fix video player width not being updated to fit container width 2019-02-18 10:44:37 +01:00
Ben Lubar fa9635c741 Allow multi-line image descriptions. (Glitch) 2019-02-17 15:19:12 +01:00
Thibaut Girka e31fc2b458 [Glitch] Fix crash on public hashtag pages when streaming fails 
Port 041ff5fa9a to glitch-soc
 2019-02-17 14:28:25 +01:00
Thibaut Girka 91c9cb6022 [Glitch] Change buttons on timeline preview to open the interaction dialog 
Port 71e28ba399 to glitch-soc
 2019-02-17 12:39:44 +01:00
Thibaut Girka 9a47f2cbdf Port upstream's javascript to the error page 2019-02-17 12:27:01 +01:00
Thibaut Girka 369a475a70 Merge branch 'master' into glitch-soc/merge-upstream 
Conflicts:
- app/serializers/rest/instance_serializer.rb
- app/views/layouts/error.html.haml
- public/oops.png
  Took our version (same as upstream but without the things that only
  make sense in an animation).

Additional changes:
- app/javascript/flavours/vanilla/theme.yml
  Include upstream's javascript in error pages.
 2019-02-17 12:26:55 +01:00
Eugen Rochko 59fa38a4f6 Fix style regressions on landing page (#10030) 2019-02-15 18:22:06 +01:00
Thibaut Girka a151c5566a [Glitch] Fix hashtags select styling in default and high contrast skins 
Port 169b9d4428 to glitch-soc
 2019-02-15 18:21:00 +01:00
Eugen Rochko 4dcb04b888 Fix color of static page links in high contrast theme (#10028) 2019-02-15 18:10:26 +01:00
Thibaut Girka 2769b54466 [Glitch] Fix occasional crash in detailed toot view 
Port f9a338b473 to glitch-soc
 2019-02-15 17:34:15 +01:00
Thibaut Girka 614ea184bb [Glitch] Add "copy link" item to status action bars 
Port 3cfadd875c to glitch-soc
 2019-02-13 07:29:57 +01:00
Thibaut Girka e230b176fb [Glitch] Don't focus spoiler input when disabled spoiler 
Inspired by 0e513ff862
 2019-02-12 21:16:02 +01:00
ThibG a3ba28eb17
Merge pull request #913 from ThibG/glitch-soc/merge-upstream 
Merge upstream changes
 2019-02-12 20:29:55 +01:00
Thibaut Girka b89e003c4d Handle deletion of filtered toots 2019-02-10 22:54:25 +01:00
Thibaut Girka 7c0728c776 Minor fix to timeline jump avoiding behavior 2019-02-10 22:54:25 +01:00
Thibaut Girka dfe1d548a5 Adjust scroll when statuses above the current scroll position are deleted 2019-02-10 22:54:25 +01:00
Thibaut Girka 0b91322762 Adjust scroll if previewCard appeared 2019-02-10 22:54:25 +01:00
Thibaut Girka 049c9a3b97 Avoid two-step rendering of statuses as much as possible 
Cache width shared by Video player, MediaGallery and Cards at the
ScrollableList level, pass it down through StatusList and Notifications.
 2019-02-10 22:54:25 +01:00
Thibaut Girka 68f3d003d6 Refactor intersection observer article code 2019-02-10 22:54:25 +01:00
Thibaut Girka e49e54a5ff Cleanup redundant markup for hidden statuses 2019-02-10 22:54:25 +01:00
Thibaut Girka 405ef5ad37 Hide items rendered out-of-frame (once they have been rendered at least once) 2019-02-10 22:54:25 +01:00
Thibaut Girka b47a53f902 [Glitch] Rename from instance to server. 
Port 46e806cd2f to glitch-soc
 2019-02-10 22:19:26 +01:00
Thibaut Girka 14a1bb703a [Glitch] Fix not showing custom emojis in share page emoji picker 
Port e02a13f64e to glitch-soc
 2019-02-10 21:54:43 +01:00
Thibaut Girka b7fbcb21b3 [Glitch] Add featured hashtags to profiles 
Port SCSS changes from 364f2ff9aa
 2019-02-10 21:50:42 +01:00
Thibaut Girka 7ed2aeb6e9 [Glitch] Allow multiple files upload through web UI, including drag & drop 
Port 750c67660d to glitch-soc
 2019-02-10 21:44:14 +01:00
Thibaut Girka a963ea67dd [Glitch] Add missing rejection handling for Promises 
Port missing parts from 2c51bc0ca5 to glitch-soc
 2019-02-10 21:44:14 +01:00
Thibaut Girka 6b2eefc7bf [Glitch] Add WebP support 
Port 5092d17f29  to glitch-soc
 2019-02-10 21:13:17 +01:00
Thibaut Girka 1a70fca168 Fix CW unfolding not triggering re-layout in public hashtag page 2019-02-06 15:32:48 +01:00
Thibaut Girka 3ce34ce7a2 Fix unfolding CWs on public hashtag page 
Fixes #909
 2019-02-06 14:37:57 +01:00
Thibaut Girka c9d261753a Remove redundant “options” from “Compose box options” 
Thanks @ariasuni.
 2019-02-03 01:02:39 +01:00
Marek Ľach a0a8203a0b Minor description corrections 2019-02-03 00:30:34 +01:00
Eugen Rochko 663593b508 Fix link color in high-contrast theme, add underlines (#9949) 
Improve sorting of default themes in the dropdown
 2019-02-01 16:23:13 +01:00
Thibaut Girka 2e93f87c9f [Glitch] Replace unlock-alt icon with unlock 
Port 6513f6c953 to glitch-soc
 2019-02-01 16:15:44 +01:00
Thibaut Girka f611da4899 Do not mark toots as sensitive if they don't have any media attached 2019-02-01 15:55:28 +01:00
Thibaut Girka 762e4fdf55 Fix hashtag processing when sending toots 
This fixes crashes in pleroma when writing toots with a content warning,
since pleroma inserts a “nsfw” hashtag that isn't part of the toot's text.
 2019-02-01 12:37:28 +01:00
Thibaut Girka f35d790480 [Glitch] Fix initial value of volume slider in video player and handle volume changes 
Port a53dcaa298 to glitch-soc
 2019-01-27 22:02:59 +01:00
trwnh 8ef0498f1c Fix Firefox scrollbar color regression in #9210 (#9908) 
In #9210 the track color was changed to transparent for no apparent reason. This PR restores the previous color selections implemented in #8653 while keeping the updated property name. Per https://github.com/tootsuite/mastodon/pull/9210#issuecomment-441788776 there is no particular reason for the color change in #9210.
 2019-01-25 11:48:27 +01:00
Jeong Arm 77394156dd Apply style for .landing-page strong (#9892) 2019-01-25 11:48:02 +01:00
Thibaut Girka c30da25c5f Fix crash in Direct Messages column settings 
Fixes #892
 2019-01-23 18:29:18 +01:00
Thibaut Girka 5145c81620 [Glitch] Fix public hashtag timeline width on mobile, fix scrollbar width compensation 
Port 3b3a4d8a17 to glitch-soc
 2019-01-20 11:56:21 +01:00
Thibaut Girka e9060b04d4 [Glitch] Hide floating action button on search and getting started pages 
Port 30af4ee65f to glitch-soc
 2019-01-20 11:54:38 +01:00
tmm576 9b5810b3e9 Allow event defaults on index for text data transfer (#9840) 2019-01-20 11:53:22 +01:00
Thibaut Girka a93cb340bd [Glitch] Fix new hashtag page's items not being full-width on mobile 
Port b506ce1197 to glitch-soc
 2019-01-20 11:52:06 +01:00
Thibaut Girka 8001a9b97b [Glitch] Add information about how to opt-in to the directory on the directory 
Port SCSS changes from a492a9bcd3 to glitch-soc
 2019-01-20 11:50:19 +01:00
Mélanie Chauvel (ariasuni) 6dbb10c4b7 Fix slightly cropped font on settings page dropdowns when using system font (#9839) 2019-01-20 11:49:27 +01:00
Thibaut Girka 02295257b3 [Glitch] Improve the public hashtag page 
Port 8b19903559 to glitch-soc
 2019-01-20 11:47:17 +01:00
Thibaut Girka 3e8b623975 [Glitch] Redesign public hashtag page to use a masonry layout 
Port bc642ac24b to glitch flavour
 2019-01-20 11:38:09 +01:00
Thibaut Girka 5684cd090c [Glitch] make draggingOver state off correctly 
Port d6433b3931 to glitch-soc
 2019-01-16 14:50:17 +01:00
Thibaut Girka 92830029ca [Glitch] Make hashtag search results link to the hashtag URL 
Port 6cfb357940 to glitch-soc
 2019-01-16 14:25:58 +01:00
Thibaut Girka ad32896a93 [Glitch] Fix hashtag timeline on mobile 
Port c5b8824a3e to glitch-soc
 2019-01-16 14:24:23 +01:00
Thibaut Girka 4cec7a77c3 [Glitch] Adjust admin UI right panel size 
Port 9ee9cb549b to glitch-soc
 2019-01-13 20:41:38 +01:00
Thibaut Girka 2c5f0f12ac [Glitch] change height on narrow view to take 100% of screen 
Port 1183246043 to glitch-soc
 2019-01-13 20:40:46 +01:00
Thibaut Girka 278ff1318f [Glitch] Add attachment list fallback to public pages 
Port JS changes from 4fb94c758e to glitch-soc
 2019-01-13 14:42:50 +01:00
Thibaut Girka 394525e329 [Glitch] Postpone scroll-to-detailed status after react components are loaded 
Port 70801b850c to glitch-soc
 2019-01-10 21:00:33 +01:00
Thibaut Girka 7cc800d0df [Glitch] Redesign admin instances area 
Port SCSS changes from 1c6588accc
 2019-01-10 21:00:33 +01:00
Thibaut Girka e03813cf0a [Glitch] Stop gifv timeline preview explicitly when open the media gallery 
Port cf3c0fc38c to glitch-soc
 2019-01-10 21:00:33 +01:00
Thibaut Girka 147f4f9fd2 [Glitch] refactored account.js 
Port 57c91fbbed to glitch-soc
 2019-01-10 21:00:33 +01:00
Thibaut Girka ec441e0299 [Glitch] Fix embed play icons regression 
Port bd5a8c7765 to glitch-soc
 2019-01-10 21:00:33 +01:00
Thibaut Girka 2b2584a37b [Glitch] Display fallback link card thumbnail when none is given 
Port 1512af2811 to glitch-soc
 2019-01-10 21:00:33 +01:00
Thibaut Girka d1da0a1086 Port a few public.js changes from upstream, move some code around 
glitch-soc's public.js was a bit out of date, and code was put inappropriately
to the common public.js
 2019-01-10 18:45:17 +01:00
Thibaut Girka e8ae77236b [Glitch] Only consider mouse move in scrolling on item insertion 
Port cc1f13dfd0 to glitch-soc
 2019-01-10 12:09:12 +01:00
Thibaut Girka 825decbf9e [Glitch] Identify manual scrolling to cancel scroll to top reset on mouse idle 
Port 2f86fc5e0a to glitch-soc
 2019-01-10 12:09:12 +01:00
Thibaut Girka 19c64a49f7 [Glitch] Cancel list scroll reset after mouse move on wheel scroll 
Port 9cfd610484 to glitch-soc
 2019-01-10 12:09:12 +01:00
Thibaut Girka 21f27e6579 [Glitch] Temporarily hold timeline if mouse moved recently 
Port 6a1216d2cd to glitch-soc
 2019-01-10 12:09:12 +01:00
Thibaut Girka 20fd855830 Update glitch-soc admin page style from upstream 
Port SCSS changes from e55dce3176 to glitch-soc
 2019-01-08 20:20:35 +01:00
ash lea dc501c4134 add list title editing 2019-01-06 13:03:57 +01:00
Thibaut Girka 7baf15675f Add local setting to disable swipe-to-change-columns 2019-01-05 21:47:48 +01:00
Thibaut Girka e77ceb1b29 [Glitch] Update dependencies for Node.js (2018-12-31) 
Port compatibility changes from 8f5fdab5bf to glitch-soc
 2019-01-02 16:07:33 +01:00
Thibaut Girka 1464620ddb [Glitch] Improve admin UI for account view 
Port SCSS changes from 6e49907ecf to glitch-soc
 2019-01-02 15:38:48 +01:00
Thibaut Girka 9b606cb24c [Glitch] Update emoji codepoint mappings to v11.0 
Port 2ee779dcd3 to glitch-soc
 2019-01-02 15:36:59 +01:00
Thibaut Girka 1b35ca17a9 Fix some image paths in SCSS files 2019-01-02 15:36:59 +01:00
Thibaut Girka b300948526 Fix crash when clearing uninitialized timeline 
Fixes #875
 2018-12-30 16:56:55 +01:00
Thibaut Girka d126240129 Immediately go back in browser history upon successfully sending toot 2018-12-30 14:07:57 +01:00
Thibaut Girka cb98e7dbd3 [Glitch] Add moderation warnings 
Port SCSS changes from 3c033c4352 to glitch-soc
 2018-12-23 12:54:09 +01:00
Thibaut Girka 82088f0d7d [Glitch] Remove links to bridge.joinmastodon.org (non-functional) 
Port bb62827c16 to glitch-soc
 2018-12-23 11:43:47 +01:00
Thibaut Girka c5c4450fdd Remove file added by error 2018-12-23 11:43:25 +01:00
Thibaut Girka 22dedb676b [Glitch] Fix unnecessary loadMore calls when the end of a timeline has been reached 
Port 8389b496ba to glitch flavour
 2018-12-23 11:40:52 +01:00
Thibaut Girka 1a3088364f Fix composer not getting focus after reply confirmation dialog 
The modal-handling code gives back focus to the element focused when the
modal opened. However, in the case of reply confirmation, it would do so
*after* the composer code itself requested focus.
 2018-12-21 20:00:49 +01:00
Thibaut Girka 0605c004a5 Fix incorrect and duplicate onConfirm callback 2018-12-21 20:00:49 +01:00
Thibaut Girka 6166751f9e [Glitch] Fix that translation is not applied to "joining hashtags" 
Port bfec030a4e to glitch-soc
 2018-12-21 19:54:54 +01:00
Thibaut Girka 3611ea02e2 [Glitch] Deep compare tags for hashtag column reload 
Port 4fdefffb99 to glitch-soc
 2018-12-21 19:54:54 +01:00
Thibaut Girka 4be7313298 [Glitch] Allow joining several hashtags in a single column 
Port 4c03e05a4e to glitch-soc

This introduces new requirements in the API:

  `/api/v1/timelines/tag/:tag` now accepts new params: `any`, `all` and `none`
  It now returns status matching tag :tag or any of the :any, provided that
  they also include all tags in `all` and none of `none`.
 2018-12-21 19:54:54 +01:00
Thibaut Girka 6073195a7d [Glitch] Display customized mascot in web UI 
Port relevant parts of 9d4541c612 to glitch-soc
 2018-12-20 18:39:05 +01:00
Thibaut Girka fb63941c47 Make drawer markup and styling closer to upstream 
WARNING: This may break some custom skins!

  `.drawer > .contents` has been moved to
  `.drawer > .drawer__pager > .drawer__iner`, and the waves have been moved
  from `.drawer > .contents` to `.drawer__inner__mastodon`!
 2018-12-20 18:39:05 +01:00
Thibaut Girka 5eaf2c9e02 [Glitch] Back to the getting-started when pins the timeline 
Port 5bf100f87b to glitch-soc
 2018-12-20 14:51:28 +01:00
Thibaut Girka 1b18eb49e3 Hide negative follower counts from glitch flavour 2018-12-20 14:51:12 +01:00
Thibaut Girka 2228655848 [Glitch] Improved appearance of notification filter on safari 
Port 2e1b5edfea to glitch-soc
 2018-12-19 13:00:08 +01:00
Thibaut Girka 655da1be20 Reword confirm_before_clearing_draft description 2018-12-18 21:54:34 +01:00
Thibaut Girka 9a7201f2ee Allow disabling the reply confirmation dialog 2018-12-18 21:54:34 +01:00
Thibaut Girka 056a8a8ee4 Allow disabling media confirmation from the confirmation dialog itself 2018-12-18 21:54:34 +01:00
Thibaut Girka 490d8fff0b Remove dead code 2018-12-18 21:39:35 +01:00
Thibaut Girka 82b01a6c9f [Glitch] Put "Media Only" option in column settings instead of content area headline 
Port 4f42238c29 to glitch-soc
 2018-12-18 21:39:35 +01:00
Thibaut Girka 9fc7ad7b9c [Glitch] Always display tab navigation on local/federated timeline even when empty 
Port 90b64c0069 to glitch-soc
 2018-12-18 21:39:35 +01:00
Thibaut Girka c644e6ea89 Do not replace history state 
This is both for consistency with account timelines and to not mess with
the logic used to decide whether going back in the browser's history is
going to make us leave the WebUI.
 2018-12-18 21:39:35 +01:00
Thibaut Girka 200a8bdd3a [Glitch] Enable media timeline 
Port 8182b61518 to glitch-soc
 2018-12-18 21:39:35 +01:00
Thibaut Girka a693d6e2f2 [Glitch] Hide section headline for timelines in production 
Port 4eeda67727 to glitch-soc
 2018-12-18 21:39:35 +01:00
Thibaut Girka 593f88acb1 [Glitch] Change column params on pinned timeline 
Port 06252ec71e to glitch-soc
 2018-12-18 21:39:35 +01:00
Thibaut Girka c03cbb9471 [Glitch] Save onlyMedia prop when pinning column 
Port 5ea643b279 to glitch-soc
 2018-12-18 21:39:35 +01:00
Thibaut Girka 1a9e78b9bc [Glitch] Add exact attribute to WrappedRoute for community timeline 
Port 46061dc041 to glitch-soc
 2018-12-18 21:39:35 +01:00
Thibaut Girka 1fb4bf87f7 [Glitch] Add media timeline 
Port 7403e5d306 to glitch-soc
 2018-12-18 21:39:35 +01:00