Commit graph

2806 commits

Author SHA1 Message Date
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
Shpuld Shpludson
efa93d0829 Merge branch '227-quick-add' into 'develop'
Support user searching to mute/block directly in the mutes/blocks tab

See merge request pleroma/pleroma-fe!727
2019-04-15 18:21:52 +00:00
taehoon
329dc833b3 clean up 2019-04-14 23:44:50 -04:00
taehoon
d874ca905c support i18n 2019-04-14 23:44:50 -04:00
taehoon
948baba9d3 add muted user to the mutes list in real time 2019-04-14 23:44:50 -04:00
taehoon
d58e08cf52 add search to the mutes tab as well 2019-04-14 23:44:50 -04:00
taehoon
0bdb0e5a81 rename Autosuggest component 2019-04-14 23:44:49 -04:00
taehoon
1cf9780e05 make more generic 2019-04-14 23:44:49 -04:00
taehoon
fc5f4fba8c make more generic 2019-04-14 23:44:49 -04:00
taehoon
8410add394 make UserAutoSuggest component more generic 2019-04-14 23:44:49 -04:00
taehoon
5c2c222252 add blocked user to the blocked list on real time 2019-04-14 23:44:49 -04:00
taehoon
9184435887 remove blocked one from the results on real time 2019-04-14 23:44:49 -04:00
taehoon
33467880ed improve ui 2019-04-14 23:44:49 -04:00
taehoon
60b07eeaa4 filter out blocked user or me from the results 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
fd4289e45a improve ui 2019-04-14 23:44:49 -04:00
taehoon
787737c80d hide results on outside click 2019-04-14 23:44:49 -04:00
taehoon
6d3187b449 remove needless dependency 2019-04-14 23:44:49 -04:00
taehoon
b2eb43e3c8 rename css classes 2019-04-14 23:44:49 -04:00
taehoon
94e67ff118 rewrite USerAutoSuggest without any dependency 2019-04-14 23:44:49 -04:00
taehoon
da5844205c add user autosuggest component 2019-04-14 23:44:49 -04:00
taehoon
d05bd31092 setup vue-autosuggest 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
Shpuld Shpludson
936eb23bdf Merge branch 'issues/pleroma-fe-496-following-follower-error' into 'develop'
Fix error message on no more data fetched

Closes #496

See merge request pleroma/pleroma-fe!756
2019-04-14 19:15:02 +00: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
HJ
fa33e3ec58 Merge branch 'fix-notif-user' into 'develop'
Fix wrong usercard notification

Closes #493

See merge request pleroma/pleroma-fe!755
2019-04-12 07:53:46 +00:00
Henry Jameson
7d01b3d8ba Fix wrong usercard notification 2019-04-12 10:49:22 +03:00
HJ
fd3811d651 Merge branch '480-replies' into 'develop'
Display replies to statuses in real time

Closes #480

See merge request pleroma/pleroma-fe!737
2019-04-11 18:51:41 +00:00
taehoon
ab7a418d80 maintain conversationsObject storage 2019-04-11 12:46:06 -04:00
taehoon
fa16d66c52 remove unused importing 2019-04-11 07:56:26 -04:00
taehoon
724602bdc1 get statuses in a conversation from the global repository instead of local state 2019-04-11 07:56:26 -04:00
HJ
8c2efc5a5c Merge branch 'restore-yarnlock' into 'develop'
restore yarnlock

See merge request pleroma/pleroma-fe!749
2019-04-10 18:13:17 +00:00
Henry Jameson
ab58b735cd restore yarnlock 2019-04-10 21:09:26 +03:00
HJ
84505e01f5 Merge branch 'issue-436-mastoapi-notifications' into 'develop'
#436: integrate mastoAPI notifications

Closes #436

See merge request pleroma/pleroma-fe!678
2019-04-10 17:28:42 +00:00
dave
76cd01e99b #436 - remove yarn.lock 2019-04-10 13:22:54 -04:00
dave
40e9eebf91 #436 - merge develop 2019-04-10 12:54:33 -04:00
HJ
d94a7b6318 Merge branch 'fix-local' into 'develop'
Fix wrong property read in pleroma object

See merge request pleroma/pleroma-fe!747
2019-04-10 12:06:35 +00:00
Henry Jameson
18cb97a2bd Fix wrong local 2019-04-10 15:02:14 +03:00
Shpuld Shpludson
ed3aceff5c Merge branch 'mastoapi/update-extension-support' into 'develop'
Update entity normalizer to include more pleroma-specific fields

See merge request pleroma/pleroma-fe!745
2019-04-10 03:14:58 +00:00
Shpuld Shpludson
25601c6873 Merge branch 'fix-emoji-picker' into 'develop'
support new custom emoji format

Closes #484

See merge request pleroma/pleroma-fe!746
2019-04-10 03:14:51 +00:00
Henry Jameson
a25aabfa10 support new custom emoji format 2019-04-09 22:54:14 +03: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
Henry Jameson
dfd89b0bbc revert, it's still missing 2019-04-09 22:28:36 +03:00
Henry Jameson
d95fc02810 add support for pleroma-specific fields 2019-04-09 22:26:57 +03:00
Shpuld Shpludson
d7cf841dfe Merge branch '486-expand-button' into 'develop'
#486 - remove expand button on conversation page

Closes #486

See merge request pleroma/pleroma-fe!742
2019-04-09 18:52:18 +00:00
jared
5df049ca31 #486 - remove expand button on conversation page 2019-04-09 14:10:51 -04:00
Shpuld Shpludson
b3ace226fb Merge branch 'fix/prevent-repeated-fetching' into 'develop'
#485 Prevent repeated fetching

Closes #485

See merge request pleroma/pleroma-fe!738
2019-04-09 18:05:46 +00:00
jasper
011f04c196 fix small bug 2019-04-09 09:19:48 -07:00
jasper
b7d7c21617 Add await to login befor redirect to friends timeline 2019-04-09 08:57:41 -07:00