Shpuld Shpludson
6be6241767
Merge branch 'feature-collapsed-media-indicator' into 'develop'
...
Indicate whether collapsed statuses contain gallery media or link preview cards
Closes #767
See merge request pleroma/pleroma-fe!1056
2020-02-10 14:50:42 +00:00
dafced3a86
MRF Keyword Policy Disclosure
2020-02-10 08:04:58 +00:00
xenofem
e36c39be19
Include non-gallery attachments and distinguish between images and videos
2020-02-08 16:01:01 -05:00
xenofem
36e19128bf
Indicate whether collapsed statuses contain gallery media or link preview cards
2020-02-08 13:15:09 -05:00
8fcb9c42aa
Merge branch 'fix/escape-html' into 'develop'
...
Escape HTML from display name and subject fields
Closes #724
See merge request pleroma/pleroma-fe!1052
2020-02-06 16:12:11 +00:00
Shpuld Shpludson
4a266a4d05
Fix one click nsfw unhide on videos
2020-01-31 00:24:54 +00:00
rinpatch
746416207b
Escape HTML from display name and subject fields
...
Closes #724
2020-01-30 19:58:23 +03:00
Shpuld Shpuldson
29806c9629
fix emoji reaction classes broken in develop
2020-01-28 17:53:47 +02:00
lain
73253b87bf
Merge branch 'feat/emoji-reactions' into 'develop'
...
Emoji reactions
See merge request pleroma/pleroma-fe!1049
2020-01-28 15:24:56 +00:00
Shpuld Shpuldson
6afff4f8c2
review changes
2020-01-28 17:09:25 +02:00
eugenijm
566f013ac4
Fix password and email update
2020-01-28 06:12:32 +03:00
Shpuld Shpuldson
e6291e4ee1
remove unnecessary anonymous function
2020-01-27 18:43:26 +02:00
Shpuld Shpuldson
e4e3a28838
remove logs/commented code
2020-01-27 15:49:05 +02:00
Shpuld Shpuldson
0de627baae
remove favs count from react button
2020-01-26 16:18:57 +02:00
Shpuld Shpuldson
c4beac5f89
Merge branch 'develop' into feat/emoji-reactions
2020-01-26 15:59:59 +02:00
Shpuld Shpuldson
7cfe1b05e8
remove mock data
2020-01-26 15:57:40 +02:00
Shpuld Shpuldson
a018ea622c
change emoji reactions to use new format
2020-01-26 15:45:12 +02:00
eugenijm
2c61eb8e7f
Added polyfills for EventTarget (needed for Safari) and CustomEvent (needed for IE)
2020-01-24 00:55:13 +03:00
Mark Felder
9d8dbd8340
Fix missing TWKN when logged in, but server is set to private mode.
2020-01-23 12:00:50 -06:00
lain
8080981fcd
Fix follower request fetching
2020-01-21 16:51:49 +01:00
Shpuld Shpludson
7a013ac393
Implement domain mutes v2
2020-01-15 20:22:54 +00:00
Shpuld Shpludson
e3de2964cc
Merge branch '736' into 'develop'
...
Fix "Follow button is out of sync in the about page"
Closes #736
See merge request pleroma/pleroma-fe!1035
2020-01-15 18:40:45 +00:00
Shpuld Shpludson
662afe973a
Fix #750 , fix error messages and captcha resetting
2020-01-14 13:45:00 +00:00
Shpuld Shpludson
86380f0429
Optimize Notifications Rendering
2020-01-14 13:28:57 +00:00
Shpuld Shpuldson
910b82e231
Use last seen notif instead of first unseen notif for sinceId
2020-01-14 11:13:59 +02:00
Shpuld Shpuldson
b10b92a876
clean up code, fix prediction bug
2020-01-14 10:06:14 +02:00
Shpuld Shpuldson
b32888194c
fix merge conflicts
2020-01-13 23:47:32 +02:00
Shpuld Shpuldson
33abbed5a1
usable-but-buggy: picker, adding/removing reaction on click, search, styles
2020-01-13 23:34:39 +02:00
HJ
215662afde
Merge branch 'develop' into 'fix-move-type-notification'
...
# Conflicts:
# static/fontello.json
2020-01-03 09:05:48 +00:00
Wyatt Benno
816c077c4f
mfa fix
2019-12-30 19:27:44 +09:00
Henry Jameson
bd07e5de1c
unify showimmideately
2019-12-26 14:35:46 +02:00
Henry Jameson
43197c4243
Some error handling
2019-12-26 14:12:35 +02:00
Henry Jameson
b619477573
Merge remote-tracking branch 'upstream/develop' into streaming
...
* upstream/develop: (51 commits)
toggle_activation api is also deprecated
use vuex action
refactor toggleActivationStatus
replace setActivationStatus api with new one
use flex for stickers
i18n/update-ja_easy
Use a centralized fallback for missing values and use instance.federating instead of instance.federation.enabled
Add fallback in case BE does not report federating status in nodeinfo
The value we are looking for is federationPolicy.enabled, not federationPolicy.federating
Logic should be to hide TWKN if not federating OR if instance is not public
Finally trust eslint
More lint
More lint
Lint
mfa: removed unused code
increase icon width a little bit in the nav panel
add icons to nav panel
Revert "Merge branch 'revert-96cab6d8' into 'develop'"
Support "native" captcha
Revert "Merge branch 'oauth-extra-scopes' into 'develop'"
...
2019-12-26 12:47:51 +02:00
taehoon
4e4c4af422
toggle_activation api is also deprecated
2019-12-15 14:32:04 -05:00
taehoon
36376ce57c
use vuex action
2019-12-15 14:32:04 -05:00
taehoon
45e7f93c49
refactor toggleActivationStatus
2019-12-15 14:32:04 -05:00
taehoon
506822bed0
replace setActivationStatus api with new one
2019-12-15 14:32:04 -05:00
taehoon
54f692622a
wire up staff accounts with correct store data
2019-12-15 14:30:09 -05:00
HJ
b739edb509
Merge branch 'fix-sticker-height' into 'develop'
...
fix sticker picker height in emojo picker
See merge request pleroma/pleroma-fe!1022
2019-12-15 17:59:27 +00:00
32d7a49b9d
use flex for stickers
2019-12-15 17:58:37 +01:00
HJ
c1a0e23947
Merge branch 'revert-c2c48ec2' into 'develop'
...
Reinstate `push` and `admin` scopes
See merge request pleroma/pleroma-fe!1034
2019-12-14 14:12:41 +00:00
1cba6c56f0
i18n/update-ja_easy
2019-12-13 17:05:13 +00:00
749a399944
Merge branch 'issue_124' into 'develop'
...
Change 403 messaging
See merge request pleroma/pleroma-fe!1020
2019-12-13 17:02:09 +00:00
0b49e798e0
Merge branch 'feature/lockdown-timelines-private-mode' into 'develop'
...
interaction with BE private mode
See merge request pleroma/pleroma-fe!989
2019-12-13 16:58:29 +00:00
HJ
766a674a48
Merge branch 'upgrade-babel' into 'develop'
...
Upgrade babel to v7
Closes #733
See merge request pleroma/pleroma-fe!1029
2019-12-13 10:21:29 +00:00
HJ
9789123b1c
Merge branch 'mfa/login_form' into 'develop'
...
mfa: fix login and recovery form
See merge request pleroma/pleroma-fe!1031
2019-12-13 10:18:50 +00:00
Mark Felder
d899d06973
Use a centralized fallback for missing values and use instance.federating instead of
...
instance.federation.enabled
2019-12-12 15:29:50 -06:00
Mark Felder
8d14036a23
Add fallback in case BE does not report federating status in nodeinfo
2019-12-12 15:17:23 -06:00
Mark Felder
0743fbb28b
The value we are looking for is federationPolicy.enabled, not federationPolicy.federating
...
Also the || true fallback does not work and always becomes true
2019-12-12 13:56:07 -06:00
Mark Felder
2514dc183f
Logic should be to hide TWKN if not federating OR if instance is not public
...
Private instances should not show any timelines
2019-12-12 13:51:50 -06:00
