Commit graph

112 commits

Author SHA1 Message Date
Alex Gleason
f9a0ce1d6b Merge branch 'blue_flicker' into 'develop'
Apply non-blank default BrandColor only on failure to acquire brandColor. Fixes #364

Closes #364

See merge request soapbox-pub/soapbox-fe!198
2020-09-03 16:29:51 +00:00
Curtis ROck
181eef1edd corrected errors 2020-09-02 21:47:46 -05:00
Alex Gleason
cd5ee4837c
Check that soapbox.json is really an object before importing, fixes #376 2020-09-01 00:02:01 -05:00
Curtis ROck
b337a4560e Apply non-blank default BrandColor only when API and soapbox.json methods fail, and only when API and/or JSON method succeeds, but brandColor value is blank 2020-08-31 22:00:11 -05:00
Sean King
de78a87ec0 Make display name same as username during registration, fixes #267 2020-08-30 23:48:00 +00:00
Alex Gleason
2c551130e6
Rip out markers, don't rely on them for unread count 2020-08-28 16:49:27 -05:00
Alex Gleason
7d0bd47ac1
Chats: update "Message" button with conditional logic for mobile 2020-08-28 15:06:55 -05:00
Alex Gleason
e7c6862fd0
Chats: refactor ChatBox into its own component 2020-08-28 13:17:19 -05:00
Alex Gleason
f80f18d376
Chats: mark chats as read 2020-08-27 16:09:03 -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
10257f324d
Chats: clicking "message" launches a new chat 2020-08-27 13:01:06 -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
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
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
b66e28d8bb
Chats: store chat_message_lists in Redux 2020-08-26 15:54:14 -05:00
Alex Gleason
dbafbbc065
Chats: make streaming mostly work 2020-08-26 13:40:42 -05:00
Alex Gleason
5a7cc14812
Chats: rudimentary sending a message 2020-08-25 21:31:34 -05:00
Alex Gleason
cab490e1d3
Chats: display chat message content 2020-08-25 20:33:49 -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
d6b3268da4
Render chats in panes layout 2020-08-25 14:58:35 -05:00
Alex Gleason
b98f06e3d3
Chats: Import and normalize chats 2020-08-25 12:38:21 -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
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
27c852481e
Refactor media upload into its own action file 2020-08-23 21:12:48 -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
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
Alex Gleason
3da44d60bf
Revert direct_timeline to use /api/v1/timelines/direct, fixes #325 2020-08-15 23:37:50 -05:00
Mary Kate
bafe8bd428 show statuses on muted profiles, fixes #301 2020-08-14 20:34:19 -05: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
e7bd011495
Streaming: Add locale fallback for invalid locale 2020-08-13 04:20:35 -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
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
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
marykatefain
68f765da28 Multi-Factor Auth with OTP 2020-08-07 20:17:13 +00:00