d7d897037c
Merge remote-tracking branch 'upstream/develop' into neckbeard
2020-03-05 17:07:26 -06:00
0702934f4f
fix trasparency problems in some cases (purple headers)
2020-03-04 00:23:14 +02:00
60b7ce00ac
Merge remote-tracking branch 'upstream/develop' into neckbeard
2020-03-02 07:30:50 -06:00
ab4005add5
add status unavailable message when status can't be loaded in status preview
2020-03-02 08:35:57 +02:00
46a8533710
updates to neckbeard
2020-02-29 08:30:52 -06:00
ee582855d2
Apply suggestion to src/modules/instance.js
2020-02-28 17:20:40 +00:00
5b7acca0ba
make theme loading work with source-only presets
2020-02-22 10:57:08 +02:00
32358b8abd
Merge remote-tracking branch 'upstream/develop' into neckbeard
2020-02-20 19:59:08 -06:00
0abc3f9b85
Merge branch 'moderation-menu-fix' into 'develop'
...
Fix user deactivation, deletion, and role assignment in the moderation menu
See merge request pleroma/pleroma-fe!1063
2020-02-19 16:30:53 +00:00
695d6b6c50
Fix user activation/deactivation, deletion, and role assignment in the moderation menu
2020-02-17 16:29:39 +03:00
23d91b7806
Merge remote-tracking branch 'upstream/develop' into neckbeard
2020-02-12 17:01:26 -06:00
84ebae8ed3
Merge branch 'develop' into 'themes-accent'
...
# Conflicts:
# src/components/emoji_reactions/emoji_reactions.vue
2020-02-11 23:09:15 +00:00
f6b482be51
Emoji Reactions - fixes and improvements
2020-02-11 12:24:51 +00:00
eb37b6d450
updates to neckbeard
2020-01-29 07:28:33 -06:00
f0c4bb1193
Merge remote-tracking branch 'upstream/develop' into themes-accent
...
* upstream/develop: (33 commits)
add emoji reactions to changelog
fix emoji reaction classes broken in develop
review changes
Fix password and email update
remove unnecessary anonymous function
Apply suggestion to src/services/api/api.service.js
remove logs/commented code
remove favs count from react button
remove mock data
change emoji reactions to use new format
Added polyfills for EventTarget (needed for Safari) and CustomEvent (needed for IE)
Fix missing TWKN when logged in, but server is set to private mode.
Fix follower request fetching
Add domain mutes to changelog
Implement domain mutes v2
change changelog to reflect actual release history of frontend
Fix #750 , fix error messages and captcha resetting
Optimize Notifications Rendering
update CHANGELOG
Use last seen notif instead of first unseen notif for sinceId
...
2020-01-28 20:44:13 +02:00
c4beac5f89
Merge branch 'develop' into feat/emoji-reactions
2020-01-26 15:59:59 +02:00
a018ea622c
change emoji reactions to use new format
2020-01-26 15:45:12 +02:00
a8e3d149e9
Updates
2020-01-21 18:33:52 -06:00
9336140486
massively improved initial theme loading code, added checks and warnings when
...
loading theme files (import/localStorage/defaults)
2020-01-22 00:37:19 +02:00
8080981fcd
Fix follower request fetching
2020-01-21 16:51:49 +01:00
a7129b0d0b
Merge remote-tracking branch 'upstream/develop' into neckbeard
2020-01-15 22:34:35 -06:00
7a013ac393
Implement domain mutes v2
2020-01-15 20:22:54 +00:00
662afe973a
Fix #750 , fix error messages and captcha resetting
2020-01-14 13:45:00 +00: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
027ecda6d8
Merge remote-tracking branch 'upstream/develop' into neckbeard
2020-01-11 19:01:38 -06:00
215662afde
Merge branch 'develop' into 'fix-move-type-notification'
...
# Conflicts:
# static/fontello.json
2020-01-03 09:05:48 +00:00
36c041e9b7
Merge remote-tracking branch 'upstream/develop' into develop
2019-12-31 18:52:53 -06: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
5c4c368b35
Merge remote-tracking branch 'upstream/develop' into develop
2019-12-21 10:10:50 -06: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
1371fc8eb1
Merge remote-tracking branch 'upstream/develop' into develop
2019-12-15 02:20:35 -06: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
addacf36d1
mfa: removed unused code
2019-12-12 21:19:13 +03:00
585702b1ce
fix desktop notifications not working with streaming
2019-12-12 18:53:36 +02:00
d0c78989aa
hide instance url/link/text in header using hideSitename option
2019-12-11 10:14:30 -05:00
c3e7806acb
remove unused fallback
2019-12-11 18:48:18 +09:00
e8333fff8d
change the expression of `move`
2019-12-11 18:30:23 +09:00
6acd889589
Option to enable streaming
2019-12-10 21:30:27 +02:00
6af870cd90
Add view for moves notifications
2019-12-11 00:00:45 +09:00
2bc63720a5
fix parse for move type notifications
2019-12-11 00:00:36 +09:00
8ee8033955
Set error data
2019-12-09 10:31:57 +09:00
e86af0c965
Change naming, make more general
2019-12-09 09:02:34 +09:00
505fb26061
better wrapper for websocket
2019-12-08 19:18:38 +02:00
ff95d865d2
Updated streaming and improved error-handling, some more refactoring to api
2019-12-08 16:05:41 +02:00
13fc2612ae
Change 403 messaging
2019-12-05 11:48:37 +09:00
Your New SJW Waifu
Henry Jameson
Shpuld Shpuldson
eugenijm
HJ
Shpuld Shpuldson
lain
taehoon
feld
Maksim Pechnikov
kPherox
Wyatt Benno