summaryrefslogtreecommitdiff
AgeCommit message (Expand)Author
2019-03-06Merge branch 'bugfix/connect-src-https' into 'develop'kaniini
2019-03-06Merge branch 'bugfix/rel-me_list' into 'develop'kaniini
2019-03-06Merge branch 'feature/647' into 'develop'kaniini
2019-03-06[#647] tests for web pushMaksim
2019-03-06Merge branch 'features/masto_fe-config' into 'develop'kaniini
2019-03-06Keep heading shortMaxim Filippov
2019-03-06Merge branch 'fix/escape-reserved-chars-in-filenames' into 'develop'Haelwenn
2019-03-06Add default config for masto_feHaelwenn (lanodan) Monnier
2019-03-05Add handling of objects not in databaseKaren Konou
2019-03-05Add tests for reserved char escaping in uploadrinpatch
2019-03-05Properly escape reserved URI charachters in upload urlsrinpatch
2019-03-05Merge branch 'add-admin-to-node-info' into 'develop'rinpatch
2019-03-05Web.RelMe: Fix having other values in rel attrHaelwenn (lanodan) Monnier
2019-03-05Plugs.HTTPSecurityPlug: Add static_url to CSP's connect-srcHaelwenn (lanodan) Monnier
2019-03-05Merge branch 'bugfix/rich-media-uri-validation' into 'develop'Haelwenn
2019-03-05Include admins in nodeinfoeugenijm
2019-03-05TypoMaxim Filippov
2019-03-04rich media: helpers: rework validate_page_url()William Pitcock
2019-03-04local -> only_localMaxim Filippov
2019-03-04Format & update docsMaxim Filippov
2019-03-04helpers: use AutoLinker to validate URIs as well as the other testsWilliam Pitcock
2019-03-04tests: add tests for rich media helper functionsWilliam Pitcock
2019-03-04rich media: don't crawl bogus URIsWilliam Pitcock
2019-03-04Merge branch 'feature/add-status-text-to-notifications' into 'develop'kaniini
2019-03-04Merge search endpoint into /usersMaxim Filippov
2019-03-04Remove unused codeMaxim Filippov
2019-03-04Add status text to notifications (mentions and reposts)Maxim Filippov
2019-03-04Merge branch 'fix/like-adressing' into 'develop'kaniini
2019-03-04Stop adresssing like activities to actor's follower collection on non-public ...rinpatch
2019-03-04Merge branch 'unify-follow' into 'develop'kaniini
2019-03-04Merge branch 'dm-visibility-for-blocking-users' into 'develop'kaniini
2019-03-04Set content types settings on mastofe endpoint.KokaKiwi
2019-03-04Fix supported TLS versions as TLS 1.3 support seems buggy.KokaKiwi
2019-03-04Merge branch 'bugfix/delete-activity-audience' of git.pleroma.social:pleroma/...Karen Konou
2019-03-04fix formatKaren Konou
2019-03-04Expand "to" of delete activitiesKaren Konou
2019-03-04Expand "to" of delete activitiesKaren Konou
2019-03-04Fix DM visibility for blocking userseugenijm
2019-03-04Unify Mastodon and Twitter follow implementations using CommonAPIeugenijm
2019-03-03Merge branch 'muting' into 'develop'kaniini
2019-03-03Don't stream muted accountsWilliam Pearson
2019-03-03Move LDAP code to LDAPAuthenticator. Use Authenticator for token_exchange wi...link0ff
2019-03-03Merge branch 'remove-todo-txt' into 'develop'rinpatch
2019-03-03Remove TODO.txtrinpatch
2019-03-03Merge remote-tracking branch 'upstream/develop' into feature/openldap-supportlink0ff
2019-03-03Merge branch 'features/bio_rel_me' into 'develop'kaniini
2019-03-03Merge branch 'feature/add-pagination-to-users-admin-api' into 'develop'kaniini
2019-03-03Merge branch 'get-follow-requests-sql' into 'develop'kaniini
2019-03-03Merge branch 'atomic-note-count-updates' into 'develop'kaniini
2019-03-03Merge branch 'count-only-public-statuses' into 'develop'kaniini