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 |
|
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 |
|
Alex Gleason
|
2b5c0a95d2
|
Merge branch 'all_sound_toggle' into 'develop'
Toggle for all notification sounds, fixes #260
Closes #260
See merge request soapbox-pub/soapbox-fe!134
|
2020-08-07 20:06:38 +00:00 |
|
crockwave
|
a5b69e77a3
|
Added Admin settings opening in new tab
|
2020-08-07 12:58:59 -05:00 |
|
Sean King
|
56bac95ad4
|
Toggle for all notification sounds
|
2020-08-06 11:54:58 -06:00 |
|
crockwave
|
6e782ca3a0
|
Modified Profile bio to use textarea, preserving newlines and HTML rendered
|
2020-08-05 19:08:38 -05:00 |
|
Mary Kate
|
769a512445
|
only render emoji selector in the dom when needed
|
2020-08-05 15:53:30 -05:00 |
|
Mary Kate
|
f7f0439e72
|
prevent verified users from updating display name on frontend
|
2020-08-05 12:47:45 -05:00 |
|
Mary Kate
|
c9b2b66283
|
add verification icon on verified users
|
2020-08-05 12:08:52 -05:00 |
|
Mary Kate
|
ab3f53cb27
|
styles on filter form
|
2020-08-04 21:57:54 -05:00 |
|
Mary Kate
|
69184ef97c
|
add and remove muted words, filters
|
2020-08-04 21:15:16 -05:00 |
|
crockwave
|
3d24cfaf53
|
Store fieldsLimits in instance/pleroma/metadata of the Redux store. Render fields to maxFields value in features/edit_profile, using maxFields value
|
2020-08-04 18:05:16 -05:00 |
|
Mary Kate
|
bdd9204b3c
|
basic filter form component set up
|
2020-08-04 15:21:42 -05:00 |
|
crockwave
|
c8ba54c7a1
|
Fixed linter warning in colorpicker render. Fixed button-secondary hover contrast issue
|
2020-08-03 14:53:12 -05:00 |
|
crockwave
|
d83ac121a8
|
Removed console logging from features/configuration
|
2020-08-03 10:53:08 -05:00 |
|
Alex Gleason
|
c3be47fca6
|
Merge remote-tracking branch 'origin/develop' into admin_cfg
|
2020-08-03 01:43:54 -05:00 |
|
Alex Gleason
|
eeaf9f0b8e
|
HoverCard: Do the JS way on DetailedStatus too
|
2020-08-03 00:40:13 -05:00 |
|
Sean King
|
ea85c424a4
|
Fix site logo and banner rendering when no logo or banner is set
|
2020-08-02 20:52:23 -06:00 |
|
Alex Gleason
|
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 |
|
Alex Gleason
|
29d1debdbf
|
Refactor ActionButton
|
2020-08-02 21:16:13 -05:00 |
|
Curtis
|
4717638ea8
|
Merge branch 'add-copyright-footer-admin-settings' into 'admin_cfg'
Add copyright footer setting
See merge request soapbox-pub/soapbox-fe!121
|
2020-08-03 02:05:53 +00:00 |
|
Alex Gleason
|
690d7154c4
|
HoverCard: Fix JS console errors
|
2020-08-02 21:05:21 -05:00 |
|
Alex Gleason
|
2e21c04e28
|
Clean up unused UserPanel code
|
2020-08-02 20:50:06 -05:00 |
|
Alex Gleason
|
24e7ce6e83
|
HoverCard: Improve long bio situation
|
2020-08-02 20:44:47 -05:00 |
|
Sean King
|
86d3340426
|
Fix typo
|
2020-08-02 19:10:32 -06:00 |
|
Alex Gleason
|
1266585aef
|
HoverCard: Reposition "Follow you!" component
|
2020-08-02 19:50:17 -05:00 |
|
Sean King
|
f21f713f9a
|
Add copyright footer setting
|
2020-08-02 18:44:04 -06:00 |
|
Alex Gleason
|
a7463dd3fc
|
HoverCard: Add floating NavLinks for clickthrough
|
2020-08-02 18:53:47 -05:00 |
|
Curtis ROck
|
f205ff5334
|
Added tests to reducers/soapbox
|
2020-08-02 18:45:39 -05:00 |
|
Alex Gleason
|
1f5898b67d
|
Bring HoverCard out of NavLink
|
2020-08-02 18:39:32 -05:00 |
|
Sean King
|
e95366b572
|
Fix color picker so that a POST request is not done by default every time it opens
|
2020-08-02 16:17:34 -06:00 |
|
Sean King
|
49b8ecd639
|
Fix merge conflict.
|
2020-08-02 20:47:52 +00:00 |
|
Sean King
|
f398dde5cb
|
Color picker for admin config
|
2020-08-02 14:41:26 -06:00 |
|
crockwave
|
1f6ca55366
|
Limit logo upload to either SVG or PNG
|
2020-08-02 14:07:13 -05:00 |
|
crockwave
|
ba18c3a643
|
SB settings Save works and brandcolor renders. Logo/banner paths are issues, and adding new homefooter/customCSS are issues
|
2020-08-01 16:38:29 -05:00 |
|
crockwave
|
43f28a30ba
|
linter fix
|
2020-07-31 18:06:16 -05:00 |
|
crockwave
|
0b9eeccbc3
|
commented out to try to push an empty soapbox payload into Admin API
|
2020-07-31 17:35:14 -05:00 |
|
crockwave
|
12caa8e0ce
|
Added console to debug portion of soapbox settings object that should be pushed to Redux store
|
2020-07-30 19:42:50 -05:00 |
|
crockwave
|
c6f3816f77
|
Drafted pushing soapbox object to Redux store on SOAPBOX_POST_SUCCESS
|
2020-07-30 19:39:41 -05:00 |
|
Alex Gleason
|
23e370a10b
|
Bookmarks: don't update constantly, fixes #263
|
2020-07-30 00:38:40 -05:00 |
|
Curtis ROck
|
bba5be4463
|
refactored methods and can now generate the JSON object required for AdminAPI
|
2020-07-29 22:38:24 -05:00 |
|
crockwave
|
c28c086ae7
|
Setup proof-of-concept on dynamically creating soapbox config JSON object suitable for pushing into Pleroma Admin-FE
|
2020-07-29 19:09:44 -05:00 |
|
Alex Gleason
|
59e2811a49
|
Merge branch 'approval-mode-fe-3' into 'develop'
Approval mode fe 3
See merge request soapbox-pub/soapbox-fe!117
|
2020-07-29 22:17:18 +00:00 |
|
marykatefain
|
ee97e94779
|
Bookmark posts
|
2020-07-29 21:08:36 +00:00 |
|
Sean King
|
84b4681b50
|
Fix detailed status
|
2020-07-29 11:51:29 -06:00 |
|
Curtis ROck
|
e60fe8a709
|
identified data object structure to be able to create JSON object for storing soapbox config in Pleroma DB
|
2020-07-28 23:30:16 -05:00 |
|
Mary Kate
|
d99e5d543c
|
fix linter
|
2020-07-28 21:46:27 -05:00 |
|
Mary Kate
|
774adf9baa
|
update reason or joining form to simpletextarea
|
2020-07-28 21:43:27 -05:00 |
|
Mary Kate
|
4ce5ba6c1a
|
textarea input
|
2020-07-28 21:43:27 -05:00 |
|
Mary Kate
|
209f826c15
|
add reason field on registration when by approval mode is on
|
2020-07-28 21:43:27 -05:00 |
|
Mary Kate
|
d76f4d422e
|
update detail status page and mobile settings for porfile hover card
|
2020-07-28 20:59:14 -05:00 |
|
Mary Kate
|
f6ebe5cbd7
|
profile card basic functionality, needs some UI improvements
|
2020-07-28 20:02:11 -05:00 |
|
crockwave
|
7d41967cad
|
corrected editing error in features/edit_profile. edited getFormdata to start producing a JSON data format. Changed actions/soapbox to use post instead of patch
|
2020-07-28 19:29:20 -05:00 |
|
Alex Gleason
|
444e3641ee
|
Fix disappearing poll button when media is uploaded
|
2020-07-28 14:42:58 -05:00 |
|
Alex Gleason
|
1329ca3578
|
Merge remote-tracking branch 'origin/develop' into add-images-to-polls
|
2020-07-28 14:18:30 -05:00 |
|
Bárbara de Castro Fernandes
|
563e4e5bab
|
Show profile preview on hover
|
2020-07-28 14:15:57 -05:00 |
|
Mary Kate
|
a3201605b4
|
add uploads to polls
|
2020-07-28 14:15:15 -05:00 |
|
Alex Gleason
|
ac6b4033dd
|
Merge remote-tracking branch 'origin/develop' into add-markdown-posts
|
2020-07-28 14:00:25 -05:00 |
|
Alex Gleason
|
b31cf22f43
|
Markdown refactoring
|
2020-07-28 13:43:22 -05:00 |
|
Mary Kate
|
daf039d9bb
|
generalize markdown to content_type
|
2020-07-28 13:31:44 -05:00 |
|
Mary Kate
|
bc787e0bbe
|
add markdown posts
|
2020-07-28 12:24:04 -05:00 |
|
Alex Gleason
|
2aca716cfa
|
Revert "Merge branch 'decouple_spoiler_from_nsfw' into 'develop'"
This reverts commit 03c2a8f294, reversing
changes made to b6c0884a1d.
|
2020-07-28 10:52:29 -05:00 |
|
Curtis ROck
|
58481d2e07
|
added patch functions to actions/soapbox. edited features/configuration to support patchSoapbox method. Data not properly formattted yet.
|
2020-07-27 22:30:53 -05:00 |
|
Curtis ROck
|
b95e6a53eb
|
Debugged missing soapbox.json use case
|
2020-07-27 21:54:45 -05:00 |
|
crockwave
|
a0befffab0
|
modified to process customCss soapbox.json list element per Neenster format
|
2020-07-27 19:16:02 -05:00 |
|
Mary Kate
|
7fd8c860b6
|
add toggle to collapse and expand Fediverse tab explaination box, fixes #63
|
2020-07-26 17:49:43 -05:00 |
|
Curtis ROck
|
abe8b28b69
|
added handlers for add new list item. Probs with homeFooter and customCSS item add functions
|
2020-07-25 23:31:39 -05:00 |
|
crockwave
|
ac17b79253
|
debugged non-existent soapbox elements and missing soapbox.json. Debugged element state changes. Modified labels and translations.
|
2020-07-25 18:27:39 -05:00 |
|
crockwave
|
d6ce92bfb3
|
custom CSS works by adding bind statement
|
2020-07-25 15:25:33 -05:00 |
|
Curtis ROck
|
e2a0da5717
|
commented out custom CSS rendering section
|
2020-07-25 10:41:01 -05:00 |
|
Curtis ROck
|
d772983278
|
edited features/configuration
|
2020-07-25 09:55:01 -05:00 |
|
crockwave
|
abd2f6ad83
|
edit features/configuration and translations
|
2020-07-24 19:30:33 -05:00 |
|
Sean King
|
53c02cd010
|
Comment out MAX_FIELDS since we don't know if we need them
|
2020-07-23 22:07:58 -06:00 |
|
Sean King
|
789c735369
|
Fix checked parameter and remove Display name and bio
|
2020-07-23 22:04:29 -06:00 |
|
crockwave
|
b962c9f848
|
edit features/configuration
|
2020-07-23 19:45:34 -05:00 |
|
Curtis ROck
|
c8eb29a7d9
|
edited features/configuration
|
2020-07-23 09:14:28 -05:00 |
|
Curtis ROck
|
9220e251db
|
fix linter error
|
2020-07-22 21:59:52 -05:00 |
|
Curtis ROck
|
ad316e0912
|
fix linter errors
|
2020-07-22 21:50:41 -05:00 |
|
crockwave
|
34c87bca7e
|
edited features/configuration and associated translations
|
2020-07-22 19:31:41 -05:00 |
|
crockwave
|
eef32c96e3
|
Added branding_preview. Edited index
|
2020-07-21 18:38:10 -05:00 |
|
Curtis ROck
|
2af5149ed3
|
edited features/configuration
|
2020-07-21 08:30:51 -05:00 |
|
Curtis ROck
|
de917da39e
|
Added menu item for Soapbox settings. Added translations
|
2020-07-20 21:17:23 -05:00 |
|
crockwave
|
9365b99ad4
|
Moved settings_checkbox to components primary folder. Created features/configuration.
|
2020-07-20 18:18:54 -05:00 |
|
Alex Gleason
|
e8288ffdf8
|
Fix theme-toggle v-align issues
|
2020-07-20 15:34:54 -05:00 |
|
Alex Gleason
|
c0dc03b3e4
|
Deactivate --> Delete
|
2020-07-20 15:23:38 -05:00 |
|
Alex Gleason
|
79dcbd781d
|
Merge branch 'deactivate_account_from_profile' into 'develop'
Deactivate account from profile. Fixes #153
Closes #153
See merge request soapbox-pub/soapbox-fe!87
|
2020-07-20 19:55:02 +00:00 |
|
Sean King
|
1a0c3131bf
|
Spacing fix
|
2020-07-19 19:03:39 -06:00 |
|
Sean King
|
9df1b085cb
|
ThemeToggle class
|
2020-07-19 18:50:09 -06:00 |
|
Sean King
|
277f4b5f22
|
Move ThemeToggle to separate class, style it, and fix it on mobile
|
2020-07-19 18:44:17 -06:00 |
|
Sean King
|
796bf9c844
|
Change design of toggle button
|
2020-07-19 15:50:16 -06:00 |
|
Sean King
|
54d7fbdc5a
|
Remove top navbar's auto-hide
|
2020-07-12 16:39:18 -06:00 |
|
Alex Gleason
|
a9347a9d27
|
Merge branch 'fix-theme-toggle-bug' into 'develop'
Fix a bug where the theme toggle doesn't show the proper icon if the themeMode is not set
See merge request soapbox-pub/soapbox-fe!98
|
2020-07-12 04:07:19 +00:00 |
|
Sean King
|
03c63fa36d
|
Fix a bug where it doesn't show the proper icon if the themeMode is not set
|
2020-07-11 21:29:57 -06:00 |
|
Alex Gleason
|
49a3211777
|
Merge branch 'theme-toggle' into 'develop'
Light/dark theme toggle in top navbar
See merge request soapbox-pub/soapbox-fe!97
|
2020-07-11 20:40:26 +00:00 |
|
Sean King
|
8b376b81cf
|
State condition isLight unnecessary
|
2020-07-11 14:22:39 -06:00 |
|
Alex Gleason
|
03c2a8f294
|
Merge branch 'decouple_spoiler_from_nsfw' into 'develop'
Update compose.js to decouple spoiler from marking media as NSFW. Fixes #209
Closes #209
See merge request soapbox-pub/soapbox-fe!90
|
2020-07-11 19:36:22 +00:00 |
|
Alex Gleason
|
b6c0884a1d
|
Merge branch 'captcha_reload_on_click' into 'develop'
Made captcha reloadable on image click. Fixes #203
Closes #203
See merge request soapbox-pub/soapbox-fe!89
|
2020-07-11 19:34:51 +00:00 |
|
Sean King
|
697291e6f5
|
Light/dark theme toggle in top navbar
|
2020-07-10 22:35:02 -06:00 |
|
Alex Gleason
|
06c4f88802
|
DetailedStatus: Small reblog tweaks
|
2020-07-08 21:42:34 -05:00 |
|
Sean King
|
f99db09c8d
|
Change the repost to be alongside emoji reacts
|
2020-07-06 15:35:27 -06:00 |
|
Sean King
|
64477f3b7f
|
Remove the applicationLink
|
2020-07-05 22:27:14 -06:00 |
|
Alex Gleason
|
44e882d7fc
|
Show donor badge
|
2020-07-04 21:25:43 -05:00 |
|
Alex Gleason
|
a83f785b73
|
React 17.x upgrade fixes
|
2020-07-04 19:32:07 -05:00 |
|
Alex Gleason
|
853dad032c
|
componentWillReceiveProps fixes, fixes #184, #231, !80
|
2020-07-04 19:14:12 -05:00 |
|
Alex Gleason
|
75ab969051
|
Purge unused Badge components
|
2020-07-04 17:11:38 -05:00 |
|
Alex Gleason
|
82c07f84b4
|
Pull patronUrl from /api/patron/v1/instance
|
2020-07-04 14:21:58 -05:00 |
|
Alex Gleason
|
0dc085411c
|
Refactor Patron code
|
2020-07-04 14:14:36 -05:00 |
|
Alex Gleason
|
b1bae44165
|
Merge branch 'poll_hint_toggle_radiobutton' into 'develop'
Added mouseover hint to poll compose radiobutton. Fixes #215
Closes #215
See merge request soapbox-pub/soapbox-fe!88
|
2020-07-04 17:59:43 +00:00 |
|
Curtis
|
c28cc228a2
|
Merge branch 'develop' into 'captcha_reload_on_click'
# Conflicts:
# app/soapbox/locales/defaultMessages.json
|
2020-07-03 20:11:09 +00:00 |
|
Sean King
|
6d9a2fab27
|
Update detailed_status.js
|
2020-07-03 00:06:26 +00:00 |
|
Curtis
|
894cd4668f
|
Update sensitive_button_container.js to prevent it becoming disabled when Subject line is active
|
2020-07-02 22:02:21 +00:00 |
|
Alex Gleason
|
4e94c5d2ca
|
Merge branch 'develop' into audio-player
|
2020-07-02 16:32:50 -05:00 |
|
Sean King
|
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 |
|
Sean King
|
e2f76f538c
|
Refactor Audio modal and make View context actually work
|
2020-07-02 16:31:51 -05:00 |
|
Sean King
|
1a7cbb21a7
|
Audio player work (change of sensitive content handling)
|
2020-07-02 16:31:48 -05:00 |
|