Commit Graph

372 Commits (52006f8f8a9e71f7444b6849ba01c4fef69745d7)

Author SHA1 Message Date
lambda f3045a179e Merge branch 'i1t/pleroma-477_user_search_improvements' into 'develop'
6 years ago
Mark Felder 8c368d42a2 Make attachment links configurable
6 years ago
lain 943324b661 MastoAPI: Don't break on missing users.
6 years ago
Ivan Tashkinov dc45ec62c2 [#477] User search improvements: tsquery search with field weights, friends & followers boosting.
6 years ago
Sadposter 9daf162461 Honour parameters on MastoAPI /favourites
6 years ago
Sadposter 144b48da95 Add link headers to MastoAPI /favourites
6 years ago
Egor Kislitsyn e679da4c34 add `pinned` property to `StatusView`
6 years ago
Egor Kislitsyn f24087f96e Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into feature/pinned-posts
6 years ago
Egor Kislitsyn 380e9fba21 add pinned posts
6 years ago
scarlett 36fa5e8802 Check visible_for_user when performing a search using a direct link.
6 years ago
Rin Toshaka 846082e54f Different caches based on the module. Remove scrubber version since it is not relevant anymore
6 years ago
kaniini 90e157ef80 Merge branch 'features/admin-api-user-views' into 'develop'
6 years ago
William Pitcock 980b5288ed update copyright years to 2019
6 years ago
Rin Toshaka 7e09c2bd7d Move scrubber cache-related functions to Pleroma.HTML
6 years ago
Rin Toshaka dec23500d8 Resolve merge conflict
6 years ago
Rin Toshaka 535fddd286 Friendship ended with Postgresql now Cachex is my best friend
6 years ago
Rin Toshaka d9f40b05b3 Added get_stripped_html_for_object. Renamed a few things
6 years ago
Rin Toshaka 19f9889fbe I am not sure what's going on anymore so I'll just commit and reset all the other files to HEAD
6 years ago
kaniini dd8f2196f6 Merge branch '483_blocks_import_export' into 'develop'
6 years ago
Ivan Tashkinov 0a41786624 [#467] Refactored valid / invalid user rendering.
6 years ago
Ivan Tashkinov 6e9a15b181 [#483] Blocked users export for TwitterAPI.
6 years ago
Haelwenn (lanodan) Monnier b43d630f30
Web.TwitterAPI.UserView: Add rights.admin
6 years ago
Ivan Tashkinov 0d1788ce44 [#471] Factored out User.visible_for?/2.
6 years ago
Ivan Tashkinov e6aeb1d4a5 [#471] Prevented rendering of inactive local accounts.
6 years ago
William Pitcock 2791ce9a1f add license boilerplate to pleroma core
6 years ago
William Pitcock 32dfc1d12a mastodon api: status view: remove obsolete peertube hack
6 years ago
Ivan Tashkinov 279096228c [#114] Made MastodonAPI and TwitterAPI user show actions return 404 for auth-inactive users
6 years ago
Ivan Tashkinov aed0f90287 [#114] Added `pleroma.confirmation_pending` to user views, adjusted view tests.
6 years ago
href 77b5154c82
Cowboy handler for Mastodon WebSocket
6 years ago
href 5dcb7aecea
More put_view.
6 years ago
href f672555ad3
Upgrade to Phoenix 1.4
6 years ago
eal 28478a9c4f Merge branch 'fix/masto-put-settings' into 'develop'
6 years ago
eal 4c783e35c0 Mastodon API: Fix PUT /api/web/settings
6 years ago
href acec11626d Merge branch 'fix/issue_272' into 'develop'
6 years ago
Maksim Pechnikov ea72ac549b fix case when tags is invalid
6 years ago
Maksim Pechnikov d3ec09bb38 fix tags
6 years ago
href 0b4c61e8d5
Fix warning
6 years ago
href ec0e613eca
Pleroma.Activity.mastodon_notification_type/1
6 years ago
href 331396cbcd
Properly disable Web Push if no VAPID key is set
6 years ago
Egor Kislitsyn 658edb166f
fix and improve web push; add configuration docs
6 years ago
lambda ff10b9927b Merge branch 'support/bugfix_272' into 'develop'
6 years ago
Maksim Pechnikov e94c3442f4 updates
6 years ago
Maksim Pechnikov 074fa790ba fix compile warnings
6 years ago
Maksim Pechnikov 068353ac0b formatting
6 years ago
Maksim Pechnikov 9442588ae9 fix hashtags in api response
6 years ago
lambda 94d8f1ab30 Merge branch '394_user_tags' into 'develop'
6 years ago
Ivan Tashkinov 7a2162bbcb [#394] User view (Twitter & Mastadon API): wrapped "tags" in "pleroma" map.
6 years ago
Ivan Tashkinov 7bcb6a183a [#394] Refactoring.
6 years ago
Ivan Tashkinov 7b19487389 [#394] Added `users.tags` and admin routes to tag and untag users. Added tests.
6 years ago
kaniini 1d531fd2f3 Merge branch 'fix/mastodon-api-settings' into 'develop'
6 years ago