59a3e3fcbb
Merge branch 'develop' into fedi-absturztau-be
2022-11-27 09:57:22 +01:00
c01c62f149
Redirect users to "awaiting approval" message on register ( #231 )
...
Ref #81 - this implements a "your request has been sent" message
Co-authored-by: FloatingGhost <hannah@coffee-and-dreams.uk>
Reviewed-on: https://akkoma.dev/AkkomaGang/pleroma-fe/pulls/231
2022-11-22 14:44:44 +00:00
1b190db9ed
Merge branch 'develop' into fedi-absturztau-be
2022-10-19 17:48:12 +02:00
7df49720de
ensure we sync settings whilst tab is open
2022-10-08 11:55:48 +01:00
2453a338be
Added support for removing users from followers
2022-10-06 17:06:53 +01:00
4f837f75ea
setting-sync ( #175 )
...
Co-authored-by: FloatingGhost <hannah@coffee-and-dreams.uk>
Reviewed-on: https://akkoma.dev/AkkomaGang/pleroma-fe/pulls/175
2022-10-06 15:59:16 +00:00
2d85ee6a08
use-server-side-mfm ( #133 )
...
Reviewed-on: https://akkoma.dev/AkkomaGang/pleroma-fe/pulls/133
2022-08-18 03:14:38 +00:00
e61228b031
use akkoma-specific source for MFM unless asked not to ( #132 )
...
Reviewed-on: https://akkoma.dev/AkkomaGang/pleroma-fe/pulls/132
2022-08-17 09:34:50 +00:00
d3d13d50d4
resolve merge conflicts
2022-07-26 12:22:07 +02:00
6b10df2d89
merged akkoma-fe develop
2022-07-26 10:44:11 +02:00
a8c4aec721
purge shout/chat ( #49 )
...
Reviewed-on: https://akkoma.dev/AkkomaGang/pleroma-fe/pulls/49
2022-07-20 15:36:45 +00:00
9923ff587b
Add private note field to user profile
2022-06-22 19:14:06 +03:00
89a37d84b2
resolve merge conflicts
2022-06-11 10:55:23 +02:00
f6cf509a04
Merge remote-tracking branch 'upstream/develop' into develop
2022-06-08 18:09:16 +01:00
8d93e9c13c
set/unset threecolumn mode on login/logout
2022-05-16 23:40:51 +03:00
5ce9136d89
resolve merge conflicts
2022-04-03 19:03:36 +02:00
643e087404
resolve merge conflicts
2022-03-16 20:21:33 +01:00
cd4ad2df11
Merge remote-tracking branch 'origin/develop' into vue3-again
...
* origin/develop: (475 commits)
Apply 1 suggestion(s) to 1 file(s)
Update dependency @ungap/event-target to v0.2.3
Update package.json
fix broken icons after FA upgrade
Update Font Awesome
Update dependency webpack-dev-middleware to v3.7.3
Update dependency vuelidate to v0.7.7
Pin dependency @kazvmoe-infra/pinch-zoom-element to 1.2.0
lint
Make media modal buttons larger
Add English translation for hide tooltip
Add hide button to media modal
Lint
Prevent hiding media viewer if swiped over SwipeClick
Fix webkit image blurs
Fix video in media modal not displaying properly
Add changelog for https://git.pleroma.social/pleroma/pleroma-fe/-/merge_requests/1403
Remove image box-shadow in media modal
Clean up debug code for image pinch zoom
Bump @kazvmoe-infra/pinch-zoom-element to 1.2.0 on npm
...
2022-03-16 21:00:20 +02:00
2ac78219ee
Improve the user card for deactivated users
2022-01-19 13:09:48 +00:00
b141b04a53
Merge branch 'develop' of https://git.pleroma.social/pleroma/pleroma-fe into develop
2021-11-19 13:48:39 +00:00
d34cef391b
resolve merge confilcts
2021-10-02 19:31:29 +02:00
214d85189c
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma-fe into develop
2021-06-25 10:07:29 +01:00
fcf1c7b4b4
resolve merge conflicts
2021-06-21 13:58:30 +02:00
5e83672274
fixed some strange error
2021-06-07 20:01:57 +03:00
22c8f71945
mention link
2021-06-07 18:41:47 +03:00
0604b1d5b7
Rename legacy PleromaFE Chat functionality to "Shout"
2021-06-01 12:51:20 -05:00
905b9771ec
stop using vue.set
2021-04-25 13:24:08 +03:00
c7c4e2e03e
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma-fe into develop
2021-03-23 23:01:44 +00:00
7f05730e9b
resolve merge conflicts and update fixes
2021-03-16 11:20:22 +01:00
a8967d85bd
streamlined WS flow, reduced spam amount related to WS reconnections
2021-03-09 02:38:10 +02:00
9a8bc245a6
fixed few-posts TLs when streaming is enabled
2021-01-13 22:17:29 +02:00
edb5826072
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma-fe into develop
2020-12-29 13:25:38 +00:00
a6822d26bb
Merge branch 'develop' into fedi-absturztau-be
2020-11-23 09:21:56 +01:00
49f7c84e3f
Fix pinned statuses and perhaps some other stuff
2020-11-17 15:25:38 +02:00
07853ed322
Merge branch 'develop' into fedi-absturztau-be
2020-08-27 21:41:14 +02:00
763d2c0ce4
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma-fe into develop
2020-08-13 20:15:30 +01:00
fdbacba36a
resume last lasttime instead of always friends/public
2020-07-23 15:09:32 +03:00
6f621dd34c
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma-fe into develop
2020-07-10 11:27:53 +01:00
954d5c05df
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma-fe into develop
2020-07-09 22:32:18 +01:00
7fa2dfecc6
Merge branch 'direct-conversations' of https://git.pleroma.social/eugenijm/pleroma-fe into direct-conversations
2020-07-08 19:16:44 +02:00
aa2cf51c05
Add Chats
2020-07-08 15:21:31 +03:00
431b3f527d
StaffPanel: Move staff loading to panel creation.
2020-07-07 14:39:43 +02:00
ea0a12f604
Merge branch 'develop' into 'iss-149/profile-fields-setting'
...
# Conflicts:
# src/components/settings_modal/tabs/profile_tab.vue
2020-06-27 07:19:49 +00:00
77bd79100b
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma-fe into develop
2020-06-19 11:01:06 +01:00
4e0b4427a9
remove recentqueries thing
2020-06-18 14:19:21 +03:00
fa7bcb74ce
return the correct promise type from action
2020-06-18 13:00:09 +03:00
9c884fef11
remove search blocker, fix debounce params
2020-06-18 12:29:13 +03:00
cc4691a4ef
Fix merging array field for users
2020-06-10 03:48:49 +09:00
5996954c4a
Reset the chat list on logout
2020-05-29 09:43:52 +03:00
8a8a9ad562
WIP notification count
2020-05-29 09:43:52 +03:00
Puniko
floatingghost
Sean King
Sol Fisher Romanoff
Henry Jameson
Ilja
sadposter
Mark Felder
Henry Jameson
Shpuld Shpuldson
eugenijm
lain
kPherox