Wykres commitów

939 Commity (e9e55749cf154790cee71180e129483f99e11167)

Autor SHA1 Wiadomość Data
Alex Gleason e9e55749cf Merge branch 'more-corner-nonsense' into 'develop'
Fix corners on DMs

See merge request soapbox-pub/soapbox-fe!176
2020-08-16 16:18:51 +00:00
Mary Kate 37744b60be corners on DMs 2020-08-16 10:58:51 -05:00
Alex Gleason fb16afb8f7 Merge branch 'remove-endorse-button' into 'develop'
remove endorse button from the profile header menu and some related funcs, fixes #328

Closes #328

See merge request soapbox-pub/soapbox-fe!174
2020-08-16 15:53:10 +00:00
Mary Kate 9864966eb0 remove endorse button from the profile header menu and some related funcs, fixes #328 2020-08-16 10:42:55 -05:00
Alex Gleason 3da44d60bf
Revert direct_timeline to use /api/v1/timelines/direct, fixes #325 2020-08-15 23:37:50 -05:00
Alex Gleason ca333c9552
Start refactoring direct_timeline / conversations 2020-08-15 23:18:53 -05:00
Alex Gleason 7f824207c0 Merge branch 'oembed-video' into 'develop'
Refactor oembed card to work with videos on Pleroma

See merge request soapbox-pub/soapbox-fe!172
2020-08-16 00:51:51 +00:00
Alex Gleason 9afac986fb
Refactor oembed card to work with videos on Pleroma 2020-08-15 19:40:08 -05:00
Alex Gleason 30ebdf30ff Merge branch 'hovertoplay-error-hotfix' into 'develop'
Check src exists first in hoverToPlay, hopefully fixes #322

Closes #322

See merge request soapbox-pub/soapbox-fe!169
2020-08-15 21:36:00 +00:00
Mary Kate 02c7325e4d Check src exists first in hover to play, hopefully fixes #322 2020-08-15 16:24:34 -05:00
Alex Gleason 99d96ed901
Fix login issues due to no pleroma_settings_store fallback 2020-08-15 14:43:34 -05:00
Alex Gleason 799915039b Merge branch 'profile-media-panel' into 'develop'
Add profile media panel

Closes #294

See merge request soapbox-pub/soapbox-fe!162
2020-08-15 03:44:44 +00:00
Mary Kate dd0b0c911f remove proile media panel from right sidebar on medium screens 2020-08-14 22:34:22 -05:00
Alex Gleason 208f9f8821
Merge remote-tracking branch 'origin/dm-load-indicator' into develop 2020-08-14 21:16:33 -05:00
Mary Kate 50ccb6d010 add loading indicator to DMs, fixes #316 2020-08-14 21:11:36 -05:00
Alex Gleason 7340d4c106 Merge branch 'muted-timelines-fix' into 'develop'
Show statuses on muted profiles, fixes #301

Closes #301

See merge request soapbox-pub/soapbox-fe!166
2020-08-15 01:49:52 +00:00
Mary Kate bafe8bd428 show statuses on muted profiles, fixes #301 2020-08-14 20:34:19 -05:00
Mary Kate 368baf818e Merge branch 'profile-media-panel' of gitlab.com:soapbox-pub/soapbox-fe into profile-media-panel 2020-08-14 17:46:44 -05:00
Mary Kate 68daa5fbe9 use cover rather than contain on media gallary except on statuses 2020-08-14 17:46:21 -05:00
Alex Gleason 0f132fd3b7 Merge branch 'blocked-account-error' into 'develop'
Fix 504 error when visiting account you've blocked

Closes #310

See merge request soapbox-pub/soapbox-fe!164
2020-08-14 22:33:41 +00:00
Mary Kate c6a4db7528 Fix 504 error when visiting account you've blocked 2020-08-14 17:23:31 -05:00
Alex Gleason 39d9b20431
Merge remote-tracking branch 'origin/develop' into profile-media-panel 2020-08-14 16:25:25 -05:00
Alex Gleason e70e4db809 Merge branch 'timeline-queue-filters' into 'develop'
Fix timeline queue header when filters are enabled, fixes #306

Closes #306

See merge request soapbox-pub/soapbox-fe!163
2020-08-14 21:25:02 +00:00
Alex Gleason fdbe981477
Fix timeline queue header when filters are enabled 2020-08-14 16:01:30 -05:00
Mary Kate 30983571b1 add profile media panel 2020-08-14 14:32:32 -05:00
Alex Gleason bd65a1b3f5
Filter out reposts in local timeline by default, fixes #307 2020-08-14 12:42:03 -05:00
Alex Gleason c766e5cd57 Merge branch 'style-hotfixes' into 'develop'
slight overflow improvements, fixes #303

Closes #303

See merge request soapbox-pub/soapbox-fe!160
2020-08-14 01:37:36 +00:00
Alex Gleason bb5854c310 Merge branch 'remove_duplicate_quick_filter' into 'develop'
Remove dupilcate Quick Filter bar toggle in notification settings, fixes #296

Closes #296

See merge request soapbox-pub/soapbox-fe!158
2020-08-14 01:37:08 +00:00
Mary Kate dc9f5c3a6a slight overflow imrpovements, fixes #303 2020-08-13 15:48:33 -05:00
Alex Gleason 101f519d4b
Spinster migration hotfix: fix locale set to "" 2020-08-13 04:46:45 -05:00
Alex Gleason e7bd011495
Streaming: Add locale fallback for invalid locale 2020-08-13 04:20:35 -05:00
Alex Gleason 6652df35b3
Run `yarn manage:translations` 2020-08-13 03:45:58 -05:00
Alex Gleason bf0e85bac4 Merge branch 'markdown-nested-blockquote' into 'develop'
styles for nested markdown, fixes #295

Closes #295

See merge request soapbox-pub/soapbox-fe!159
2020-08-13 01:24:16 +00:00
Mary Kate 16d68e0bef styles for nested markdown, fixes #295 2020-08-12 15:09:21 -05:00
Sean King d49d8bc145 Remove dupilcate quickFilter in notification settings 2020-08-12 13:39:13 -06:00
Alex Gleason 0dbb1ecdbd Merge branch 'markdown-blockquote' into 'develop'
update markdown styles, fixes #290

Closes #290

See merge request soapbox-pub/soapbox-fe!156
2020-08-12 05:24:13 +00:00
Mary Kate 45ded363f1 update markdown styles 2020-08-11 18:31:16 -05:00
Alex Gleason 34bf11f512 Merge branch 'media-compose-placeholders' into 'develop'
Add video and audio media placeholders in compose form

Closes #234

See merge request soapbox-pub/soapbox-fe!152
2020-08-11 19:23:44 +00:00
Alex Gleason 81f42b60b1 Merge branch 'translate_fp' into 'develop'
Translation strings for FeaturesPanel, fixes #288

Closes #288

See merge request soapbox-pub/soapbox-fe!153
2020-08-11 03:24:14 +00:00
Sean King 72433b6bd0 Translation strings for FeaturesPanel 2020-08-10 21:03:28 -06:00
Mary Kate c4046cbf7e add video and audio media placeholders in compose form 2020-08-10 20:59:24 -05:00
Alex Gleason 37afaaa894 Merge branch 'fix-video-blackscreen' into 'develop'
Remove unnecessary video preview url that was breaking video previews

See merge request soapbox-pub/soapbox-fe!151
2020-08-11 00:12:26 +00:00
marykatefain 202b8e145f Revert "Remove unnecessary video preview url that was fixing video previews"
This reverts commit f56e156d21f2c8a815aca2aa1445e659295f4218.
2020-08-11 00:12:26 +00:00
Alex Gleason 767a491aa9 Merge branch 'redraft-remove-media' into 'develop'
Remove broken media upload from Del & Redraft composer

See merge request soapbox-pub/soapbox-fe!150
2020-08-10 23:29:26 +00:00
Mary Kate 5b3accdc53 Hotfix to remove media uploads entirely on del and redraft compose form since it was tricking user into thinking it would retain the media when submitted 2020-08-10 18:18:23 -05:00
Alex Gleason b90c6b7de7 Merge branch 'list-overflow-hotfix' into 'develop'
fix overflow on list index

See merge request soapbox-pub/soapbox-fe!149
2020-08-10 21:46:22 +00:00
Mary Kate e85baee486 fix overflow on list index 2020-08-10 16:35:34 -05:00
Alex Gleason c9b925d252
Fix edit profile checkbox state, fixes #261 #284 2020-08-10 16:17:39 -05:00
Alex Gleason 1697731ad7 Merge branch 'markdown-hotfix' into 'develop'
list markdown hotfix

Closes #279

See merge request soapbox-pub/soapbox-fe!148
2020-08-10 20:30:53 +00:00
Alex Gleason ae8c1b88d4 Merge branch 'small-fixes' into 'develop'
Small fixes

Closes #278 and #266

See merge request soapbox-pub/soapbox-fe!147
2020-08-10 20:28:14 +00:00