HJ
157d4e601e
Merge branch 'fix/floating-button' into 'develop'
...
Mobile Post button fix
Closes #506
See merge request pleroma/pleroma-fe!769
2019-05-07 18:40:49 +00:00
taehoon
1b07c6ae4f
add processing state and close modal after api request is completed
2019-05-03 11:40:05 -04:00
taehoon
cea6ea42f0
add api service function
2019-05-03 11:40:05 -04:00
taehoon
2cda9010df
add user reporting modal
2019-05-03 11:40:05 -04:00
Shpuld Shpludson
b1bd5bd08e
Merge branch 'develop' into 'brendenbice1222/pleroma-fe-issues/pleroma-fe-202-show-boosted-users'
...
# Conflicts:
# src/services/api/api.service.js
2019-04-30 15:11:30 +00:00
shpuld
da08388d6a
filter outside of component
2019-04-29 22:36:39 +03:00
eugenijm
ae1496cfb4
Make floating post button configurable
2019-04-29 21:32:29 +03:00
taehoon
f2f3fa81d8
refer searched user objects from the global user rep
2019-04-22 11:17:01 -04:00
shpuld
d417945427
Merge branch 'develop' into brendenbice1222/pleroma-fe-issues/pleroma-fe-202-show-boosted-users
2019-04-22 17:24:35 +03:00
taehoon
992c8e1f77
stop fetching user relationship when user is unauthorized
2019-04-17 22:47:56 -04:00
taehoon
d3cad54aa3
add bulk mute/unmute buttons and wire up to vuex
2019-04-17 11:32:49 -04:00
taehoon
13c8f10f4b
wire up bulk action buttons to vuex
2019-04-17 11:32:49 -04:00
Shpuld Shpludson
55410c91fa
Merge branch '489' into 'develop'
...
Fix Blocked status inconsistency between Blocks setting tab and Following profile tab
Closes #489
See merge request pleroma/pleroma-fe!751
2019-04-15 19:58:15 +00:00
taehoon
948baba9d3
add muted user to the mutes list in real time
2019-04-14 23:44:50 -04:00
taehoon
5c2c222252
add blocked user to the blocked list on real time
2019-04-14 23:44:49 -04:00
taehoon
69f9ea987c
make blocking functional in the search results
2019-04-14 23:44:49 -04:00
taehoon
e7010d73ac
store friends/followers in the global user repository
2019-04-14 23:41:38 -04:00
Brenden Bice
41845389a9
display no message on empty data fetched from api
2019-04-12 23:12:22 -04:00
Brenden Bice
2ae0507575
remove error message on no more following
2019-04-12 23:09:05 -04:00
Brenden Bice
8ed4eb8a7f
refactor showing favs and repeats logic
2019-04-11 23:26:13 -04:00
Brenden Bice
f74a6b4b57
display favs & reblogged users on expanded post in timeline view
2019-04-11 23:26:13 -04:00
Brenden Bice
8c9bcdc6c1
rename favourite to favorite
2019-04-11 23:26:12 -04:00
Brenden Bice
4ab2ddb03c
improve code quality
2019-04-11 23:26:12 -04:00
Brenden Bice
85457fc917
fetch reblogged users
2019-04-11 23:26:12 -04:00
Brenden Bice
2d339cd3b8
fetch favorited users
2019-04-11 23:26:12 -04:00
taehoon
ab7a418d80
maintain conversationsObject storage
2019-04-11 12:46:06 -04:00
dave
d498a26af5
Merge branch 'develop' of https://git.pleroma.social/pleroma/pleroma-fe into issue-436-mastoapi-notifications
2019-04-09 15:42:05 -04:00
Shpuld Shpludson
1e9ddcb0da
Merge branch 'fix/notification-bugs' into 'develop'
...
#474 Fix notification bugs
Closes #474
See merge request pleroma/pleroma-fe!728
2019-04-09 15:24:33 +00:00
dave
d3218807b4
#436 - merge develop
2019-04-08 21:04:59 -04:00
Shpuld Shpludson
546ced43d9
Merge branch 'moderation-menu' into 'develop'
...
Moderation menu #310
See merge request pleroma/pleroma-fe!595
2019-04-08 19:01:40 +00:00
dave
b0da32fea2
Merge branch 'develop' of https://git.pleroma.social/pleroma/pleroma-fe into issue-436-mastoapi-notifications
2019-04-08 14:29:12 -04:00
Maksim
7259e02a10
remove debug message
2019-04-08 16:49:51 +00:00
jasper
1c04cd2036
Add space
2019-04-04 09:06:53 -07:00
jasper
a1275be4c0
Separate timeline and notification
2019-04-04 09:03:56 -07:00
jasper
7c2b65e9a3
Remove useless codes
2019-04-03 09:08:23 -07:00
jasper
ea27483f27
Fix notification bugs
2019-04-03 09:04:46 -07:00
dave
fe756fe30d
#436 - revert stripe html for notification
2019-04-03 11:17:23 -04:00
dave
6ed26ce65d
#436 - notification html to text content
2019-04-03 10:58:39 -04:00
dave
6fa014505c
#436 - revert notification silience config
2019-04-03 10:53:11 -04:00
dave
c9a9b3122d
#469 - DM warning text should vary based on BE setting
2019-04-02 10:26:14 -04:00
dave
8b3f037f87
Merge branch 'develop' of https://git.pleroma.social/pleroma/pleroma-fe into issue-436-mastoapi-notifications
2019-04-02 10:07:36 -04:00
eugenijm
6b6878bde0
Added moderation menu
2019-04-01 23:30:06 +03:00
shpuld
46de457f50
Merge branch 'develop' into feature/mobile-improvements-3
2019-04-01 22:42:06 +03:00
Shpuld Shpludson
df366a586d
Merge branch '471-timeline-since-id' into 'develop'
...
#471 - fix timeline fetch with since_id
Closes #471
See merge request pleroma/pleroma-fe!722
2019-04-01 19:33:45 +00:00
jared
d856c2745c
#471 - fix timeline fetch with since_id
2019-04-01 13:25:48 -04:00
dave
21ea5adc8b
#436 - apply patch and clean up
2019-03-31 21:59:18 -04:00
dave
b909796683
#436 - update notification
2019-03-31 15:15:16 -04:00
dave
06fd3a9c5f
#436 - apply patch
2019-03-31 14:50:34 -04:00
Henry Jameson
9f4a9bff46
Merge remote-tracking branch 'upstream/develop' into minimal-scopes-mode
...
* upstream/develop: (173 commits)
Fix: Change condition
fix typo
update store according to retweeted status
#433 - update sort by for conversation
display replies_count right after reply icon
expose replies_count from mastodon api
Apparently, MastoAPI gives status in ancestors if you try opening a repeat...
make side drawer use gesture service and fix its animations
review/remove error hiding
errata
review
#433 - sort conversation for retweets and clean up
Revert "Merge branch 'revert-987b5162' into 'develop'"
Revert "Merge branch 'mastoapi/friends-tl' into 'develop'"
Add await to login action'
Remove console log
Fix warnings in user profile routing
Add tests for gesture service, fix bug with perpendicular directions
#255 - clean up autocomplete form
#255 - clean up user settings page with self-closing html tags
...
2019-03-30 12:31:50 +02:00
Shpuld Shpludson
0117f6af9f
Merge branch 'issues/#465' into 'develop'
...
update store according to retweeted status
Closes #465
See merge request pleroma/pleroma-fe!713
2019-03-29 15:33:16 +00:00
