Age | Commit message (Collapse) | Author | |
---|---|---|---|
2020-04-02 | Merge branch 'feature/funkwhale-audio' into 'develop' | Haelwenn | |
Add support for funkwhale Audio activity Closes #764 and #1624 See merge request pleroma/pleroma!2287 | |||
2020-03-15 | relay list shows hosts without accepted follow | Alexander Strizhakov | |
2020-03-03 | Older copyright updates | Mark Felder | |
2020-03-03 | Update Copyrights | Mark Felder | |
2020-03-02 | Bump copyright years of files changed after 2020-01-07 | Haelwenn (lanodan) Monnier | |
Done via the following command: git diff fcd5dd259a1700a045be902b43391b0d1bd58a5b --stat --name-only | xargs sed -i '/Pleroma Authors/c# Copyright © 2017-2020 Pleroma Authors <https:\/\/pleroma.social\/>' | |||
2020-03-02 | Bump copyright years of files changed after 2019-01-01 | Haelwenn (lanodan) Monnier | |
Done via the following command: git diff 1e6c102b --stat --name-only | cat - | xargs sed -i 's/2017-2018 Pleroma Authors/2017-2019 Pleroma Authors/' | |||
2020-02-24 | Merge branch 'bugfix/captcha-nil-answer_data' into 'develop' | lain | |
Bugfix: return invalid when answer_data is nil Closes #1585 See merge request pleroma/pleroma!2236 | |||
2020-02-24 | Captcha: return invalid when answer_data is nil | Haelwenn (lanodan) Monnier | |
2020-02-20 | Merge remote-tracking branch 'remotes/origin/develop' into ↵ | Ivan Tashkinov | |
1505-threads-federation # Conflicts: # config/config.exs | |||
2020-02-18 | Merge remote-tracking branch 'remotes/origin/develop' into ↵ | Ivan Tashkinov | |
1505-threads-federation | |||
2020-02-13 | Tweaks to `clear_config` calls in tests in order to prevent side effects on ↵ | Ivan Tashkinov | |
config during test suite execution. | |||
2020-02-05 | Merge remote-tracking branch 'remotes/origin/develop' into ↵ | Ivan Tashkinov | |
1505-threads-federation | |||
2020-01-28 | Merge branch 'develop' into issue/1383 | Maksim Pechnikov | |
2020-01-28 | Fix compatibility with Elixir v1.10 | Egor Kislitsyn | |
2020-01-25 | [#1505] Background fetching of incoming activities' `replies` collections. | Ivan Tashkinov | |
2020-01-22 | Merge branch 'develop' into issue/1383 | Maksim Pechnikov | |
2020-01-16 | renaming | Alexander Strizhakov | |
Pleroma.Web.AdminAPI.Config -> Pleroma.ConfigDB | |||
2020-01-15 | little cleanup | Alexander Strizhakov | |
2020-01-13 | Merge branch 'develop' into issue/1383 | Maksim Pechnikov | |
2020-01-11 | Merge branch 'develop' into admin-be | Alexander Strizhakov | |
2020-01-10 | partially settings update | Alexander | |
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 | |