bigbuffet/pleroma
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions
1170 commits 1 branch 0 tags 292 MiB
Commit graph

348 commits

Author SHA1 Message Date
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
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
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
bb30f0c989
SoapboxConfig: toJSON() --> toJS() 2020-08-24 11:09:59 -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
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
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
20269bbe3e
soapbox_settings --> soapbox_config 2020-08-23 15:21:19 -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
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
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
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
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
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
Mary Kate
50ccb6d010 add loading indicator to DMs, fixes #316 2020-08-14 21:11:36 -05:00
crockwave
d966107f1b Add default copyright value to reducer 
Fixed checkbox processing
 2020-08-14 19:03:11 -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
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
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
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
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
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
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
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
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
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
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
Mary Kate
e9d76b6287 Update chained get requests 2020-08-07 17:01:15 -05:00
crockwave
d70aa302b2 Added suffix to Back to <instance> button on public_layout header and created translations 2020-08-07 16:58:10 -05:00
Curtis
6435bb0bc5 Resolved merge conflicts 
Merge branch 'develop' into 'translate_public_header'

# Conflicts:
#   app/soapbox/features/public_layout/components/header.js
 2020-08-07 20:53:42 +00:00
Curtis
36e634b0aa Resolved merge conflicts 
Merge branch 'develop' into 'timeline-word-filters'

# Conflicts:
#   app/soapbox/components/sidebar_menu.js
#   app/styles/application.scss
 2020-08-07 20:46:44 +00:00
Alex Gleason
92f43566e0 Merge branch 'mfa' into 'develop' 
Multi-Factor Auth with OTP

See merge request soapbox-pub/soapbox-fe!124
 2020-08-07 20:17:13 +00:00
marykatefain
68f765da28 Multi-Factor Auth with OTP 2020-08-07 20:17:13 +00:00