| Age | Commit message (Collapse) | Author | |
|---|---|---|---|
| 2020-01-14 | Merge branch 'develop' into feature/tag_feed | Maksim Pechnikov | |
| 2020-01-12 | Assign token that can write to follows | Mark Felder | |
| 2020-01-12 | Merge branch 'develop' into issue/1354 | Mark Felder | |
| 2019-12-25 | added code of mr#2067 | Maksim Pechnikov | |
| 2019-12-22 | update test | Maksim Pechnikov | |
| 2019-12-21 | moved remote follow in separate controller | Maksim Pechnikov | |
| 2019-12-16 | tests: remove a useless 1 second sleep | rinpatch | |
| there is no need to wait for the task to finish, it will be deleted when the transaction is aborted anyway. | |||
| 2019-12-15 | OAuthScopesPlug: disallowed nil token (unless with :fallback option). WIP: ↵ | Ivan Tashkinov | |
| controller tests modification: OAuth scopes usage. | |||
| 2019-12-08 | Merge branch 'develop' into issue/1342 | Maksim Pechnikov | |
| 2019-11-28 | added privacy option to push notifications | Maksim Pechnikov | |
| 2019-11-28 | added User.NotificationSetting struct | Maksim Pechnikov | |
| 2019-11-10 | [#1335] User: refactored :blocks field into :blocked_users relation. | Ivan Tashkinov | |
| Introduced UserBlock. | |||
| 2019-10-24 | Merge remote-tracking branch 'upstream/develop' into ↵ | Egor Kislitsyn | |
| refactor/following-relationships | |||
| 2019-10-16 | [#1304] Moved all non-mutes / non-blocks fields from User.Info to User. WIP. | Ivan Tashkinov | |
| 2019-10-11 | Replace `user.following` with Pleroma.FollowingRelationship | Egor Kislitsyn | |
| 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 | Fix merge | Egor Kislitsyn | |
| 2019-09-23 | Merge branch 'feature/force-password-reset' into 'develop' | kaniini | |
| Admin API: Add ability to require password reset See merge request pleroma/pleroma!1705 | |||
| 2019-09-22 | Admin API: Add ability to force user's password reset | Maxim Filippov | |
| 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-19 | Add `rel="ugc"` to hashtags and mentions | Egor Kislitsyn | |
| 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-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 | Restore tests for `change_password` and `delete_account` | Egor Kislitsyn | |
| 2019-09-15 | [#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 # lib/pleroma/web/router.ex | |||
| 2019-09-14 | [#1149] Merge remote-tracking branch 'remotes/upstream/develop' into ↵ | Ivan Tashkinov | |
| 1149-oban-job-queue # Conflicts: # docs/config.md # mix.lock | |||
| 2019-09-13 | Merge branch 'capture-test-errors' into 'develop' | lain | |
| Capture test error messages where appropriate See merge request pleroma/pleroma!1665 | |||
| 2019-09-13 | Capture test error messages where appropriate | stwf | |
| 2019-09-13 | Add email change endpoint | Egor Kislitsyn | |
| 2019-09-08 | [#1234] Mastodon 2.4.3 hierarchical scopes initial support (WIP). | 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 | |||
| 2019-09-06 | Merge branch 'so-long-twitterapi' into 'develop' | rinpatch | |
| Removing TwitterAPI See merge request pleroma/pleroma!1605 | |||
| 2019-09-05 | Merge remote-tracking branch 'remotes/upstream/develop' into 1149-oban-job-queue | Ivan Tashkinov | |
| 2019-09-04 | Extend `/api/pleroma/notifications/read` to mark multiple notifications | rinpatch | |
| as read and make it respond with Mastoapi entities | |||
| 2019-08-31 | Remove a useless import | rinpatch | |
| 2019-08-31 | Add a changelog entry for twitterapi removal and fix credo issues | rinpatch | |
| 2019-08-31 | Remove TwitterAPI representers | rinpatch | |
| 2019-08-31 | Remove Activity, User and Notification views from TwitterAPI | rinpatch | |
| 2019-08-31 | Remove most of Pleroma.Web.TwitterAPI.TwitterAPI | rinpatch | |
| 2019-08-27 | Remove most of TwitterAPIController | rinpatch | |
| 2019-08-22 | [#1149] Merge remote-tracking branch 'remotes/upstream/develop' into ↵ | Ivan Tashkinov | |
| 1149-oban-job-queue # Conflicts: # lib/pleroma/application.ex # lib/pleroma/scheduled_activity_worker.ex # lib/pleroma/web/federator/retry_queue.ex # lib/pleroma/web/oauth/token/clean_worker.ex # test/user_test.exs # test/web/federator_test.exs | |||
| 2019-08-19 | added test helpers to clear config after tests | Maksim | |
| 2019-08-14 | [#1149] Oban mailer job. Adjusted tests. | Ivan Tashkinov | |
| 2019-08-13 | [#1149] Added more oban workers. Refactoring. | Ivan Tashkinov | |
| 2019-07-31 | tests for TwitterApi/UtilController | Maksim | |
| 2019-07-19 | #1110 fixed /api/pleroma/healthcheck | Maksim | |
| 2019-07-17 | Fix password reset for non-test env | Eugenij | |
| Fixes `Plug.Conn.NotSentError` that causes a 5xx error in response instead of 404 and 400. Fixes pattern matching error caused by different response format in test and non-test env: `Pleroma.Emails.Mailer.deliver_async` returns :ok when PleromaJobQueue is enabled and `{:ok, _}` when it's disabled. In tests, it's disabled. | |||
| 2019-07-16 | mastoapi password reset | Alexander Strizhakov | |
| added rate limit to password reset configure rate limit in runtime | |||
| 2019-07-14 | Feature/1072 muting notifications | Alexander Strizhakov | |
