| Age | Commit message (Collapse) | Author | |
|---|---|---|---|
| 2020-07-27 | Merge branch 'develop' into 'cleanup/masto_fe-default_settings' | lain | |
| # Conflicts: # lib/pleroma/web/views/masto_fe_view.ex | |||
| 2020-07-27 | masto_fe_view: Remove @default_settings | Haelwenn (lanodan) Monnier | |
| 2020-06-30 | Rename user.settings column | Mark Felder | |
| This is used exclusively by MastoFE/GlitchFE now | |||
| 2020-06-05 | Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into ↵ | lain | |
| remake-remodel-dms | |||
| 2020-06-05 | Credo fixes. | lain | |
| 2020-06-05 | SideEffects / ChatView: Add an unread cache. | lain | |
| This is to prevent wrong values in the stream. | |||
| 2020-06-03 | Streamer, SideEffects: Stream out ChatMessageReferences | lain | |
| Saves us a few calles to fetch things from the DB that we already have. | |||
| 2020-06-03 | ChatMessageReferences: Adjust views | lain | |
| 2020-06-01 | Merge remote-tracking branch 'origin/develop' into feature/embeddable-posts | Egor Kislitsyn | |
| 2020-05-29 | StreamerView: Actually send Chats, not ChatMessages. | lain | |
| 2020-05-29 | Streamer: Add a chat message stream. | lain | |
| 2020-05-07 | Streamer: Fix wrong argument order when rendering activities to ↵ | rinpatch | |
| authenticated user Closes #1747 | |||
| 2020-03-20 | Add embeddable posts | Egor Kislitsyn | |
| 2020-03-03 | Update Copyrights | Mark Felder | |
| 2020-01-22 | Add new users digest email | Egor Kislitsyn | |
| 2019-10-20 | Merge remote-tracking branch 'remotes/upstream/develop' into ↵ | Ivan Tashkinov | |
| 1304-user-info-deprecation # Conflicts: # CHANGELOG.md # lib/pleroma/notification.ex # lib/pleroma/user.ex # lib/pleroma/user/info.ex # lib/pleroma/web/activity_pub/activity_pub.ex # lib/pleroma/web/admin_api/admin_api_controller.ex # lib/pleroma/web/ostatus/handlers/follow_handler.ex # lib/pleroma/web/ostatus/ostatus.ex # lib/pleroma/web/salmon/salmon.ex # lib/pleroma/web/websub/websub.ex # test/web/admin_api/admin_api_controller_test.exs # test/web/federator_test.exs # test/web/mastodon_api/controllers/conversation_controller_test.exs # test/web/ostatus/ostatus_controller_test.exs # test/web/ostatus/ostatus_test.exs # test/web/salmon/salmon_test.exs # test/web/websub/websub_test.exs | |||
| 2019-10-19 | MastoFE: Add PWA manifest. | KokaKiwi | |
| 2019-10-16 | [#1304] Moved all non-mutes / non-blocks fields from User.Info to User. WIP. | Ivan Tashkinov | |
| 2019-10-02 | Add MastoFEController | Egor Kislitsyn | |
| 2019-09-27 | Extract status actions from `MastodonAPIController` into `StatusController` | Egor Kislitsyn | |
| 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-08-14 | Improve digest email template | Egor Kislitsyn | |
| 2019-06-29 | Resolve conflicts | Roman Chvanikov | |
| 2019-06-06 | Replace Mix.env with Pleroma.Config.get(:env) | rinpatch | |
| Mix.env/0 is not availible in release environments such as distillery or elixir's built-in releases. | |||
| 2019-04-20 | Digest emails | Roman Chvanikov | |
| 2019-02-20 | logging: only return ISE reasons in API responses when in dev or test mode | William Pitcock | |
| 2019-02-20 | logging: improve visibility into ISE errors | William Pitcock | |
| 2018-12-31 | update copyright years to 2019 | William Pitcock | |
| 2018-12-23 | add license boilerplate to pleroma core | William Pitcock | |
| 2018-03-30 | Format the code. | lain | |
| 2017-09-06 | Add very basic oauth and mastodon api support. | Roger Braun | |
| 2017-03-17 | Phoenix skeleton | Roger Braun | |
 |
index : pleroma.git | |
| [no description] |
| aboutsummaryrefslogtreecommitdiff |