norm/pleroma-fe
1
0
Fork 0
forked from AkkomaGang/akkoma-fe
Code Issues Pull requests Packages Projects Releases Wiki Activity
3925 commits 3 branches 24 tags 18 MiB
Commit graph

2188 commits

Author SHA1 Message Date
Shpuld Shpludson 4a266a4d05 Fix one click nsfw unhide on videos 2020-01-31 00:24:54 +00: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 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 a018ea622c change emoji reactions to use new format 2020-01-26 15:45:12 +02: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 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 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 36376ce57c use vuex action 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
Absturztaube 32d7a49b9d use flex for stickers 2019-12-15 17:58:37 +01:00
feld 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
feld 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 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
Mark Felder 7ddd5af081 Finally trust eslint 2019-12-12 13:46:07 -06:00
Mark Felder afe5b3a82d More lint 2019-12-12 13:41:52 -06:00
Mark Felder 211d25cd5a More lint 2019-12-12 13:39:18 -06:00
Mark Felder 3eeb3dc572 Lint 2019-12-12 13:37:32 -06:00
Mark Felder 821a2bcc68 Merge branch 'develop' into feature/lockdown-timelines-private-mode 2019-12-12 13:32:52 -06:00
Maksim Pechnikov addacf36d1 mfa: removed unused code 2019-12-12 21:19:13 +03:00
taehoon a412b53801 increase icon width a little bit in the nav panel 2019-12-12 10:42:27 -05:00
taehoon 7fa294f11c add icons to nav panel 2019-12-12 10:42:27 -05:00
HJ c7376b8325 Merge branch 'support-native-captcha' into 'develop' 
Support "native" captcha

See merge request pleroma/pleroma-fe!1033
 2019-12-12 12:24:35 +00:00
HJ a621382a3f Merge branch 'load-button-fix' into 'develop' 
Fix css runtime loading issue

Closes #734

See merge request pleroma/pleroma-fe!1030
 2019-12-12 12:23:01 +00:00
Egor Kislitsyn ed3144eb11 Support "native" captcha 2019-12-12 18:19:46 +07:00
Maksim Pechnikov f70fe28f64 mfa: fix login and recovery form 2019-12-12 08:42:21 +03:00
seven 386719b0d0 fix css runtime loading issue 2019-12-12 08:33:40 +05:00
taehoon d0c78989aa hide instance url/link/text in header using hideSitename option 2019-12-11 10:14:30 -05:00
kPherox c3e7806acb
remove unused fallback 2019-12-11 18:48:18 +09:00
kPherox b4acbf5311
Add user migrates filter to interactions 2019-12-11 18:30:26 +09:00