Commit Graph

70 Commits

Author SHA1 Message Date
2470e59596 /admin --> /soapbox/config 2020-08-23 21:48:31 -05:00
83e715fd7a SoapboxConfig: Use cog icon instead of shield 2020-08-23 21:38:51 -05:00
e3b1e8c31d SoapboxConfig: Fix menu links to use to instead of href 2020-08-23 20:43:41 -05:00
20269bbe3e soapbox_settings --> soapbox_config 2020-08-23 15:21:19 -05:00
2cdf6f7275 Merge remote-tracking branch 'origin/develop' into admin_cfg 2020-08-23 12:16:52 -05:00
02c7325e4d Check src exists first in hover to play, hopefully fixes #322 2020-08-15 16:24:34 -05:00
5349045e51 Revert "only render emoji selector in the dom when needed"
This reverts commit 769a512445.
2020-08-10 15:06:39 -05:00
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
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
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
a5b69e77a3 Added Admin settings opening in new tab 2020-08-07 12:58:59 -05:00
f07de93ee3 Merge branch 'emoji-rendering-hotfix' into 'develop'
Only render emoji selector in the dom when needed

See merge request soapbox-pub/soapbox-fe!131
2020-08-05 21:04:41 +00:00
769a512445 only render emoji selector in the dom when needed 2020-08-05 15:53:30 -05:00
e6ee961016 Only render a hover profile card in the dom when relevant 2020-08-05 14:27:42 -05:00
aec44bfea6 Verified: Use getIn in display_name.js 2020-08-05 18:04:32 +00:00
c9b2b66283 add verification icon on verified users 2020-08-05 12:08:52 -05:00
bdd9204b3c basic filter form component set up 2020-08-04 15:21:42 -05:00
eeaf9f0b8e HoverCard: Do the JS way on DetailedStatus too 2020-08-03 00:40:13 -05:00
35c9574c2f HoverCard: Handle delay in JS instead of CSS 2020-08-02 23:47:19 -05:00
2c010768e9 Merge branch 'profile-hover-cards' into 'develop'
Profile hover cards

See merge request soapbox-pub/soapbox-fe!114
2020-08-03 02:27:14 +00:00
690d7154c4 HoverCard: Fix JS console errors 2020-08-02 21:05:21 -05:00
a7463dd3fc HoverCard: Add floating NavLinks for clickthrough 2020-08-02 18:53:47 -05:00
1f5898b67d Bring HoverCard out of NavLink 2020-08-02 18:39:32 -05:00
abd13e8fa5 Move hovercard into display name for regular status too 2020-08-02 18:18:34 -05:00
ee97e94779 Bookmark posts 2020-07-29 21:08:36 +00:00
d76f4d422e update detail status page and mobile settings for porfile hover card 2020-07-28 20:59:14 -05:00
f6ebe5cbd7 profile card basic functionality, needs some UI improvements 2020-07-28 20:02:11 -05:00
563e4e5bab Show profile preview on hover 2020-07-28 14:15:57 -05:00
a3201605b4 add uploads to polls 2020-07-28 14:15:15 -05:00
de917da39e Added menu item for Soapbox settings. Added translations 2020-07-20 21:17:23 -05:00
9365b99ad4 Moved settings_checkbox to components primary folder. Created features/configuration. 2020-07-20 18:18:54 -05:00
277f4b5f22 Move ThemeToggle to separate class, style it, and fix it on mobile 2020-07-19 18:44:17 -06:00
44e882d7fc Show donor badge 2020-07-04 21:25:43 -05:00
853dad032c componentWillReceiveProps fixes, fixes #184, #231, !80 2020-07-04 19:14:12 -05:00
75ab969051 Purge unused Badge components 2020-07-04 17:11:38 -05:00
82c07f84b4 Pull patronUrl from /api/patron/v1/instance 2020-07-04 14:21:58 -05:00
29f26745e2 Fix linter :( 2020-07-02 18:39:17 -05:00
aa35e2ec46 Fix old soapbox.json failing 2020-07-02 18:16:41 -05:00
4e94c5d2ca Merge branch 'develop' into audio-player 2020-07-02 16:32:50 -05:00
3be1c9a1f1 Fixes for audio attachments when there is more than 1 attachment and icons for audio attachments 2020-07-02 16:31:52 -05:00
1a7cbb21a7 Audio player work (change of sensitive content handling) 2020-07-02 16:31:48 -05:00
01d042f80d Update of work on audio player 2020-07-02 16:31:43 -05:00
73b275b8da Patron updates 2020-06-30 17:33:21 -05:00
9166b95dfb Final fixes to the switch from Font Awesome to Fork Awesome 2020-06-26 22:47:48 -06:00
ecf26de289 Merge branch 'componentWillReceiveProps_to_DidUpdate_refactor' into 'develop'
Component will receive props to did update refactor Fixes #184

Closes #184

See merge request soapbox-pub/soapbox-fe!80
2020-06-27 00:23:44 +00:00
b70ec4e0e3 Merge commit '853a68cd5479ffc5f7a14a93a065db8f08bfe424' into develop
autoPlayGif fixes
2020-06-26 18:17:57 -05:00
3d29f7b6e2 partial mods to replace deprecated componentWillReceiveProps 2020-06-22 20:26:20 -05:00
8a43cb3709 partial completion of replacing componentWillReceiveProps 2020-06-18 20:30:46 -05:00
10ebea7489 Replaced componentWillUpdate to componentDidUpdate. Fixes #185 2020-06-18 16:04:31 -05:00
853a68cd54 Fix avatar tests 2020-06-15 16:43:24 -03:00