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
|
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 |
|
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 |
|
Alex Gleason
|
e58841ad21
|
Merge branch 'edit_profile_checkbox_toggle' into 'develop'
Fixed features/edit_profile checkbox issues. Fixes #261 and #284
Closes #284 and #261
See merge request soapbox-pub/soapbox-fe!123
|
2020-08-10 20:24:43 +00:00 |
|
Mary Kate
|
e6b5ef24eb
|
list markdown hotfix
|
2020-08-10 15:20:09 -05:00 |
|
Mary Kate
|
5349045e51
|
Revert "only render emoji selector in the dom when needed"
This reverts commit 769a512445.
|
2020-08-10 15:06:39 -05:00 |
|
Mary Kate
|
42a7a61ce7
|
border radius fixes
|
2020-08-10 15:05:24 -05:00 |
|
Curtis
|
bb5091a979
|
Merge branch 'develop' into 'edit_profile_checkbox_toggle'
# Conflicts:
# app/soapbox/features/edit_profile/index.js
|
2020-08-10 19:08:29 +00:00 |
|
crockwave
|
40dbfbb5da
|
Re-enabled attempt to use bot checkbox in profile_edit. Refactored shouldAppend method
|
2020-08-10 13:53:02 -05:00 |
|
Alex Gleason
|
84de5be8c9
|
Merge branch 'new_upload_icon' into 'develop'
New upload icon, fixes #282
Closes #282
See merge request soapbox-pub/soapbox-fe!146
|
2020-08-10 18:00:59 +00:00 |
|
Sean King
|
10d1010265
|
New upload icon
|
2020-08-10 11:49:38 -06:00 |
|
Mary Kate
|
6ac0c615fe
|
fixes #278, large awaiting approval button
|
2020-08-10 12:23:59 -05:00 |
|
Mary Kate
|
5998f52e9f
|
fix relationship not loading on hover card
|
2020-08-10 12:08:32 -05:00 |
|
Alex Gleason
|
3fc91c2c1d
|
Revert "Merge branch 'bullet_point_css' into 'develop'"
This reverts commit bf3de8adc5, reversing
changes made to a892e3ce81.
|
2020-08-10 10:48:41 -05:00 |
|
Alex Gleason
|
4fed326bd5
|
Merge branch 'poll_x' into 'develop'
Fix poll X button, fixes #281
Closes #281
See merge request soapbox-pub/soapbox-fe!144
|
2020-08-10 15:37:45 +00:00 |
|
Sean King
|
02a1bb47cf
|
Fix poll X button
|
2020-08-10 09:25:57 -06:00 |
|
Alex Gleason
|
bf3de8adc5
|
Merge branch 'bullet_point_css' into 'develop'
Fix bullet point css issue, fixes #279
Closes #279
See merge request soapbox-pub/soapbox-fe!143
|
2020-08-10 04:49:00 +00:00 |
|
Sean King
|
f3893effbe
|
Fix bullet point css issue
|
2020-08-09 22:27:55 -06:00 |
|
Alex Gleason
|
a892e3ce81
|
Merge branch 'toggle_css' into 'develop'
Fix toggle CSS, fixes #277
Closes #277
See merge request soapbox-pub/soapbox-fe!141
|
2020-08-09 21:35:05 +00:00 |
|
Sean King
|
c91ca7edd6
|
Fix toggle CSS
|
2020-08-09 15:23:27 -06:00 |
|
Alex Gleason
|
b30dc39f1a
|
Bio fixes
|
2020-08-09 15:13:36 -05:00 |
|
Alex Gleason
|
695a78503d
|
Verified ['pleroma', 'tags'] fix
|
2020-08-09 14:55:32 -05:00 |
|
Alex Gleason
|
d9579831e0
|
Merge remote-tracking branch 'origin/multi_line_bio' into develop
|
2020-08-09 14:45:31 -05:00 |
|
Alex Gleason
|
504e36c7d8
|
Fix linter
|
2020-08-09 14:44:56 -05:00 |
|