Commit Graph

5005 Commits

Author SHA1 Message Date
Shpuld Shpludson
5bf208f2d1 Merge branch 'fix/mobile-zoom' into 'develop'
Eliminate automatic zooming on mobile

See merge request pleroma/pleroma-fe!799
2019-05-18 16:56:20 +00:00
Mark Felder
0a6858eab8 Eliminate automatic zooming on mobile 2019-05-18 11:00:50 -05:00
kaniini
e14a15845c Merge branch 'bugfix/emoji-tooltip' into 'develop'
entity normalizer: add tooltip text to emojis

Closes #544

See merge request pleroma/pleroma-fe!798
2019-05-17 20:15:12 +00:00
William Pitcock
00ad97fcfa entity normalizer: add tooltip text to emojis 2019-05-17 20:10:50 +00:00
HJ
23c4c0c758 Merge branch '541' into 'develop'
Update Admin API urls in accordance with new docs

Closes #541

See merge request pleroma/pleroma-fe!796
2019-05-16 18:30:12 +00:00
taehoon
2457dd9b91 rename for consistency's sake 2019-05-16 14:02:37 -04:00
taehoon
b6731bd9af update admin api urls in accordance with new docs 2019-05-16 13:21:14 -04:00
HJ
2be3d5fd5f Merge branch 'fix/line-up-text-format-picker' into 'develop'
Line up rich text format picker with the status form

See merge request pleroma/pleroma-fe!785
2019-05-15 19:53:33 +00:00
Shpuld Shpludson
81278651d9 Line up rich text format picker with the status form 2019-05-15 19:53:33 +00:00
HJ
fedcc71676 Merge branch '468-pin-status' into 'develop'
Add ability to pin posts

Closes #468

See merge request pleroma/pleroma-fe!770
2019-05-15 18:26:09 +00:00
Henry Jameson
aa24ac7ea6 fix lint 2019-05-15 20:49:46 +03:00
Henry Jameson
7976d118ca Cleanup, little documentation, localization 2019-05-15 20:44:35 +03:00
taehoon
2ce0186327 update api service functions 2019-05-15 12:04:26 -04:00
taehoon
daba688f46 remove needless importing 2019-05-15 12:04:26 -04:00
taehoon
f68653d0dd show pinned state only in the user timeline 2019-05-15 12:04:26 -04:00
taehoon
110c9d3b26 improve performance by caching pinned status ids into user object 2019-05-15 12:04:26 -04:00
taehoon
87de130ee5 apply status normalizer 2019-05-15 12:04:26 -04:00
taehoon
98358d30bb update font 2019-05-15 12:04:26 -04:00
taehoon
2af088969a improve error handling logic 2019-05-15 12:04:26 -04:00
taehoon
12f8269f01 make sure to have rights property of user object 2019-05-15 12:04:26 -04:00
taehoon
1747cd8771 use text color instead 2019-05-15 12:04:26 -04:00
taehoon
19e79895bb revert unnecessary changes 2019-05-15 12:04:26 -04:00
taehoon
beaf512573 add translation 2019-05-15 12:04:26 -04:00
taehoon
d76bd0044f fix typo 2019-05-15 12:04:26 -04:00
taehoon
32be0e15d1 use pinned property from status directly 2019-05-15 12:04:26 -04:00
taehoon
f8186bfc74 show immediately pinned statuses 2019-05-15 12:04:26 -04:00
taehoon
a601337a20 clean up 2019-05-15 12:04:26 -04:00
taehoon
93e9bc019e clean up fetchPinnedStatuses api service 2019-05-15 12:04:26 -04:00
taehoon
8308315038 revert removeStatus changes 2019-05-15 12:04:26 -04:00
taehoon
1229622fed refactor error handling of pinStatus 2019-05-15 12:04:25 -04:00
taehoon
ce1d19136d refactor pin/unpin status logic 2019-05-15 12:04:25 -04:00
taehoon
e8abe1273b filter pinned statuses based on pinned entity instead of a separate user entity 2019-05-15 12:04:25 -04:00
taehoon
cd0a7afa06 remove pinned timeline, instead, use simple entity of user object 2019-05-15 12:04:25 -04:00
taehoon
9e22d6212a revert pinned timeline polling logic 2019-05-15 12:04:25 -04:00
dave
8095ce8f62 #468 - hide status menu after action button is clicked 2019-05-15 12:04:25 -04:00
dave
075ddc34f1 #468 - shwo pin button for valid statuses (public & unlisted) 2019-05-15 12:04:25 -04:00
dave
9fc997500e #468 - add extra buttons for status actions 2019-05-15 12:04:25 -04:00
dave
80ef855a63 #468 - add ellipsis font icon 2019-05-15 12:04:25 -04:00
dave
006bf1ce63 #468 - fix plus button size issue, use scss variable properly 2019-05-15 12:04:25 -04:00
dave
e6268c492e #468 - clean up 2019-05-15 12:04:25 -04:00
dave
5ab0e71500 #468 - show pin status API error 2019-05-15 12:04:24 -04:00
dave
df207593e9 #468 - update pinned status after actions(remove, add) 2019-05-15 12:04:24 -04:00
dave
f1ff48ffd6 #468 - remove unpinned status from timeline 2019-05-15 12:04:24 -04:00
dave
2c89d49a3d #468 - show pinned timeline and add pinned label to the status 2019-05-15 12:04:24 -04:00
dave
e28b19645a #468 - show pin for own statuses only 2019-05-15 12:04:24 -04:00
dave
1aa0e8d7e0 #468 - pin/unpin status 2019-05-15 12:04:24 -04:00
dave
b491e6acbe #468 - add pin icon 2019-05-15 12:04:24 -04:00
dave
affbe8700e #468 - integrate endpoints 2019-05-15 12:04:24 -04:00
HJ
9eac355851 Merge branch '539' into 'develop'
Show post reply button and count when logged out as well

Closes #539

See merge request pleroma/pleroma-fe!793
2019-05-15 15:55:17 +00:00
tarteka
bacbfc1154 Update es.json 2019-05-15 09:16:49 +00:00