summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2019-01-11Merge branch 'bugfix/pinned-statuses' into 'develop'kaniini
Unpin when deleting a status See merge request pleroma/pleroma!655
2019-01-11Merge branch 'fix-spellign' into 'develop'scarlett
Fix spellign. See merge request pleroma/pleroma!656
2019-01-11Fix spellign.scarlett
2019-01-11typoEgor Kislitsyn
2019-01-11unpin when deleting a statusEgor Kislitsyn
2019-01-10Fix nginx caching issuesMark Felder
Nginx is currently not caching data because proxy_buffering needs to be enabled for caching to work at all, and we are receiving a Cache-Control header from Pleroma that states "max-age=0, private, must-revalidate" Even disregarding the Cache-Control header that should actually be set to "public, max-age=1209600" as defined in the reverse_proxy code, we don't want to obey this header at all as it overrides our Nginx caching rules.
2019-01-10Merge branch 'fix-varnish-chunked' into 'develop'kaniini
Fix varnish chunked and general improvements See merge request pleroma/pleroma!653
2019-01-10Merge branch 'activitypub-dereference-activity-id' into 'develop'kaniini
Support activity+json request for activity See merge request pleroma/pleroma!641
2019-01-10Consistent intentationMark Felder
2019-01-10Cache partial objects for 10 minutesMark Felder
This enables caching/streaming of chunked responses
2019-01-10Streaming is enabled by defaultMark Felder
Support more filetypes for caching static media
2019-01-10Merge branch 'feature/add-twitter-card-parser' into 'develop'kaniini
Add Twitter Card parser See merge request pleroma/pleroma!643
2019-01-10Add Twitter Card parserMaxim Filippov
2019-01-10Merge branch 'twapi-follower-pagination' into 'develop'kaniini
Twapi follower pagination See merge request pleroma/pleroma!648
2019-01-10Merge branch 'bugfix/markdown-newline-codeblocks' into 'develop'Haelwenn
common api: fix newlines in markdown code blocks See merge request pleroma/pleroma!651
2019-01-10test: common api: add tests for format_input/4William Pitcock
2019-01-10common api: utils: remove newline to <br> conversion from bare HTML to be ↵William Pitcock
consistent with markdown ok @lanodan
2019-01-10common api: fix newlines in markdown code blocksWilliam Pitcock
2019-01-10Merge branch 'feature/pinned-posts' into 'develop'kaniini
Pinned Statuses Closes #440 See merge request pleroma/pleroma!636
2019-01-10Merge branch 'mass-follow' into 'develop'kaniini
Mass follow See merge request pleroma/pleroma!642
2019-01-10Merge branch 'dm-optimizations' into 'develop'kaniini
Add activity visibility index. See merge request pleroma/pleroma!646
2019-01-10Merge branch 'fix-alphasort' into 'develop'kaniini
Alpha sort the restricted nicknames See merge request pleroma/pleroma!650
2019-01-10Alpha sort the restricted nicknamesMark Felder
2019-01-09Merge branch 'hotfix/ogp-cachex-fix' into 'develop'rinpatch
Rich media: Remove :commit since a tuple is already returned See merge request pleroma/pleroma!649
2019-01-09Remove :commit since a tuple is already returnedrinpatch
2019-01-09Add integer casts.lain
2019-01-09TwitterAPI: Add follower/following pagination.lain
2019-01-09Merge branch 'scarlett/pleroma-summary-html-api' into 'develop'lambda
Scarlett/pleroma summary html api See merge request pleroma/pleroma!647
2019-01-09Add test for summary_htmllain
2019-01-09Build the index concurrently.lain
2019-01-09Add activity visibility index.lain
2019-01-09improve testsEgor Kislitsyn
2019-01-09Add Twitter API for the pinned statusesEgor Kislitsyn
``` # Only return statuses that have been pinned GET /api/statuses/user_timeline.json?pinned=true # Pin POST /api/statuses/pin/:id # Unpin POST /api/statuses/unpin/:id ```
2019-01-09Remove recent activity restriction.lain
This should be fine now, everything should be covered by indices.
2019-01-09only non-reblogs, self-authored, public statuses can be pinnedEgor Kislitsyn
2019-01-09Use follow_all in autofollow.lain
2019-01-09Add User mass following function.lain
2019-01-09move defaults from sample_config.exs to config.exsEgor Kislitsyn
2019-01-09Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into ↵Egor Kislitsyn
feature/pinned-posts # Conflicts: # docs/config.md
2019-01-09Support activity+json request for activitysxsdv1
2019-01-09Merge branch 'hotfix/media-proxy-uri' into 'develop'kaniini
user: fix local vs remote determination in remote_or_auth_active?/1 See merge request pleroma/pleroma!640
2019-01-09test: user: add tests for visible_for?/2William Pitcock
2019-01-09tests: user: add tests for superuser?/1William Pitcock
2019-01-09user: fix auth_active?/1 for remote usersWilliam Pitcock
2019-01-09user: factor out illogical User.Info.superuser?/1.William Pitcock
any actual callee will be dealing with a User struct to begin with, so just check the child struct inside User.superuser?/1 with pattern matching.
2019-01-09user: remove entirely redundant remote_or_auth_active?/1.William Pitcock
auth_active?/1 can check remote users and return true directly.
2019-01-09user: harden auth_active?/1, superuser?/1, visible_for?/1William Pitcock
2019-01-09tests: user: add regression test for remote_or_auth_active?/1William Pitcock
2019-01-09user: use pattern matching to determine if user is local or remote instead ↵William Pitcock
of the previous hairy logic
2019-01-08Merge branch 'autofollow' into 'develop'rinpatch
Add a setting for users to autofollow on sign up. See merge request pleroma/pleroma!639