4e04079739
Merge branch 'feat/emoji-reactions' of git.pleroma.social:pleroma/pleroma-fe into feat/emoji-reactions
2020-01-27 18:44:25 +02:00
e6291e4ee1
remove unnecessary anonymous function
2020-01-27 18:43:26 +02:00
cb205036f9
Apply suggestion to src/services/api/api.service.js
2020-01-27 14:18:15 +00:00
e4e3a28838
remove logs/commented code
2020-01-27 15:49:05 +02:00
0de627baae
remove favs count from react button
2020-01-26 16:18:57 +02:00
c4beac5f89
Merge branch 'develop' into feat/emoji-reactions
2020-01-26 15:59:59 +02:00
7cfe1b05e8
remove mock data
2020-01-26 15:57:40 +02:00
a018ea622c
change emoji reactions to use new format
2020-01-26 15:45:12 +02:00
b0b0fc403a
Merge branch 'event-target-fix' into 'develop'
...
Polyfills for EventTarget and CustomEvent
Closes #756
See merge request pleroma/pleroma-fe!1048
2020-01-24 12:42:54 +00:00
2c61eb8e7f
Added polyfills for EventTarget (needed for Safari) and CustomEvent (needed for IE)
2020-01-24 00:55:13 +03:00
deb2ddb398
Merge branch 'fix/federated-timeline-when-private-mode' into 'develop'
...
Fix missing TWKN when logged in, but server is set to private mode.
Closes #759
See merge request pleroma/pleroma-fe!1047
2020-01-23 18:10:55 +00:00
9d8dbd8340
Fix missing TWKN when logged in, but server is set to private mode.
2020-01-23 12:00:50 -06:00
ad8eb88323
Merge branch 'fix-follow-requests' into 'develop'
...
Fix follower request fetching
Closes pleroma#1523 and #757
See merge request pleroma/pleroma-fe!1046
2020-01-21 16:31:41 +00:00
8080981fcd
Fix follower request fetching
2020-01-21 16:51:49 +01:00
f052ac4a1e
Add domain mutes to changelog
2020-01-15 22:38:31 +02:00
6bd6ec66bc
Merge branch 'tae/pleroma-fe-663' into 'develop'
...
Implement domain mutes v2
See merge request pleroma/pleroma-fe!1045
2020-01-15 20:22:54 +00:00
7a013ac393
Implement domain mutes v2
2020-01-15 20:22:54 +00:00
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
7397636914
change changelog to reflect actual release history of frontend
2020-01-14 16:01:30 +02:00
dac263e224
Merge branch 'fix/registration-backend-interactor-fix' into 'develop'
...
Fix #750 , fix error messages and captcha resetting
Closes #750
See merge request pleroma/pleroma-fe!1042
2020-01-14 13:45:00 +00:00
662afe973a
Fix #750 , fix error messages and captcha resetting
2020-01-14 13:45:00 +00:00
ac90d4c532
Merge branch 'feat/optimize-amount-of-notifs-to-render' into 'develop'
...
Optimize Notifications Rendering
See merge request pleroma/pleroma-fe!1041
2020-01-14 13:28:57 +00:00
86380f0429
Optimize Notifications Rendering
2020-01-14 13:28:57 +00:00
dd740043c6
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma-fe into develop
2020-01-14 13:39:17 +02:00
9b8cdb6525
update CHANGELOG
2020-01-14 13:39:01 +02:00
b275494a86
Merge branch 'fix/fetch-seen-notifs-properly' into 'develop'
...
Fix #526 : Oldest notifications left unseen when using "Read!" in another tab
Closes #526
See merge request pleroma/pleroma-fe!1040
2020-01-14 09:26:30 +00:00
910b82e231
Use last seen notif instead of first unseen notif for sinceId
2020-01-14 11:13:59 +02:00
b10b92a876
clean up code, fix prediction bug
2020-01-14 10:06:14 +02:00
b32888194c
fix merge conflicts
2020-01-13 23:47:32 +02:00
33abbed5a1
usable-but-buggy: picker, adding/removing reaction on click, search, styles
2020-01-13 23:34:39 +02:00
7257189ea7
Merge branch 'pleroma-amoled-theme' into 'develop'
...
Add default pleroma AMOLED dark theme
See merge request pleroma/pleroma-fe!1039
2020-01-07 23:39:14 +00:00
ae2ae00d41
Add AMOLED dark theme
2020-01-07 21:13:51 +00:00
ad97e03b59
Merge branch 'fix-move-type-notification' into 'develop'
...
Fix for move type notification
See merge request pleroma/pleroma-fe!1026
2020-01-03 10:16:42 +00:00
215662afde
Merge branch 'develop' into 'fix-move-type-notification'
...
# Conflicts:
# static/fontello.json
2020-01-03 09:05:48 +00:00
1a82a00a2b
Merge branch 'mfa_fix' into 'develop'
...
mfa fix
See merge request pleroma/pleroma-fe!1036
2019-12-30 14:45:49 +00:00
816c077c4f
mfa fix
2019-12-30 19:27:44 +09:00
b8f4b18ae5
Merge branch 'streaming' into 'develop'
...
Streaming and Backend Interactor service overhaul, removed the need for copypasting
See merge request pleroma/pleroma-fe!1012
2019-12-26 16:49:42 +00:00
bd07e5de1c
unify showimmideately
2019-12-26 14:35:46 +02:00
43197c4243
Some error handling
2019-12-26 14:12:35 +02:00
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
f7029a27eb
Merge branch '716' into 'develop'
...
Fix "Deactivation of remote accounts from frontend does not work"
Closes #716
See merge request pleroma/pleroma-fe!1006
2019-12-18 00:51:41 +00:00
4e4c4af422
toggle_activation api is also deprecated
2019-12-15 14:32:04 -05:00
36376ce57c
use vuex action
2019-12-15 14:32:04 -05:00
45e7f93c49
refactor toggleActivationStatus
2019-12-15 14:32:04 -05:00
506822bed0
replace setActivationStatus api with new one
2019-12-15 14:32:04 -05:00
54f692622a
wire up staff accounts with correct store data
2019-12-15 14:30:09 -05:00
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
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
feld
3691093572
Merge branch 'i18b/update-ja_easy' into 'develop'
...
i18n/update-ja_easy
See merge request pleroma/pleroma-fe!1002
2019-12-13 17:05:14 +00:00
Shpuld Shpuldson
feld