miklo
/
soapbox
sforkowany z mirror/soapbox
1
0
Forkuj 0
Kod Zgłoszenia Oczekujące zmiany Packages Projekty Wydania Wiki Aktywność
1 345 Commity
176 Gałęzie
14 Tagi
48 MiB
Wykres commitów

1101 Commity (896a94d8b990216454fe6a6220ef7663a7318bf7)

Autor SHA1 Wiadomość Data
Alex Gleason 4b22726016
Lower .floating-nav-link z-index to be below chat panes 2020-08-27 22:31:43 -05:00
Alex Gleason cd30d79b5b
Chats: render independent ChatIndex for mobile 2020-08-27 22:11:15 -05:00
Sean King 6872568d9e Add .wav audio as supported file type 2020-08-27 20:31:07 -06:00
Alex Gleason 8a8953a787
Chats: decrease font size slightly 2020-08-27 19:28:46 -05:00
Alex Gleason e682c3db28
Chats: use textarea instead of input 2020-08-27 19:25:16 -05:00
Alex Gleason 3fbdce6901
Chats: mark as read when the input is focused 2020-08-27 18:06:25 -05:00
Alex Gleason a349bce10f
Chats: show message date on hover 2020-08-27 17:27:37 -05:00
Alex Gleason abd6c419f1
Chats: hide for mobile (for now) 2020-08-27 16:54:07 -05:00
Alex Gleason 22063ae3c8
Chats: replace avatar with unread counter 2020-08-27 16:41:24 -05:00
Alex Gleason a3585305f7
Fix notification reducer tests 2020-08-27 16:20:45 -05:00
Alex Gleason f80f18d376
Chats: mark chats as read 2020-08-27 16:09:03 -05:00
Alex Gleason ac028ed584
Chats: add unread counters to chats 2020-08-27 15:43:19 -05:00
Alex Gleason 020e21adcd
Oh right, maps can't be sorted... 2020-08-27 15:07:15 -05:00
Alex Gleason 497a603a88
Notifications: drop chat mentions 
Prevent streaming API from pushing in unwanted notifications
https://git.pleroma.social/pleroma/pleroma/-/issues/2076
 2020-08-27 14:35:55 -05:00
Alex Gleason 859f340716
Chats: rudimentary display of chat message notifications 2020-08-27 14:33:03 -05:00
Alex Gleason 14eec701cb
Chats: add empty chats message 2020-08-27 14:02:52 -05:00
Alex Gleason 44f7ad5e1c
Chats: sort chats in reducer instead of component 2020-08-27 13:45:37 -05:00
Alex Gleason d9df091f75
Chats: increase main pane header font size 2020-08-27 13:37:53 -05:00
Alex Gleason 9493b261ef
Chats: only show message button if the user supports chats 2020-08-27 13:32:52 -05:00
Alex Gleason c0f6830e7f
Chat: fix avatar proportion in pane header 2020-08-27 13:08:04 -05:00
Alex Gleason 75dc5cfbe2
Chats: speed up pane open animation 2020-08-27 13:04:16 -05:00
Alex Gleason 10257f324d
Chats: clicking "message" launches a new chat 2020-08-27 13:01:06 -05:00
Alex Gleason e12b74713a
Chats z-index above account header 2020-08-27 12:55:38 -05:00
Alex Gleason 845c03e8ad
Add scroll bar to chats list 2020-08-27 12:53:44 -05:00
Alex Gleason 59c2029535
Chats: style pending messages 2020-08-27 12:51:35 -05:00
Alex Gleason d0a9c8b47d
Chat z-index behind modals and topbar 2020-08-27 12:45:19 -05:00
Alex Gleason 0e21cf26f4
Chat link style fixes 2020-08-27 00:33:57 -05:00
Alex Gleason 8b621d30fc
Chats: fix flickering during update 2020-08-27 00:24:11 -05:00
Alex Gleason 9af664bda8
Start making the chat faster, but it flickers 2020-08-27 00:06:27 -05:00
Alex Gleason 29f415d786
Chats: sort most recently updated chats to the top 2020-08-26 23:20:16 -05:00
Alex Gleason c4aae14148
Chats: handle null last_message 2020-08-26 20:20:14 -05:00
Alex Gleason 02b3b08999
Chats: use semantic names for action properties 2020-08-26 19:53:54 -05:00
Alex Gleason 9a3aab27c9
Chats: clicking the profile message button calls onMessage 2020-08-26 19:46:23 -05:00
Alex Gleason efa6f94cdd
Fix onEndorseToggle props warning 2020-08-26 19:20:18 -05:00
Alex Gleason da6239c4fc
Chats: move out of importer pipeline, entirely through reducers 2020-08-26 18:17:47 -05:00
Alex Gleason b9d7f927a6
Chats: get streaming working again 2020-08-26 17:29:22 -05:00
Alex Gleason 4b173f0580
Chats: sort messages properly 2020-08-26 17:02:25 -05:00
Alex Gleason 759c4ae4d0
Fix chat submission 2020-08-26 16:54:44 -05:00
Alex Gleason ecefab9956
Chats: get messages showing up again 2020-08-26 16:12:42 -05:00
Alex Gleason b66e28d8bb
Chats: store `chat_message_lists` in Redux 2020-08-26 15:54:14 -05:00
Alex Gleason 96ccf02ab8 Merge branch '340-load-more-community-fix' into 'develop' 
Pass last statusID into status list before filtering, fixes #340

Closes #340

See merge request soapbox-pub/soapbox-fe!188
 2020-08-26 19:43:32 +00:00
Alex Gleason 5c03f855f6
lastStatusId: move assignment out of selector 2020-08-26 14:31:22 -05:00
Alex Gleason dbafbbc065
Chats: make streaming mostly work 2020-08-26 13:40:42 -05:00
Alex Gleason 80a78ac0e1
Chats: fix border-radius and chat content height 2020-08-26 11:58:24 -05:00
Mary Kate 82c590d74b simplify onLoadMore in status list 2020-08-26 11:42:20 -05:00
Alex Gleason f52186bc01
Don't write settings back to Redux after PATCH, prevents race conditions 2020-08-26 00:37:55 -05:00
Alex Gleason 5fc8b3ff3d
Chats: improve display of links and emoji 2020-08-26 00:33:26 -05:00
Alex Gleason a296e6fcd1
Differentiate chat bubbles 2020-08-26 00:21:54 -05:00
Alex Gleason bd7aa14488 Merge branch 'markdown-ordered-lists-fix' into 'develop' 
Fix markdown ordered list numbers rending on the bottom, fixes #344

Closes #344

See merge request soapbox-pub/soapbox-fe!186
 2020-08-26 04:42:33 +00:00
Alex Gleason c94258dfb9
Chats: improve scroll behavior 2020-08-25 22:12:08 -05:00
Alex Gleason 205078c865
Chats: focus input under some circumstances 2020-08-25 22:03:53 -05:00
Alex Gleason dcaadb2153
Chats: autoscroll 
https://stackoverflow.com/a/41700815
 2020-08-25 21:45:05 -05:00
Alex Gleason 5a7cc14812
Chats: rudimentary sending a message 2020-08-25 21:31:34 -05:00
Alex Gleason 5373c5b1c4
Chats: start styling ChatWindow 2020-08-25 21:03:10 -05:00
Alex Gleason cab490e1d3
Chats: display chat message content 2020-08-25 20:33:49 -05:00
Alex Gleason 5518959531
Chats: improve input box CSS 2020-08-25 19:19:55 -05:00
Alex Gleason a2cd0b7630
Chats: improve toggle surface area 2020-08-25 19:13:54 -05:00
Alex Gleason c2c3fefbaa
Chats: Improve minimize animation 2020-08-25 18:58:40 -05:00
Alex Gleason 0736e6d46c
Chats: Let main window be minimized 2020-08-25 18:53:36 -05:00
Alex Gleason 1c6c9f0f5d
Chats: Toggle pane open and minimized 2020-08-25 18:45:05 -05:00
Alex Gleason 072aed02da
Chats: Allow closing a chat 2020-08-25 18:11:48 -05:00
Alex Gleason f87f33fb94
Chats: Click chat to open pane 2020-08-25 17:54:10 -05:00
Alex Gleason c84ca30197
Chats: Click chat to open pane 2020-08-25 17:24:47 -05:00
Alex Gleason 0d7a926fa5
Chats: Style the chat boxes 2020-08-25 17:07:07 -05:00
Alex Gleason 6e0bac3d43
Chats: Get chats from paneData 2020-08-25 16:00:27 -05:00
Mary Kate fbee7a237c pass last statusID into status list before filtering, fixes #340 2020-08-25 14:59:05 -05:00
Alex Gleason d6b3268da4
Render chats in panes layout 2020-08-25 14:58:35 -05:00
Mary Kate d74a1908c7 move deactivated profile logic to css 2020-08-25 13:47:36 -05:00
Mary Kate 40f707fcb0 Fix markdown ordered list numbers rending on the bottom, sometimes 2020-08-25 13:02:40 -05:00
Alex Gleason b98f06e3d3
Chats: Import and normalize chats 2020-08-25 12:38:21 -05:00
Alex Gleason 7693fb87cc
Scaffold chat click 2020-08-25 11:33:51 -05:00
Alex Gleason 8823743605
Merge branch 'develop' into chats 2020-08-24 22:54:43 -05:00
Alex Gleason 22abaafd7a
Restore hydrateStore() call, fixes #346 2020-08-24 22:53:01 -05:00
Alex Gleason 002643b821
Merge branch 'develop' into chats 2020-08-24 22:21:04 -05:00
Alex Gleason 33c275e5f2
Run `yarn manage:translations` 2020-08-24 22:14:19 -05:00
Alex Gleason e35e8f613f
Rudimentary ChatList display 2020-08-24 21:32:39 -05:00
Alex Gleason f1cff927c0
Display Chat list 2020-08-24 21:26:42 -05:00
Alex Gleason 9785019054
Add rudimentary support for pleroma:chat_mention notification type 2020-08-24 19:51:24 -05:00
Alex Gleason fa9421a7c1
Reports counter: Only count open reports 2020-08-24 18:00:09 -05:00
Alex Gleason ebea858ca2
Reports Counter: Only fetch reports when user is staff 2020-08-24 17:31:45 -05:00
Alex Gleason c3c77c1795
Show reports counter icon for staff members, fixes #273 2020-08-24 17:18:53 -05:00
Alex Gleason 20f64079e0
Preload /api/v1/instance 2020-08-24 15:53:38 -05:00
Alex Gleason 57340496bc
Preload: dispatch preload action 2020-08-24 15:23:05 -05:00
Alex Gleason bb30f0c989
SoapboxConfig: toJSON() --> toJS() 2020-08-24 11:09:59 -05:00
Alex Gleason 0dfe22de36
Fix updateFromAdmin() broken comparison 2020-08-24 10:38:29 -05:00
Alex Gleason 48d0572403
ConfigDB: Refactor updateFromAdmin in reducers/soapbox 2020-08-24 10:08:39 -05:00
Alex Gleason e1a86d4e1c
SoapboxConfig: Improve style of delete icons 2020-08-23 23:55:03 -05:00
Alex Gleason 011b80f717
SoapboxConfig: Improve raw JSON editor 2020-08-23 23:46:34 -05:00
Alex Gleason e173af54f1
SoapboxConfig: Raw JSON editor 2020-08-23 23:19:56 -05:00
Alex Gleason 11840c4be8
SoapboxConfig: "downscaled" --> "displayed" 2020-08-23 22:44:13 -05:00
Alex Gleason d310fb4f18
SoapboxConfig: Rudimentary deletion of rows 2020-08-23 22:41:22 -05:00
Alex Gleason 2470e59596
/admin --> /soapbox/config 2020-08-23 21:48:31 -05:00
Alex Gleason 3b808b6a26
SoapboxConfig: .file-picker img max-height 2020-08-23 21:41:53 -05:00
Alex Gleason 83e715fd7a
SoapboxConfig: Use cog icon instead of shield 2020-08-23 21:38:51 -05:00
Alex Gleason 91e860a67b
SoapboxConfig: Actually upload the logo and banner files 2020-08-23 21:35:33 -05:00
Alex Gleason 27c852481e
Refactor media upload into its own action file 2020-08-23 21:12:48 -05:00
Alex Gleason e3b1e8c31d
SoapboxConfig: Fix menu links to use `to` instead of `href` 2020-08-23 20:43:41 -05:00
Alex Gleason a6efad793e
SoapboxConfig: Refactor the form state and the onChange behavior 2020-08-23 20:29:29 -05:00
Alex Gleason ec42888fff
Add getSoapboxConfig() like getSettings() 2020-08-23 16:04:01 -05:00
Alex Gleason 0668cc786f
Refactor fetchSoapboxConfig() 2020-08-23 15:32:44 -05:00
Alex Gleason b7a6d7d261
admin_cfg: Improve `+` icon style 2020-08-23 15:31:49 -05:00
Alex Gleason 20269bbe3e
soapbox_settings --> soapbox_config 2020-08-23 15:21:19 -05:00
Alex Gleason 786a7b4fe7
admin_cfg: Revert locale changes made by this MR 2020-08-23 15:17:24 -05:00
Alex Gleason d6220565f9
features/configuration --> features/soapbox_config 2020-08-23 15:16:04 -05:00
Alex Gleason 83b799a3a1
ConfigSoapbox: Update phrasing, add `+` icons to form 2020-08-23 15:04:32 -05:00
Alex Gleason 5a9f17ebac
Start refactoring AdminAPI actions 2020-08-23 12:48:45 -05:00
Alex Gleason 2cdf6f7275
Merge remote-tracking branch 'origin/develop' into admin_cfg 2020-08-23 12:16:52 -05:00
Mary Kate f4b7f2a1bf remove deactivated proile bio hotfix 2020-08-17 22:34:27 -05:00
Alex Gleason cb0c34aa7e Merge branch 'deactivated-accounts' into 'develop' 
Remove info from deactivated account pages

Closes #291

See merge request soapbox-pub/soapbox-fe!157
 2020-08-18 03:15:02 +00:00
Alex Gleason 53500c44b4
Always render all columns, fixes #332, breaks #293 2020-08-16 15:24:41 -05:00
Alex Gleason 1e06eff010 Merge branch 'page-layout-style-improvement' into 'develop' 
Only render layout column inner div when column exists, fixes #293

Closes #293

See merge request soapbox-pub/soapbox-fe!171
 2020-08-16 17:39:37 +00:00
Alex Gleason 16e83b39b8 Merge branch 'markdown-list-style-improvements' into 'develop' 
Improvements to markdown list styles

Closes #300

See merge request soapbox-pub/soapbox-fe!170
 2020-08-16 17:28:00 +00:00
Alex Gleason b3a05c75ff Merge branch 'profile-media-panel-improvments' into 'develop' 
Profile media panel improvements, Fixes #318

Closes #318

See merge request soapbox-pub/soapbox-fe!168
 2020-08-16 17:24:52 +00:00
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
Mary Kate 455cb6f575 only render layout colum inner div when column exists, fixes #293 2020-08-15 18:50:42 -05:00
Mary Kate 8818363149 improvements to markdown list styles 2020-08-15 17:54:52 -05:00
Mary Kate 02c7325e4d Check src exists first in hover to play, hopefully fixes #322 2020-08-15 16:24:34 -05:00
Mary Kate 2f24577e7f only show public attachments in profile media panel 2020-08-15 15:51:31 -05:00
Mary Kate 422588178a loading improvments for profile media panel 2020-08-15 15:19:18 -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
Mary Kate bafe8bd428 show statuses on muted profiles, fixes #301 2020-08-14 20:34:19 -05:00
crockwave d966107f1b Add default copyright value to reducer 
Fixed checkbox processing
 2020-08-14 19:03:11 -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
crockwave cf260ec793 Handles virgin rendering, default soapbox object if soapbox.json missing, local state used only for UI changes, and retention of settings in both DB and store as soapbox object 
Need to monitor for soapbox object dispatch events so that hitting Back causes re-render of timeline page
Need to explore refactoring update of soapbox object before being passed to API
 2020-08-14 16:51:04 -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 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
Curtis ROck b127ffa158 Added brandcolor tooltip on brand color button hover 
Component renders well from virgin use
State updates well
Still breaks on Save
 2020-08-13 22:25:06 -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
crockwave 8b2c7b344b Trying to get blank customCss field to appear on virgin usage 2020-08-13 19:04:54 -05:00
Curtis 675f580d60 Resolve merge conflicts 
Merge branch 'develop' into 'translate_public_header'

# Conflicts:
#   app/soapbox/locales/ar.json
#   app/soapbox/locales/ast.json
#   app/soapbox/locales/bg.json
#   app/soapbox/locales/bn.json
#   app/soapbox/locales/br.json
#   app/soapbox/locales/ca.json
#   app/soapbox/locales/co.json
#   app/soapbox/locales/cs.json
#   app/soapbox/locales/cy.json
#   app/soapbox/locales/da.json
#   app/soapbox/locales/de.json
#   app/soapbox/locales/defaultMessages.json
#   app/soapbox/locales/el.json
#   app/soapbox/locales/en.json
#   app/soapbox/locales/eo.json
#   app/soapbox/locales/es-AR.json
#   app/soapbox/locales/es.json
#   app/soapbox/locales/et.json
#   app/soapbox/locales/eu.json
#   app/soapbox/locales/fa.json
#   app/soapbox/locales/fi.json
#   app/soapbox/locales/fr.json
#   app/soapbox/locales/ga.json
#   app/soapbox/locales/gl.json
#   app/soapbox/locales/he.json
#   app/soapbox/locales/hi.json
#   app/soapbox/locales/hr.json
#   app/soapbox/locales/hu.json
#   app/soapbox/locales/hy.json
#   app/soapbox/locales/id.json
#   app/soapbox/locales/io.json
#   app/soapbox/locales/it.json
#   app/soapbox/locales/ja.json
#   app/soapbox/locales/ka.json
#   app/soapbox/locales/kk.json
#   app/soapbox/locales/ko.json
#   app/soapbox/locales/lt.json
#   app/soapbox/locales/lv.json
#   app/soapbox/locales/mk.json
#   app/soapbox/locales/ms.json
#   app/soapbox/locales/nl.json
#   app/soapbox/locales/nn.json
#   app/soapbox/locales/no.json
#   app/soapbox/locales/oc.json
#   app/soapbox/locales/pl.json
#   app/soapbox/locales/pt-BR.json
#   app/soapbox/locales/pt.json
#   app/soapbox/locales/ro.json
#   app/soapbox/locales/ru.json
#   app/soapbox/locales/sk.json
#   app/soapbox/locales/sl.json
#   app/soapbox/locales/sq.json
#   app/soapbox/locales/sr-Latn.json
#   app/soapbox/locales/sr.json
#   app/soapbox/locales/sv.json
#   app/soapbox/locales/ta.json
#   app/soapbox/locales/te.json
#   app/soapbox/locales/th.json
#   app/soapbox/locales/tr.json
#   app/soapbox/locales/uk.json
#   app/soapbox/locales/zh-CN.json
#   app/soapbox/locales/zh-HK.json
#   app/soapbox/locales/zh-TW.json
 2020-08-13 22:28:27 +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
Curtis ROck 06186f85c8 continued debugging 2020-08-12 20:52:32 -05:00
crockwave cea7723fc3 refactored to improve default soapbox object for store 
refactored to render with local state if avail or with props
refactored to build soapbox object for api and store from local state if avail or with props
 2020-08-12 17:24:14 -05: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
Mary Kate 9b85b4ad7f remove info from deactivated account pages 2020-08-12 13:06:28 -05:00
crockwave 0f70fde172 action_bar had a poor merge conflict correction fixed. 
Still experimenting with updating nested state
 2020-08-11 18:41:03 -05: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
Curtis ROck 207750aef4 Trying immutable functions to modify state object 2020-08-11 06:30:54 -05: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
crockwave e6d009d4f2 Trying to update nested state on element change events 2020-08-10 19:29:38 -05: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
crockwave a001fa2dfe Merge branch 'admin_cfg' of https://gitlab.com/soapbox-pub/soapbox-fe into admin_cfg 2020-08-10 15:33:34 -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
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
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
Sean King 02a1bb47cf Fix poll X button 2020-08-10 09:25:57 -06:00
Sean King f3893effbe Fix bullet point css issue 2020-08-09 22:27:55 -06:00
Curtis ea94b05608 Resolve merge conflicts 
Merge branch 'develop' into 'admin_cfg'

# Conflicts:
#   app/soapbox/features/compose/components/action_bar.js
#   app/soapbox/features/edit_profile/index.js
 2020-08-09 23:02:48 +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
Alex Gleason e97b9d2168
Update columns layout for all pages 2020-08-09 14:37:02 -05:00
Alex Gleason 6f6f91e2f4
Verified className fix 2020-08-09 14:32:22 -05:00
Alex Gleason 2fff5db5d5
Handle `max_fields` fallback differently 2020-08-09 14:01:16 -05:00
Sean King 9c505d0d84 Fix for Pleroma 2.1 and older versions regarding profile metadata 2020-08-09 10:55:39 -06:00
Curtis ROck 72a4a38fec Refactoring to use soapbox object as state. Still buggy 2020-08-09 11:03:24 -05:00
Alex Gleason 715779653c
Rearrange home sidebars 2020-08-09 00:29:28 -05:00
Sean King 95fb1b7900 Update index.js 2020-08-09 01:40:35 +00:00
Alex Gleason 9a2fba1ef5
Revert "Revert "Store fieldsLimits in instance/pleroma/metadata of the Redux store. Render fields to maxFields value in features/edit_profile, using maxFields value"" 
This reverts commit b3a6c395df.
 2020-08-08 20:32:39 -05:00
Alex Gleason b3a6c395df
Revert "Store fieldsLimits in instance/pleroma/metadata of the Redux store. Render fields to maxFields value in features/edit_profile, using maxFields value" 
This reverts commit 3d24cfaf53.
 2020-08-08 18:34:35 -05:00
Mary Kate ae608388a0 add DM filter option for Home timeline, fixes #254 2020-08-07 20:47:04 -05:00
Mary Kate e116745e83 timeline filtering improvements 2020-08-07 19:28:30 -05:00
Alex Gleason 4ee0fa8160 Merge branch 'user-verification' into 'develop' 
Display user verification icon

See merge request soapbox-pub/soapbox-fe!128
 2020-08-07 23:23:11 +00:00
Mary Kate 7931a9a89d code review 2020-08-07 18:10:13 -05:00