15be0bde8a
[Glitch] Fix image uploads being random data when canvas read access is blocked
...
Port d8d43a427a
2020-11-20 13:41:07 +01:00
b82aa33dea
[Glitch] Add hotkeys for audio/video control
...
Port 04a079e723
2020-11-20 13:40:05 +01:00
8ffae82fa6
Fix minor design issues with fav confirmation modal
2020-11-13 01:14:52 +01:00
3f09d4ca03
Add missing locales to glitch flavor
2020-11-12 22:27:44 +01:00
412fe2ebb0
[Glitch] Add interrelationship icon
...
Port SCSS changes from 148ce97e21
2020-11-12 22:24:24 +01:00
0aeb833317
[Glitch] Add button to dismiss desktop notifications permissions banner
...
Port 4790a126be
2020-11-12 22:23:06 +01:00
e4d62042bd
[Glitch] Add limitation of image's max zoom rate (max to the original size of image)
...
Port f720af6b72
2020-11-07 18:33:16 +01:00
91c2f14fd2
[Glitch] Bump detect-passive-events from 1.0.5 to 2.0.1
...
Port e16b0fb15a
2020-11-07 18:32:09 +01:00
5a9fc749c3
Fix unsightly re-layout delay for media previews
2020-11-04 18:53:52 +01:00
a48dbc78f8
Fix hiding video breaking playback
...
Also make the video player code closer to upstream
2020-11-04 18:53:39 +01:00
dc86d814d9
[Glitch] add mouse scroll lock in image expand view
...
Port f645dad661
2020-11-04 12:24:40 +01:00
40af1cf65b
[Glitch] Add expand/compress image button on image view box
...
Port 6a2db10f76
2020-11-04 12:24:40 +01:00
f5df3d1ae2
[Glitch] Fix width of content text fluctuating over time
...
Port 2ae751f19d
2020-11-04 12:24:40 +01:00
078744f210
[Glitch] Make visibility icon clickable as part of the time of a toot
...
Port 1d07f51039
2020-11-04 12:24:40 +01:00
578e757d09
[Glitch] Make click area of video/audio player buttons bigger in WebUI
...
Port a5afbb62d2
2020-11-03 17:42:40 +01:00
adfaf9551c
[Glitch] Fix some account media gallery items having empty labels
...
Port 9d023ed4f6
2020-11-03 17:38:50 +01:00
37dfb9dddc
[Glitch] Fix wrong seek bar width on media player
...
Port 8d7fbe7dd9
2020-11-03 17:37:53 +01:00
3b96141633
[Glitch] Make “Mark media as sensitive” properly translatable
...
Port c5704e75ae
2020-11-03 17:36:54 +01:00
b8e790c3c2
Fix crash when viewing a profile with a filtered out pinned toot
2020-11-01 16:53:03 +01:00
a81bb14abe
Add option to hide notification markers
2020-10-27 11:20:11 +01:00
49ee69f75f
Add local setting for pop-in player position
2020-10-26 20:51:28 +01:00
ea5298ab9b
Add setting to disable the pop-in player
2020-10-26 20:31:54 +01:00
5ee2b860f9
Respect glitch-soc's reply counter setting in the pop-in player
2020-10-26 20:31:54 +01:00
47edac871c
[Glitch] Fix regressions in icon buttons in web UI
...
Port a549415868
2020-10-26 19:51:09 +01:00
8f950e540b
[Glitch] Add pop-out player for audio/video in web UI
...
port d88a79b456
2020-10-26 19:51:09 +01:00
ddbb9f0ec4
[Glitch] Fix follow request notifications
...
Port 3678b10823
2020-10-26 15:50:48 +01:00
5c60f7eaed
[Glitch] Fix strings that could not be translated
...
Port fb5f3be18f
2020-10-21 21:49:46 +02:00
4ae4b03974
[Glitch] Change how missing desktop notifications permission is displayed
...
Port a69ca29473
2020-10-21 21:49:46 +02:00
dca05c79a9
Move columns-related CSS rules into the appropriate files
2020-10-21 21:28:47 +02:00
b5927301cf
[Glitch] Fix browser notification permission request logic
...
Port f54ca3d08e
2020-10-21 21:28:47 +02:00
78ad04420c
[Glitch] Add duration parameter to muting.
...
Port 96761752ec
2020-10-21 21:28:47 +02:00
813c84cd6c
[Glitch] Change how CDN_HOST is passed down to make assets build reproducible
...
Port 4c45b43cb8
2020-10-21 21:28:47 +02:00
842c048c6b
[Glitch] Fix unread notification marker not updating when mounting column
...
Port dac3e362fd
2020-10-21 19:36:41 +02:00
f7306c7b7c
[Glitch] Ignore alt-key hotkeys in text fields
...
Port 63770d3aac
2020-10-21 19:34:44 +02:00
8071613dd7
[Glitch] Fix mark as read in notifications to be saved immediately
...
Port bec8b12bb5
2020-10-21 19:33:20 +02:00
c3d82027cf
[Glitch] Fix bell button causing a brief “Cancel follow request” on locked accounts
...
Port 82951920f7
2020-10-21 19:24:32 +02:00
29870d2be6
Glitchsoc translation to 'es' language ( #1439 )
...
glitch-soc-specific translation to 'es' language
2020-10-19 22:17:29 +02:00
cd861c051c
Fix issue checking for last unread notification when there are gaps
2020-10-08 22:44:30 +02:00
b5edf30160
Fix boost icon not being displayed in boost notifications
2020-09-29 11:05:05 +02:00
ccfc2b6dce
Make explicit in glitch-soc's WebUI when an account is suspended
2020-09-28 18:00:49 +02:00
dadec533ce
[Glitch] Fix unreadable placeholder text color in high contrast theme in web UI ( #14803 )
...
Port bbcbf12215
2020-09-28 17:56:16 +02:00
6dde075425
Fix actions being performed before the redux state is set up
2020-09-28 17:49:55 +02:00
f8205b7b4a
[Glitch] Add paragraph about browser add-ons when encountering some errors
...
Port b67caf9be4
2020-09-28 17:49:55 +02:00
14869ee656
[Glitch] Add option to be notified when a followed user posts
...
Port 974b1b79ce
2020-09-28 17:49:55 +02:00
0a069bffd9
[Glitch] Optimize the process of following someone
...
Port front-end changes from 6d59dfa15d
2020-09-28 17:49:55 +02:00
6775de3fc9
[Glitch] Change web UI to show empty profile for suspended accounts
...
Port fcb9350ff8
2020-09-28 17:49:55 +02:00
572d1a1bf8
[Glitch] Fix home TL marker code mishandling gaps
...
Port eaea2311aa
2020-09-28 15:00:19 +02:00
4586202448
[Glitch] Fix notification filter bar incorrectly filtering gaps
...
Port aab867b0e8
2020-09-28 14:59:10 +02:00
d31792a2a6
[Glitch] Add border around 🕺 emoji
...
Port 91eecd1b3c
2020-09-28 14:58:25 +02:00
787d5d7289
Fix minor bugs
2020-09-19 15:01:46 +02:00
312c936d51
Minor refactoring and fixups
2020-09-19 14:15:28 +02:00
85b9086e6b
Filter out mounted lists from “getting started” column
2020-09-18 20:07:25 +02:00
a681980307
Submit timeline markers closer to the moment they change
2020-09-17 15:22:56 +02:00
60eebc6cc4
Fix crashes when connection drops
2020-09-17 15:22:56 +02:00
f1c0cf9806
Add button to manually mark all notifications as read
2020-09-17 15:22:56 +02:00
94c290d7d2
Only update read marker when giving focus/mounting column
2020-09-17 15:22:56 +02:00
145ed37978
Refactor and change logic to only update marker if we reached the last
...
read notification.
2020-09-17 15:22:56 +02:00
66e9a77e36
Display unread marker for notifications
2020-09-17 15:22:56 +02:00
ae698469d0
Clean up leftover from DM conversation view redesign
2020-09-17 15:22:56 +02:00
afa753a890
[Glitch] Set z-index of dropdown to 9999.
...
Port 678f5ed296
2020-09-10 17:44:38 +02:00
787a629b8f
[Glitch] Update Tesseract.js
...
Port 5fc5a9f9f1
2020-09-01 17:10:20 +02:00
a2d66a90e6
[Glitch] Add border around 🐞 emoji
...
Port JS change from f0b6ddd979
2020-09-01 17:08:09 +02:00
d95dd3883e
Change radio button design to be consistent with that of the directory explorer
...
Signed-off-by: Thibaut Girka <thib@sitedethib.com>
2020-09-01 14:09:35 +02:00
70e64206be
Capitalize replies_policy strings
...
Signed-off-by: Thibaut Girka <thib@sitedethib.com>
2020-09-01 14:09:35 +02:00
e02f375d22
Fix threaded mode
...
Fixes #1414
2020-09-01 09:37:17 +02:00
38182fceb3
Fix crash when opening detailed view of a status you boosted
2020-08-31 23:48:16 +02:00
a340e653df
[Glitch] Add WebAuthn as an alternative 2FA method
...
Port CSS changes from e8d41bc2fe
2020-08-30 17:21:16 +02:00
bf55b5463a
[Glitch] Fix: also use custom private boost icon for detailed status
...
Port a3ec9af9b0
2020-08-30 16:51:16 +02:00
72b1d5fdc5
[Glitch] Better manage subscriptionCounters
...
Port 9669557be1
2020-08-30 16:35:33 +02:00
3bbf6b1519
[Glitch] reword "boost to original audience" as per tootsuite#14596
...
Port 46210a65d1
2020-08-30 16:34:38 +02:00
cd806663af
[Glitch] Fix click range discrepancies in gifv
...
Port debf6ae316
2020-08-30 16:31:41 +02:00
45d1f34a30
[Glitch] Fix scrolling issues when closing some dropdown menus
...
Port c7cfd4e67a
2020-08-30 16:31:02 +02:00
30632adf9e
Fix replying to some remote toots switching to local-only
2020-08-29 19:57:32 +02:00
f1d31cf18d
Fix spacing around reblog counter in detailed statuses
...
And bring the whole thing closer to upstream's code.
2020-08-24 20:03:37 +02:00
5dcc406abe
Change styling to always have scrollbar on search results
2020-08-17 15:46:18 +02:00
d4b65193c7
Fix WebUI crash in edge case when media display size causes scroll
...
Fixes #1406
2020-08-17 15:46:18 +02:00
e5dbdebc31
Fix styling of display names and account handles, make it closer to upstream
2020-08-13 23:32:29 +02:00
0f71372d63
[Glitch] Add client-side validation in password change forms
...
Port 7dc4c74265
2020-08-13 22:26:22 +02:00
b6c0f1fdc6
[Glitch] Add HTML form validation for the registration form
...
Port d70c3ab4c3
2020-08-13 22:25:33 +02:00
660188c900
Fix local-only flag not necessarily being preserved on delete & redraft
2020-08-12 00:02:44 +02:00
0376b6b92b
Fix new audio player when under content warnings
2020-08-11 22:37:51 +02:00
8ae52dc792
[Glitch] Add support for managing multiple stream subscriptions in a single connection
...
Ported ef057584fd
2020-08-11 19:40:35 +02:00
a3806ec6ba
[Glitch] Fallback to previous, more approximative hashtag RE on older browsers
...
Signed-off-by: Thibaut Girka <thib@sitedethib.com>
2020-08-05 13:43:32 +02:00
8f0e6122a9
[Glitch] Fix audio player on Safari
...
Port 635b6a0f1a
2020-08-02 22:30:51 +02:00
de7ba22c45
[Glitch] Fix new audio player features not working on Safari
...
Port 51b5bb5301
2020-08-02 14:35:40 +02:00
8f3295f212
[Glitch] Fix wrong proptypes for onEditAccountNote
...
Port 5faf2de938
2020-08-02 14:34:56 +02:00
1d8e930445
[Glitch] Fix the hashtag judgment of the compose form to be the same as the server side
...
Port cd94854e7d
2020-08-02 14:33:22 +02:00
5e93c7359d
Fix custom boost icon colors being swapped
2020-07-24 11:58:09 +02:00
b136e621ea
[Glitch] Add custom icon for private boosts
...
Port 956473142c
2020-07-24 11:29:20 +02:00
59e0eb1ba0
[Glitch] Change disabled retweet icon
...
Port e93efc0309
2020-07-22 22:57:57 +02:00
855ada7e93
Fix “Show less for all”/”Show more for all” eye icon not reflecting state
2020-07-22 22:53:10 +02:00
f8e315cd74
[Glitch] Fix keyboard navigation in scrollable lists
...
Port 98f6380dee
2020-07-22 13:51:44 +02:00
4412e2579c
[Glitch] Fix following_counter plural to include "one"
...
Port 17b1d71536
2020-07-22 13:50:58 +02:00
9bdad8f14e
[Glitch] Fix audio player controls color in mastodon-light theme
...
Port 85bc0f9639
2020-07-22 13:50:15 +02:00
f94cb94767
[Glitch] Fix error when closing a playing audio or video modal
...
Port bfed7dd5f3
2020-07-16 14:44:53 +02:00
470458da13
Fix style of visibility icon in boost modal
2020-07-15 16:04:56 +02:00
610f71db7a
[Glitch] Add a visibility icon to boost modal
...
Port 8b35ed96c0
2020-07-15 15:50:09 +02:00
dad3132046
[Glitch] Fix audio and video items in account gallery in web UI
...
Port 6cc5b822f5
2020-07-15 15:48:24 +02:00
3fbcc4871f
[Glitch] Fix block/mute pagination in WebUI
...
Port 38579b9f74
2020-07-10 18:49:33 +02:00
66c0953c33
[Glitch] Improve safety of Blurhash component
...
Port 3ef94c0044
2020-07-10 17:08:31 +02:00
0520273573
[Glitch] Audio player visualization improvements
...
Port a2abe35e0f
2020-07-10 17:07:41 +02:00
e248399220
[Glitch] Freeze scroll position when a dropdown menu is open in the TL
...
Port 6fda3cbbeb
2020-07-10 17:05:44 +02:00
042c32ea3b
[Glitch] Replace repetitive blurhash code with component ( #14267 )
...
Port 61c07c3731
2020-07-10 16:59:53 +02:00
d42a23fdbe
Fix clicking the audio player also opening toots in detailed view
2020-07-10 10:28:05 +02:00
0fe5deae89
Change styling of account note editing buttons
...
Co-Authored-By: Mélanie Chauvel (ariasuni) <perso@hack-libre.org>
2020-07-09 12:19:43 +02:00
11446be6d1
[Glitch] Fix new accent color not refreshing when changing thumbnail for audio uploads
...
Port 0d2135a461
2020-07-08 15:26:28 +02:00
b27eecdbfc
[Glitch] Fix WebUI crash on sensitive preview card with no preview thumbnail
...
Port d308a863fb
2020-07-08 15:26:02 +02:00
a513997367
[Glitch] Fix WebUI crash on sensitive preview card with no preview thumbnail
...
Port 2581715491
2020-07-08 15:25:31 +02:00
4acb7efb4b
Merge pull request #1372 from ThibG/glitch-soc/fixes/local-only-public-option
...
Add option to show local-only toots in public timeline
2020-07-07 19:58:12 +02:00
64b6c20676
Change styling and layout of account notes UI
2020-07-07 19:25:42 +02:00
a9b13804e2
Change account note placeholder name since the design has diverged upstream
2020-07-07 19:25:42 +02:00
170b38c3f4
Fix being unable to add account notes
2020-07-07 19:25:42 +02:00
a3ac322ded
[Glitch] Replace shortNumberFormat with <ShortNumber>
...
Port cb2adaaf9d
2020-07-07 19:25:06 +02:00
6c7ac1b48f
[Glitch] Add ability to choose media thumbnail in web UI
...
Port 06fc6a9cd4
2020-07-07 15:58:49 +02:00
8b17d47e12
[Glitch] Fix hashtag column options styling
...
Port a783bdf4ad
2020-07-07 15:58:49 +02:00
d973e11061
Add UI option to show local-only toots in public timeline
2020-07-06 21:12:06 +02:00
69cddc3909
[Glitch] Add color extraction for audio thumbnails
...
Port 99f3a55540
2020-07-05 20:18:51 +02:00
ad73e05f46
[Glitch] Fix audio modals not using blurhash and poster
...
Port 162adf61f2
2020-07-05 20:18:51 +02:00
9b3677d509
[Glitch] Add customizable thumbnails for audio and video attachments
...
Port 64aac30733
2020-07-02 17:31:09 +02:00
8999eea707
[Glitch] Fix various issues around OpenGraph representation of media
...
Port audio player changes from 662a49dc3f
2020-07-02 17:31:09 +02:00
06309129be
[Glitch] Fix audio/video/images/cards not reacting to window resizes in web UI
...
Port bb9ca8a587
2020-07-02 17:31:09 +02:00
1c58420831
[Glitch] Change volume control and download buttons in web UI
...
Port 419ad6248b
2020-07-02 17:31:09 +02:00
1ad79d11f3
[Glitch] Fix audio player not working when media files are hosted on a different domain
...
Port aaf91abffa
2020-07-02 17:31:09 +02:00
ad978ab1d4
[Glitch] Change design of audio players in web UI
...
Port 75a2b8f815
2020-07-02 17:31:09 +02:00
1c8eb9bcf7
[Glitch] Fix the conditions for incomplete remote content
...
Port 7548a474a5
2020-07-02 13:58:50 +02:00
f60c78ff3e
[Glitch] Fix cursor type in statuses
...
Port e9ea960773
2020-07-01 20:18:07 +02:00
24508bb837
[Glitch] Fix lock icon not being shown when locking account in profile settings
...
Port 4babf5b8b5
2020-07-01 20:13:51 +02:00
511edccf61
[Glitch] Add user notes on accounts
...
Port 65506bac3f
2020-06-30 23:32:02 +02:00
50f5254568
[Glitch] Fix padding on account header
...
Port d1c6dd2d27
2020-06-30 23:10:44 +02:00
befe8c72dd
[Glitch] Fix read marker state not being udpated internally
...
Port fa4876a1b9
2020-06-30 23:09:39 +02:00
934bacd05f
[Glitch] Change sensitive preview cards to not blur text
...
Port a1ad2ad951
2020-06-30 23:08:24 +02:00
de735286cd
Fix public page CSS to match upstream's changes
...
Kind of a port of 418f0a33e9
2020-06-26 13:45:40 +02:00
4964490bbd
[Glitch] Improve appearence consistency of settings pages
...
Port 08cf81f8c1
2020-06-26 13:31:17 +02:00
327f6309e4
[Glitch] Fix design issues with sensitive preview cards
...
Port 1d2b0d2121
2020-06-26 13:28:52 +02:00
9a26d2e127
[Glitch] Fix avatar size in public page detailed status
...
Port 0a56a4a1bc
2020-06-26 13:27:39 +02:00
2bb25c7730
[Glitch] Fix various issues around OpenGraph representation of media
...
Port front-end changes (except for audio player) from 662a49dc3f
2020-06-26 13:23:56 +02:00
72d193654b
[Glitch] Fix very wide media attachments resulting in too thin a thumbnail
...
Port d469247083
2020-06-24 16:01:28 +02:00
83bc9f68af
[Glitch] Fix modifier key to keep the EmojiPicker on macOS
...
Port 434a6d0b15
2020-06-24 15:56:43 +02:00
51922d7ffa
[Glitch] Fix unnecessary gap under of video modal
...
Port cb3c6d1780
2020-06-24 15:55:53 +02:00
5d12b63e79
Simplify filtering condition
2020-06-23 16:09:36 +02:00
c1377049c6
never filter own posts from timeline
2020-06-23 16:09:36 +02:00
9a641a5a0e
[Glitch] Add hints about incomplete remote content to web UI
...
Port 3e9dc4044b
2020-06-17 17:48:04 +02:00
65a9b788fc
[Glitch] Fix initial audio volume not corresponding to what's displayed
...
Port 755e8c76ab
2020-06-17 17:20:14 +02:00
45fbba2742
[Glitch] Fixed emoji detection problem to append border
...
Port b1484cf3ce
2020-06-17 17:18:42 +02:00
e9d7ca7645
[Glitch] Fix WebUI crash when loading account data before page is loaded
2020-06-09 11:55:07 +02:00
00cd919750
[Glitch] Add hotkey for toggling content warning composer field
...
Port 6b6a9d0ea3
2020-06-09 11:14:20 +02:00
304721edc1
[Glitch] Improve rendering of emoji which do not contrast with background
...
Port db319c0fdc
2020-06-09 11:07:32 +02:00
4657c1a1ca
[Glitch] FIX: filters ignore media descriptions
...
Port c66403b257
2020-06-09 11:02:24 +02:00
776aff9656
[Glitch] Hide sensitive preview cards with blurhash
...
Port 8e96510b25
2020-06-09 11:01:31 +02:00
2da2f7f7c2
[Glitch] Fix ref attr for react-textarea-autozsize
...
Signed-off-by: Thibaut Girka <thib@sitedethib.com>
2020-06-09 10:55:52 +02:00
c225ac8b9e
[Glitch] Adjust flash alert contrast for better readability
...
Port b4a8400afd
2020-06-01 18:31:45 +02:00
a8559458c3
[Glitch] Allow Ctrl-click to keep EmojiPicker window open
...
Port 64154c5161
2020-06-01 18:31:42 +02:00
1f94f4009e
Improve appearance of notification cleaning UI
...
- Use smaller font-size for consistency with the rest of the UI
- Make better use of the horizontal space when available
2020-06-01 12:28:27 +02:00
9707dbee6f
[Glitch] Fix timeline markers in Firefox
...
Port cc650bc023
2020-05-29 20:02:30 +02:00
9bd30b8dd5
[Glitch] Fix timeline markers not working on Chrome
...
Port 5aff2a6957
2020-05-29 20:02:30 +02:00
e8714530a4
Fix local-only hashtag columns
2020-05-28 15:21:16 +02:00
7a74e46b77
Fix one import being made on mastodon's codebase instead of glitch-soc's
2020-05-28 15:14:12 +02:00
0b01492276
[Glitch] Change wording from “Hide media” to “Hide image/images” in Web UI
...
Port 40d81620b0
2020-05-28 14:08:05 +02:00
44ea965557
[Glitch] Fix local streaming of hashtag timelines
...
Port 3a1a21ad57
2020-05-28 14:05:21 +02:00
c8cee24cb3
Fix Cmd-Enter not working to send toot
...
Fixes #1333
2020-05-26 10:15:35 +02:00
2b75728a80
[Glitch] Fix regression in sparkline style in web UI
...
Port c9dcc2d39f
2020-05-14 18:50:57 +02:00
d147dd7588
[Glitch] Change “hide/show boosts from …” menu to be hidden when the account is muted
...
Port 92f85bea52
2020-05-13 23:17:10 +02:00
ef2f98317a
[Glitch] Fix some account avatars on public pages having incorrect size
...
Port 48503384d0
2020-05-13 23:17:10 +02:00
6a17fa2b99
[Glitch] Fix first poll option not being focused when adding a poll
...
Port af6d356279
2020-05-13 23:17:10 +02:00
559214c33f
[Glitch] Add remote only to public timeline
...
Port 26b08a3c54
2020-05-10 16:19:59 +02:00
51508e5061
[Glitch] Fix use of inline CSS in public pages
...
Port c0b849bdfd
2020-05-10 16:19:59 +02:00
89fcd68b75
[Glitch] Fix admin-facing uses of inline CSS
...
Port b8ba977497
2020-05-03 21:47:58 +02:00
7ea8b07b93
[Glitch] Fix page incorrectly scrolling when bringing up dropdown menus
...
Port 77ec0875ea
2020-05-03 21:47:11 +02:00
9e5a216878
[Glitch] Fix end-user-facing uses of inline CSS
...
Port 0e362b7678
2020-05-03 21:44:43 +02:00
4a5f93c25f
[Glitch] Refactor/cleanup TIMELINE_DELETE-related code
...
Port ad9c7aefe6
2020-05-03 21:42:13 +02:00
502a0365df
[Glitch] Fix messed up z-index when NoScript blocks media/previews
...
Port 04eb599864
2020-05-03 21:41:15 +02:00
a22e6a3683
Merge branch 'master' into glitch-soc/merge-upstream
...
Conflicts:
- `app/controllers/statuses_controller.rb`:
Upstream disabled the embed controller for reblogs.
Not a real conflict, but glitch-soc has an extra line to deal
with its theming system.
Ported upstream changes.
- `app/javascript/packs/public.js`:
Upstream made changes to get rid of most inline CSS, this changes
javascript for public pages, which in glitch are split between
different files. Ported those changes.
- `app/models/status.rb`:
Upstream changed the block check in `Status#permitted_for` to
include domain-block checks. Not a real conflict with glitch-soc,
but our scope is slightly different, as our scope for
unauthenticated access do not include instance-local toots.
Ported upstream changes.
- `app/serializers/rest/instance_serializer.rb`:
Not a real conflict, upstream added a new field to the instance
serializer, the conflict is one line above since we added more of
that.
Ported upstream changes.
- `app/views/settings/profiles/show.html.haml`:
Upstream got rid of most inline CSS and moved hidden elements
to data attributes in the process, in fields were we have
different values.
Ported upstream changes while keeping our glitch-specific
values.
- `app/views/statuses/_simple_status.html.haml`:
Upstream got rid of inline CSS on an HAML line we treat
differently, stripping empty text nodes.
Ported upstream changes to the style attribute, keeping
the empty text node stripping behavior.
2020-05-03 21:23:49 +02:00
9d41a410a3
[Glitch] Fix uninformative error message when uploading unsupported image files
...
Port be637146f3
2020-04-25 15:29:01 +02:00
572e89e563
[Glitch] Fix expanded video player issues
...
Port c955f98d36
2020-04-25 15:28:16 +02:00
0f4a8a6487
[Glitch] Set max-width and max-height to gif video
...
Port c5c8f68031
2020-04-25 15:26:42 +02:00
ce33822e2c
[Glitch] Fix and refactor keyboard navigation in dropdown menus
...
Port 80182eda62
2020-04-25 15:24:02 +02:00
221ea4787f
[Glitch] Update Twemoji to 12.1.5
...
Port emoji_map.json changes from 29f5353f8b
2020-04-20 16:54:01 +02:00
7ceeb97f3d
[Glitch] Add local only to hashtag timeline
...
Port front-end changes from 2c7128c7f0
2020-04-20 16:52:56 +02:00
bf9da1e734
[Glitch] Fix uploaded image orientation in some browsers
...
Port a1ce9cbb67
2020-04-18 15:48:15 +02:00
81ef26b67d
[Glitch] Fix not being able to vote
...
Port e12a5635da
2020-04-17 22:04:10 +02:00
4849752a9c
[Glitch] Fix Poll fetchPoll action not being debounced.
...
Port ab8d7c0680
2020-04-17 20:20:06 +02:00
a08a2130f0
[Glitch] Fix WebUI pagination of following, followers, follow requests, blocks and mutes lists
...
Port ec31b1b752
2020-04-12 17:01:41 +02:00
51bbf0b68d
Clean up some dead code
2020-04-10 14:47:06 +02:00
5d2cdeb225
Fix deprecated use of createBrowserHistory
2020-04-09 17:03:05 +02:00
9101254d0a
Merge branch 'master' into glitch-soc/merge-upstream
...
Conflicts:
- `app/javascript/packs/public.js`:
Upstream modified code that we split between multiple files due
to glitch-soc's theming system.
Ported those changes.
2020-04-05 18:32:06 +02:00
fd7a37c371
[Glitch] Add explanation as to why unlocked accounts may have follow requests
...
Port d3ff06a320
2020-04-04 21:59:49 +02:00
7d5b43d8bb
[Glitch] Add ability to filter audit log in admin UI
...
Port f65568f1d4
2020-04-04 21:53:31 +02:00
b367dd713e
[Glitch] Improve polls: option lengths & redesign
...
Port 37b3985bfa
2020-04-02 20:52:53 +02:00
2e337d850f
[Glitch] Improve toot clicking areas
...
Port part of 1fb92037e4
2020-04-02 20:49:43 +02:00
9175ebf20c
[Glitch] Fix content warning being unnecessarily cleared when enabling/disabling CW
...
Port cf1fa73347
2020-04-02 20:45:46 +02:00
dcf841545d
[Glitch] Fix wrong color for ellipsis in boost confirmation dialog in Web UI
...
Port be2f1597cf
2020-04-02 20:45:03 +02:00
3eede6f64b
[Glitch] Fix 404 and 410 API errors being silently discarded in WebUI
...
Port front-end changes from 0d117c106a
2020-04-02 20:39:44 +02:00
faa56643b8
[Glitch] Fix frontend crash when deleting announcements
...
Port 858d0dd168
2020-03-27 22:06:42 +01:00
60338b2bee
[Glitch] Change poll option hover/active styling to be less confusing
...
Port beb80adb51
2020-03-27 22:06:06 +01:00
9da4bd098c
[Glitch] Fix frontend crash when deleting announcements
...
Port 8758221e73
2020-03-22 16:31:01 +01:00
0ff78befc6
[Glitch] Fix regression in “Edit media” modal in web UI
...
Port 90f3a00062
2020-03-22 16:30:19 +01:00
912f4a2eba
[Glitch] Change the string "hidden" to "blocked" in WebUI
...
Port 310d729745
2020-03-22 16:29:51 +01:00
295dadc9f0
[Glitch] Change local media attachments to perform heavy processing asynchronously
...
Port front-end part of 9660aa4543
2020-03-22 16:26:26 +01:00
9abb227250
Merge branch 'master' into glitch-soc/merge-upstream
...
Conflicts:
- `README.md`:
Our README.md files are completely different. Discarded upstream changes.
- `app/javascript/core/admin.js`:
Updating rails-ujs, no real conflict, but a comment to close to changed
code. Various glitch-soc-only files have been updated to match those changes,
though.
- `package.json`:
No real conflict, just an additional dependency in glitch-soc that was too
close to something updated upstream. Took upstream's changes.
2020-03-22 16:10:44 +01:00
7115b0b8c9
Fix missing media description dialog when sending toots with keyboard shortcuts
2020-03-14 14:59:14 +01:00
ThibG