aboutsummaryrefslogtreecommitdiff
path: root/lib/pleroma/web/views
AgeCommit message (Collapse)Author
2020-10-12Add missing Copyright headersMark Felder
2020-07-27Merge branch 'develop' into 'cleanup/masto_fe-default_settings'lain
# Conflicts: # lib/pleroma/web/views/masto_fe_view.ex
2020-07-27masto_fe_view: Remove @default_settingsHaelwenn (lanodan) Monnier
2020-06-30Rename user.settings columnMark Felder
This is used exclusively by MastoFE/GlitchFE now
2020-06-05Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into ↵lain
remake-remodel-dms
2020-06-05Credo fixes.lain
2020-06-05SideEffects / ChatView: Add an unread cache.lain
This is to prevent wrong values in the stream.
2020-06-03Streamer, SideEffects: Stream out ChatMessageReferenceslain
Saves us a few calles to fetch things from the DB that we already have.
2020-06-03ChatMessageReferences: Adjust viewslain
2020-06-01Merge remote-tracking branch 'origin/develop' into feature/embeddable-postsEgor Kislitsyn
2020-05-29StreamerView: Actually send Chats, not ChatMessages.lain
2020-05-29Streamer: Add a chat message stream.lain
2020-05-07Streamer: Fix wrong argument order when rendering activities to ↵rinpatch
authenticated user Closes #1747
2020-03-20Add embeddable postsEgor Kislitsyn
2020-03-03Update CopyrightsMark Felder
2020-01-22Add new users digest emailEgor Kislitsyn
2019-10-20Merge 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-19MastoFE: 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-02Add MastoFEControllerEgor Kislitsyn
2019-09-27Extract status actions from `MastodonAPIController` into `StatusController`Egor Kislitsyn
2019-09-16Revert "Merge branch 'revert-4fabf83a' into 'develop'"Egor Kislitsyn
This reverts commit fe7fd331263007e0fb2877ef7370a09a9704da36, reversing changes made to 4fabf83ad01352442906d79187aeab4c777f4df8.
2019-09-16Revert "Merge branch 'streamer-refactoring' into 'develop'"kaniini
This reverts merge request !1653
2019-09-16Streamer refactoringSteven Fuchs
2019-08-14Improve digest email templateEgor Kislitsyn
2019-06-29Resolve conflictsRoman Chvanikov
2019-06-06Replace 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-20Digest emailsRoman Chvanikov
2019-02-20logging: only return ISE reasons in API responses when in dev or test modeWilliam Pitcock
2019-02-20logging: improve visibility into ISE errorsWilliam Pitcock
2018-12-31update copyright years to 2019William Pitcock
2018-12-23add license boilerplate to pleroma coreWilliam Pitcock
2018-03-30Format the code.lain
2017-09-06Add very basic oauth and mastodon api support.Roger Braun
2017-03-17Phoenix skeletonRoger Braun