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 |
|
Alex Gleason
|
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 |
|
Mary Kate
|
769a512445
|
only render emoji selector in the dom when needed
|
2020-08-05 15:53:30 -05:00 |
|
Mary Kate
|
e6ee961016
|
Only render a hover profile card in the dom when relevant
|
2020-08-05 14:27:42 -05:00 |
|
Alex Gleason
|
aec44bfea6
|
Verified: Use getIn in display_name.js
|
2020-08-05 18:04:32 +00: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 |
|
Alex Gleason
|
eeaf9f0b8e
|
HoverCard: Do the JS way on DetailedStatus too
|
2020-08-03 00:40:13 -05:00 |
|
Alex Gleason
|
35c9574c2f
|
HoverCard: Handle delay in JS instead of CSS
|
2020-08-02 23:47:19 -05:00 |
|
Alex Gleason
|
7fe70a64b5
|
Pleroma relationship fixes
|
2020-08-02 21:45:42 -05: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 |
|
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 |
|
Alex Gleason
|
1266585aef
|
HoverCard: Reposition "Follow you!" component
|
2020-08-02 19:50:17 -05:00 |
|
Alex Gleason
|
a7463dd3fc
|
HoverCard: Add floating NavLinks for clickthrough
|
2020-08-02 18:53:47 -05:00 |
|
Alex Gleason
|
1f5898b67d
|
Bring HoverCard out of NavLink
|
2020-08-02 18:39:32 -05:00 |
|
Alex Gleason
|
abd13e8fa5
|
Move hovercard into display name for regular status too
|
2020-08-02 18:18:34 -05:00 |
|
Alex Gleason
|
23e370a10b
|
Bookmarks: don't update constantly, fixes #263
|
2020-07-30 00:38:40 -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 |
|
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 |
|
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
|
5333680a32
|
Linter fixes
|
2020-07-28 14:13:29 -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
|
eda4c7d629
|
Add markdown reducer tests
|
2020-07-28 13:53:01 -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
|
665a27d4c9
|
Update compose CW tests
|
2020-07-28 10:57:20 -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 |
|
Alex Gleason
|
9b66611540
|
Revert "Merge branch 'patch-1' into 'develop'"
This reverts commit 20bfeb1db6, reversing
changes made to 475881e80b.
|
2020-07-28 10:50:51 -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 |
|
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 |
|
Curtis
|
d15f8d4a4e
|
Update compose-test.js to accommodate decoupling of CW toggle from sensitive (NSFW) assignment
|
2020-07-20 19:28:06 +00:00 |
|
Alex Gleason
|
475881e80b
|
Merge branch 'reducers_tests' into 'develop'
Reducers tests
See merge request soapbox-pub/soapbox-fe!103
|
2020-07-20 19:10:33 +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 |
|
Alex Gleason
|
03e33df86b
|
Improve domain unblock compatibility, fixes #422
|
2020-07-16 13:43:25 -05:00 |
|
crockwave
|
7023471abe
|
edited auth-test
|
2020-07-15 17:36:34 -05:00 |
|
Alex Gleason
|
2024c4ec0d
|
Merge branch 'new-yarn-translations' into 'develop'
New yarn translations after toggle change
See merge request soapbox-pub/soapbox-fe!100
|
2020-07-15 21:01:17 +00:00 |
|
crockwave
|
e5937b42e4
|
fix linter error
|
2020-07-14 18:21:49 -05:00 |
|
crockwave
|
599129897a
|
edited accounts and alerts reducer tests
|
2020-07-14 17:11:05 -05:00 |
|
crockwave
|
67d94fb226
|
edited accounts_counters-test
|
2020-07-14 14:05:05 -05:00 |
|
Curtis ROck
|
26a37382de
|
edited accounts_counters-test
|
2020-07-14 07:43:56 -05:00 |
|
Curtis ROck
|
3d547f2038
|
fix linter issue
|
2020-07-13 22:04:29 -05:00 |
|
Curtis ROck
|
8177a48a9b
|
edit notifications-test
|
2020-07-13 21:49:42 -05:00 |
|
crockwave
|
40f688a6be
|
edited notifications_test
|
2020-07-13 20:00:55 -05:00 |
|
Curtis ROck
|
3fe51e4885
|
edit notifications-test
|
2020-07-12 17:52:58 -05:00 |
|
Sean King
|
54d7fbdc5a
|
Remove top navbar's auto-hide
|
2020-07-12 16:39:18 -06:00 |
|
Sean King
|
1034cf6f04
|
New yarn translations
|
2020-07-12 11:18:39 -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 |
|
Curtis ROck
|
1acdea14b1
|
fix lint issues
|
2020-07-11 22:50:02 -05:00 |
|
Curtis ROck
|
81a8231af4
|
edited notifications-test
|
2020-07-11 22:37:52 -05: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 |
|
crockwave
|
88b0ed440b
|
edited notifications-test
|
2020-07-11 17:34:14 -05: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 |
|
Curtis ROck
|
49d69178ae
|
notifications-test edit
|
2020-07-11 08:34:20 -05:00 |
|
Sean King
|
697291e6f5
|
Light/dark theme toggle in top navbar
|
2020-07-10 22:35:02 -06:00 |
|
Curtis ROck
|
d2e2d52a0d
|
edit notifications-test
|
2020-07-10 21:59:19 -05:00 |
|
crockwave
|
d415a432d2
|
test edits
|
2020-07-10 18:45:10 -05:00 |
|
Curtis ROck
|
c216833222
|
linter fixes
|
2020-07-09 19:37:04 -05:00 |
|
crockwave
|
2018e5238b
|
test editing
|
2020-07-09 18:44:23 -05:00 |
|
Curtis ROck
|
78d0955db2
|
fix lint error
|
2020-07-08 22:19:55 -05:00 |
|
Curtis ROck
|
1402b12e3a
|
debugged tests
|
2020-07-08 22:05:22 -05:00 |
|
Alex Gleason
|
06c4f88802
|
DetailedStatus: Small reblog tweaks
|
2020-07-08 21:42:34 -05:00 |
|
crockwave
|
41ed27751e
|
debugged reducer tests
|
2020-07-08 19:22:49 -05:00 |
|
Curtis ROck
|
3635d669f4
|
linter fix
|
2020-07-07 22:27:41 -05:00 |
|
Curtis ROck
|
e01b7d8d70
|
fix linter errors
|
2020-07-07 21:52:56 -05:00 |
|
crockwave
|
3481b4c728
|
edited height_cache-test, identity_proofs-test, and list_adder-test
|
2020-07-07 19:38:16 -05:00 |
|
Curtis ROck
|
acfd8fe2ac
|
edit conversations-test
|
2020-07-07 08:55:44 -05:00 |
|
Sean King
|
f99db09c8d
|
Change the repost to be alongside emoji reacts
|
2020-07-06 15:35:27 -06:00 |
|
crockwave
|
c55e937dcc
|
linter fix
|
2020-07-06 15:08:13 -05:00 |
|