Commit Graph

845 Commits (36e634b0aae328829f7259bc2c4a95c98d2c8146)
 

Author SHA1 Message Date
Curtis 36e634b0aa Resolved merge conflicts
4 years ago
Alex Gleason 92f43566e0 Merge branch 'mfa' into 'develop'
4 years ago
marykatefain 68f765da28 Multi-Factor Auth with OTP
4 years ago
Alex Gleason 2b5c0a95d2 Merge branch 'all_sound_toggle' into 'develop'
4 years ago
Alex Gleason 6bd8c0733a Merge branch 'admin_new_tab' into 'develop'
4 years ago
crockwave a5b69e77a3 Added Admin settings opening in new tab
4 years ago
Sean King 56bac95ad4 Toggle for all notification sounds
4 years ago
Alex Gleason f07de93ee3 Merge branch 'emoji-rendering-hotfix' into 'develop'
4 years ago
Mary Kate 769a512445 only render emoji selector in the dom when needed
4 years ago
Alex Gleason aadde55262 Merge branch 'hover-card-display-hotfix' into 'develop'
4 years ago
Alex Gleason 8d28f9b9a5 Merge branch 'account-coloration-improvements' into 'develop'
4 years ago
Mary Kate e6ee961016 Only render a hover profile card in the dom when relevant
4 years ago
Mary Kate 39d29f4e25 Update account colors to be more silimar to existing Soapbox color patterns
4 years ago
Mary Kate ab3f53cb27 styles on filter form
4 years ago
Mary Kate 69184ef97c add and remove muted words, filters
4 years ago
Alex Gleason 19e3dc9ed3 Merge branch 'max_profile_fields' into 'develop'
4 years ago
crockwave 3d24cfaf53 Store fieldsLimits in instance/pleroma/metadata of the Redux store. Render fields to maxFields value in features/edit_profile, using maxFields value
4 years ago
Mary Kate bdd9204b3c basic filter form component set up
4 years ago
Alex Gleason eeaf9f0b8e
HoverCard: Do the JS way on DetailedStatus too
4 years ago
Alex Gleason 35c9574c2f
HoverCard: Handle delay in JS instead of CSS
4 years ago
Alex Gleason 5081dd73c0
HoverCard: Reposition badges
4 years ago
Alex Gleason 9a5046179b
HoverCard: Reposition ActionButton
4 years ago
Alex Gleason e02ff2bed3
HoverCard: Style stats
4 years ago
Alex Gleason e943dc8b4c
UserPanel: Don't wrap text
4 years ago
Alex Gleason 4197e8e833
HoverCard: Prevent floating avatars from intercepting with current card
4 years ago
Alex Gleason feec86718d
Display name fixes
4 years ago
Alex Gleason 3fd255cc0a
HoverCard: Style <a> color
4 years ago
Alex Gleason 7fe70a64b5
Pleroma relationship fixes
4 years ago
Alex Gleason ccec8698fc
Column border-radius fixes
4 years ago
Alex Gleason 2c010768e9 Merge branch 'profile-hover-cards' into 'develop'
4 years ago
Alex Gleason 29d1debdbf
Refactor ActionButton
4 years ago
Alex Gleason 690d7154c4
HoverCard: Fix JS console errors
4 years ago
Alex Gleason 2e21c04e28
Clean up unused UserPanel code
4 years ago
Alex Gleason 24e7ce6e83
HoverCard: Improve long bio situation
4 years ago
Alex Gleason 1266585aef
HoverCard: Reposition "Follow you!" component
4 years ago
Alex Gleason a7463dd3fc
HoverCard: Add floating NavLinks for clickthrough
4 years ago
Alex Gleason 1f5898b67d
Bring HoverCard out of NavLink
4 years ago
Alex Gleason 6c205deaf0
HoverCard: Fix hover flickering issues
4 years ago
Alex Gleason abd13e8fa5
Move hovercard into display name for regular status too
4 years ago
Alex Gleason a4a8f167d4 Merge branch 'fix-for-profile-hover' into 'profile-hover-cards'
4 years ago
Alex Gleason e32bf82b03
CSS formatting
4 years ago
Alex Gleason 9d35498bb9
HoverCard: Fix CSS whitespace issues
4 years ago
Alex Gleason 7ac31efce7
Markdown: style <code> and <pre> elements
4 years ago
Alex Gleason 23e370a10b
Bookmarks: don't update constantly, fixes #263
4 years ago
Alex Gleason 59e2811a49 Merge branch 'approval-mode-fe-3' into 'develop'
4 years ago
Alex Gleason 02bdb6473c Merge branch 'bookmark-posts' into 'develop'
4 years ago
marykatefain ee97e94779 Bookmark posts
4 years ago
Sean King 84b4681b50 Fix detailed status
4 years ago
Mary Kate d99e5d543c fix linter
4 years ago
Mary Kate 774adf9baa update reason or joining form to simpletextarea
4 years ago