Age | Commit message (Collapse) | Author | |
---|---|---|---|
2020-01-10 | config editing through database | Alex S | |
2019-12-21 | Merge branch 'develop' into issue/1383 | Maksim Pechnikov | |
2019-12-19 | Merge remote-tracking branch 'remotes/origin/develop' into ↵ | Ivan Tashkinov | |
oauth-scopes-tweaks-and-tests | |||
2019-12-19 | [#2068] Introduced proper OAuth tokens usage to controller tests. | Ivan Tashkinov | |
2019-12-17 | Add ActivityPub Object Event type support | Thomas Citharel | |
Adds Event support in the same way Video objects are handled, with the name of the object as message header. Signed-off-by: Thomas Citharel <tcit@tcit.fr> | |||
2019-12-15 | OAuthScopesPlug: disallowed nil token (unless with :fallback option). WIP: ↵ | Ivan Tashkinov | |
controller tests modification: OAuth scopes usage. | |||
2019-12-09 | Merge branch 'develop' into issue/1383 | Maksim Pechnikov | |
2019-12-08 | Merge branch 'develop' into issue/1342 | Maksim Pechnikov | |
2019-12-08 | Merge branch 'develop' into issue/1383 | Maksim Pechnikov | |
2019-12-06 | Merge branch 'feature/1455-chat-character-limit' into 'develop' | rinpatch | |
Feature/1455 chat character limit Closes #1455 See merge request pleroma/pleroma!2034 | |||
2019-12-05 | Merge branch '1335-user-api-id-fields-relations' into 'develop' | lain | |
[#1335] User: refactoring of AP ID fields into relations Closes #1335 See merge request pleroma/pleroma!1963 | |||
2019-12-05 | Merge branch 'feature/admin-api-render-whole-status' into 'develop' | feld | |
Miscellaneous grouped reports fixes Closes admin-fe#48 and admin-fe#51 See merge request pleroma/pleroma!2007 | |||
2019-12-05 | Merge branch 'develop' into issue/1342 | Maksim Pechnikov | |
2019-12-04 | Merge remote-tracking branch 'remotes/upstream/develop' into ↵ | Ivan Tashkinov | |
1335-user-api-id-fields-relations # Conflicts: # lib/pleroma/user.ex | |||
2019-12-04 | ChatChannel: Ignore messages that are too long. | lain | |
2019-12-04 | Merge branch 'develop' into issue/1383 | Maksim Pechnikov | |
2019-12-04 | updated ScheduledActivity | Maksim Pechnikov | |
2019-11-30 | Merge branch 'remove-info-from-users' into 'develop' | rinpatch | |
Removed users.info field See merge request pleroma/pleroma!2006 | |||
2019-11-30 | test missing first field | kPherox | |
2019-11-29 | Merge remote-tracking branch 'remotes/upstream/develop' into ↵ | Ivan Tashkinov | |
1335-user-api-id-fields-relations # Conflicts: # mix.lock | |||
2019-11-28 | added User.NotificationSetting struct | Maksim Pechnikov | |
2019-11-26 | Add federated test infrastructure | Chris McCord | |
2019-11-26 | Fix tests | Maxim Filippov | |
2019-11-23 | Removed users.info and remaining usages. | Ivan Tashkinov | |
2019-11-20 | [#1335] Reorganized users.subscribers as UserRelationship. Added tests for ↵ | Ivan Tashkinov | |
UserRelationship-related functionality. | |||
2019-11-04 | add missing tesla mocks | Steven Fuchs | |
2019-10-24 | Merge remote-tracking branch 'upstream/develop' into ↵ | Egor Kislitsyn | |
refactor/following-relationships | |||
2019-10-21 | Merge branch 'develop' into feature/masto_api_markers | Maksim Pechnikov | |
2019-10-21 | Merge branch 'develop' into refactor/following-relationships | Egor Kislitsyn | |
2019-10-19 | implement invisible support for remote users | Ariadne Conill | |
2019-10-18 | add some missing tesla fixtures | Ariadne Conill | |
2019-10-18 | websub: remove entirely | Ariadne Conill | |
2019-10-17 | add Markers /api/v1/markers | Maksim Pechnikov | |
2019-10-11 | Replace `user.following` with Pleroma.FollowingRelationship | Egor Kislitsyn | |
2019-10-09 | provide mocks for webfinger endpoints | Steven Fuchs | |
2019-10-06 | Merge remote-tracking branch 'remotes/upstream/develop' into ↵ | Ivan Tashkinov | |
1234-mastodon-2-4-3-oauth-scopes # Conflicts: # CHANGELOG.md # lib/pleroma/web/mastodon_api/controllers/account_controller.ex # lib/pleroma/web/mastodon_api/controllers/mastodon_api_controller.ex # lib/pleroma/web/router.ex | |||
2019-10-05 | Add test for handling Announces with inlined object from different origin | Thibaut Girka | |
2019-10-05 | Import object from self-Announce whenever possible | Thibaut Girka | |
2019-10-02 | [#1234] Merge remote-tracking branch 'remotes/upstream/develop' into ↵ | Ivan Tashkinov | |
1234-mastodon-2-4-3-oauth-scopes # Conflicts: # CHANGELOG.md # lib/pleroma/web/mastodon_api/controllers/mastodon_api_controller.ex # lib/pleroma/web/router.ex | |||
2019-09-30 | test: factory: implement support for generating mock audio and listen objects | Ariadne Conill | |
2019-09-19 | [#1234] Merge remote-tracking branch 'remotes/upstream/develop' into ↵ | Ivan Tashkinov | |
1234-mastodon-2-4-3-oauth-scopes # Conflicts: # lib/pleroma/web/admin_api/admin_api_controller.ex | |||
2019-09-18 | Merge branch 'chores/bump-copyright-year' into 'develop' | rinpatch | |
Bump copyright years of files changed in 2019 See merge request pleroma/pleroma!1698 | |||
2019-09-18 | Bump copyright years of files changed in 2019 | Haelwenn (lanodan) Monnier | |
Done via the following command: git diff 1e6c102bfcfe0e4835a48f2483f2376f9bf86a20 --stat --name-only | cat - | xargs sed -i 's/2017-2018 Pleroma Authors/2017-2019 Pleroma Authors/' | |||
2019-09-18 | Initial poll refresh support | rinpatch | |
Implement refreshing the object with an interval and call the function when getting the poll. | |||
2019-09-17 | [#1234] Merge remote-tracking branch 'remotes/upstream/develop' into ↵ | Ivan Tashkinov | |
1234-mastodon-2-4-3-oauth-scopes # Conflicts: # lib/pleroma/web/activity_pub/activity_pub_controller.ex | |||
2019-09-16 | Revert "Merge branch 'revert-4fabf83a' into 'develop'" | Egor Kislitsyn | |
This reverts commit fe7fd331263007e0fb2877ef7370a09a9704da36, reversing changes made to 4fabf83ad01352442906d79187aeab4c777f4df8. | |||
2019-09-16 | Revert "Merge branch 'streamer-refactoring' into 'develop'" | kaniini | |
This reverts merge request !1653 | |||
2019-09-16 | Streamer refactoring | Steven Fuchs | |
2019-09-15 | [#1234] Permissions-related fixes / new functionality (Masto 2.4.3 scopes). | Ivan Tashkinov | |
2019-09-06 | [#1149] Merge remote-tracking branch 'remotes/upstream/develop' into ↵ | Ivan Tashkinov | |
1149-oban-job-queue # Conflicts: # test/web/twitter_api/twitter_api_controller_test.exs |