summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2019-03-18Merge branch 'feature/order-users-by-nickname-admin-api' into 'develop'kaniini
Order users by nickname See merge request pleroma/pleroma!945
2019-03-18Merge branch 'doc/mastodon-api-accounts-extension' into 'develop'kaniini
Document additional pleroma changes to /api/v1/accounts/:id See merge request pleroma/pleroma!952
2019-03-18Document additional pleroma changes to /api/v1/accounts/:idMark Felder
2019-03-18Merge branch 'masto-api-notifications' into 'develop'kaniini
Add support for exclude_types, limit and min_id in Mastodon notifications See merge request pleroma/pleroma!949
2019-03-18Merge branch 'fix-initial-posts' into 'develop'rinpatch
Check if the user has indeed not been federated with before fetching initial posts See merge request pleroma/pleroma!951
2019-03-18[#923] Registration validations & unique index on [:user_id, :provider].Ivan Tashkinov
2019-03-18Check if the user has indeed not been federated withEkaterina Vaartis
Just updating the user triggered post fetching too, now it shouldn't. It only happened in the AP user fetching since that's what's used to update users
2019-03-18[#923] External User registration refactoring, password randomization.Ivan Tashkinov
2019-03-18Fix with expression always matchingZachary Dunn
2019-03-18RunZachary Dunn
2019-03-18Use better error messageZachary Dunn
2019-03-18[#923] Support for multiple (external) registrations per user via Registration.Ivan Tashkinov
2019-03-18Fix missing end braceZachary Dunn
2019-03-18Initial attempt at updating return typeZachary Dunn
2019-03-18Merge branch 'add-is-seen-mastodon-api-doc' into 'develop'rinpatch
Added documentation for Pleroma-specific is_seen in Mastodon API See merge request pleroma/pleroma!948
2019-03-18Added support for exclude_types, limit, and min_id in Mastodoneugenijm
notifications. Unify Mastodon-compatible pagination logic.
2019-03-18Added documentation for Pleroma-specific is_seen in Mastodon APIeugenijm
2019-03-18[#923] Merge remote-tracking branch 'remotes/upstream/develop' into ↵Ivan Tashkinov
twitter_oauth # Conflicts: # config/config.exs # lib/pleroma/web/auth/pleroma_authenticator.ex
2019-03-18Merge branch 'feature/allow-link-rel-attribute' into 'develop'kaniini
Allow 'rel' attribute on `<a>` link with specific values (for hashtag recognition). See merge request pleroma/pleroma!946
2019-03-17Web.Router: Add routes for Conversation mastoAPIHaelwenn (lanodan) Monnier
2019-03-17Add test for conversation API beforehandHaelwenn (lanodan) Monnier
2019-03-17Allow 'rel' attribute on `<a>` link with specific values (for hashtag ↵Fong-Wan Chau
recognition).
2019-03-17Merge branch 'feature/order-users-by-nickname-admin-api' of ↵Maxim Filippov
git.pleroma.social:maxf/pleroma into feature/order-users-by-nickname-admin-api
2019-03-17Fix testMaxim Filippov
2019-03-17Order users by nicknameMaxim Filippov
2019-03-17Order users by nicknameMaxim Filippov
2019-03-16Merge branch 'feature/federated-flags' into 'develop'kaniini
Federated reports See merge request pleroma/pleroma!935
2019-03-16Merge branch 'feature/oauth-me' into 'develop'lambda
oauth: add me property to token responses See merge request pleroma/pleroma!942
2019-03-16Merge branch 'feature/reblog-muting' into 'develop'kaniini
Implement mastodon's reblog hiding feature See merge request pleroma/pleroma!916
2019-03-16Merge branch 'bugfix/ldap-test-fix' into 'develop'kaniini
test: fix defective ldap setup/teardown See merge request pleroma/pleroma!943
2019-03-16test: fix defective ldap setup/teardownWilliam Pitcock
2019-03-16oauth: add me property to token responsesWilliam Pitcock
2019-03-16Merge branch 'mark-notifications-as-read' into 'develop'kaniini
Allow to mark a single notification as read See merge request pleroma/pleroma!941
2019-03-15Allow to mark a single notification as readeugenijm
2019-03-15Merge branch 'fix/mediaproxy-capture-content-disposition-filename' into ↵kaniini
'develop' MediaProxy: parse filename from content-disposition for non-whitelisted types See merge request pleroma/pleroma!936
2019-03-15Merge branch 'feature/openldap-support' into 'develop'kaniini
OpenLDAP support Closes #203 See merge request pleroma/pleroma!859
2019-03-15Merge branch 'enable-dedupe-by-default' into 'develop'kaniini
Enable dedupe by default See merge request pleroma/pleroma!939
2019-03-15Merge branch 'docs/ex_doc-929-wiki-imports' into 'develop'kaniini
Fix headers and add !929 docs to extras See merge request pleroma/pleroma!940
2019-03-15Add tests for LDAP authorizationlink0ff
2019-03-15Merge remote-tracking branch 'remotes/upstream/develop' into twitter_oauthIvan Tashkinov
2019-03-15[#923] OAuth: prototype of sign in / sign up with Twitter.Ivan Tashkinov
2019-03-15remove unused functionKaren Konou
2019-03-15fix credo warningKaren Konou
2019-03-15formattingKaren Konou
2019-03-15Fix streamer testKaren Konou
2019-03-15Refactor to store user ap_id, add testsKaren Konou
2019-03-15formattingKaren Konou
2019-03-15refactor filtering mechanismKaren Konou
2019-03-15Fix elixir 1.8 vs 1.7 format conflictKaren Konou
2019-03-15Add ActivityPub.contain_activity checks to streamerKaren Konou
generated by cgit v1.2.3 (git 2.25.1) at 2025-07-09 17:11:59 +0000