limepotato/akkoma
1
0
Fork 0
Code Pull requests Activity
14658 commits 27 branches 107 tags 315 MiB
Commit graph

47 commits

Author SHA1 Message Date
FloatingGhost
0f132b802d purge chat and shout endpoints 2022-07-21 11:29:28 +01:00
Tusooa Zhu
63a0536d55 Make mail and mailer translatable 2022-06-29 20:45:05 +01:00
FloatingGhost
0d012ebea1 Revert "Merge branch 'remove/mastofe' into 'develop'" 
This reverts commit 6b3842cf50, reversing
changes made to 6b1282a829.
 2022-01-08 21:44:37 +00:00
Alex Gleason
720198d569
Merge remote-tracking branch 'pleroma/develop' into manifest 2021-11-24 17:58:58 -06:00
Alex Gleason
cb9359335f
Expose /manifest.json for PWA 2021-11-24 17:50:55 -06:00
Sean King
2e310b3ec8
Fix more build errors 2021-06-04 15:06:55 -06:00
Alex Gleason
51a9f97e87
Deprecate Pleroma.Web.base_url/0 
Use Pleroma.Web.Endpoint.url/0 directly instead. Reduces compiler cycles.
 2021-05-31 16:48:03 -05:00
Alex Gleason
07fed0fda2
Switch to aliasing Router.Helpers instead of importing 2021-05-18 17:45:30 -05:00
Ivan Tashkinov
60b4654038 Email-like field in /api/v1/accounts/verify_credentials response (for OAuth plugins like Peertube). 
Addresses https://git.pleroma.social/pleroma/pleroma-support/-/issues/56.
 2021-01-28 19:49:43 +03:00
Haelwenn (lanodan) Monnier
c4439c630f
Bump Copyright to 2021 
grep -rl '# Copyright © .* Pleroma' * | xargs sed -i 's;Copyright © .* Pleroma .*;Copyright © 2017-2021 Pleroma Authors <https://pleroma.social/>;'
 2021-01-13 07:49:50 +01:00
Egor Kislitsyn
c9afb350e7
Document follow relationship updates and cleanup 2020-12-02 19:16:36 +04:00
Egor Kislitsyn
35ba48494f
Stream follow updates 2020-12-02 00:18:58 +04:00
Mark Felder
8539e386c3 Add missing Copyright headers 2020-10-12 12:00:50 -05:00
lain
e1a1c8e7de Merge branch 'develop' into 'cleanup/masto_fe-default_settings' 
# Conflicts:
#   lib/pleroma/web/views/masto_fe_view.ex
 2020-07-27 16:35:47 +00:00
Haelwenn (lanodan) Monnier
4a6389316d
masto_fe_view: Remove @default_settings 2020-07-27 17:59:13 +02:00
Mark Felder
d69af7f742 Rename user.settings column 
This is used exclusively by MastoFE/GlitchFE now
 2020-06-30 11:50:53 -05:00
lain
a8ca030d85 Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into remake-remodel-dms 2020-06-05 16:53:56 +02:00
lain
f3ea6ee2c8 Credo fixes. 2020-06-05 12:45:25 +02:00
lain
cc8a7dc205 SideEffects / ChatView: Add an unread cache. 
This is to prevent wrong values in the stream.
 2020-06-05 12:01:33 +02:00
lain
fb4ae9c720 Streamer, SideEffects: Stream out ChatMessageReferences 
Saves us a few calles to fetch things from the DB that we already
have.
 2020-06-03 16:45:04 +02:00
lain
f3ccd50a33 ChatMessageReferences: Adjust views 2020-06-03 12:49:53 +02:00
Egor Kislitsyn
6b84c62d4a
Merge remote-tracking branch 'origin/develop' into feature/embeddable-posts 2020-06-01 17:38:57 +04:00
lain
767ce8b803 StreamerView: Actually send Chats, not ChatMessages. 2020-05-29 16:02:45 +02:00
lain
c86a88edec Streamer: Add a chat message stream. 2020-05-29 15:24:41 +02:00
rinpatch
eb1f2fcbc6 Streamer: Fix wrong argument order when rendering activities to authenticated user 
Closes #1747
 2020-05-07 16:13:24 +03:00
Egor Kislitsyn
cb8236cda6
Add embeddable posts 2020-03-20 21:46:26 +04:00
Mark Felder
05da5f5cca Update Copyrights 2020-03-03 16:44:49 -06:00
Egor Kislitsyn
df0b8f1d08
Add new users digest email 2020-01-22 20:31:42 +04:00
Ivan Tashkinov
c6fdfbc4f1 Merge remote-tracking branch 'remotes/upstream/develop' into 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-20 20:43:18 +03:00
KokaKiwi
638457ba94 MastoFE: Add PWA manifest. 2019-10-19 12:15:14 +02:00
Ivan Tashkinov
10ff01acd9 [#1304] Moved all non-mutes / non-blocks fields from User.Info to User. WIP. 2019-10-16 21:59:21 +03:00
Egor Kislitsyn
d3c404af12
Add MastoFEController 2019-10-02 20:36:08 +07:00
Egor Kislitsyn
98d1347a4e Extract status actions from MastodonAPIController into StatusController 2019-09-27 10:51:15 +07:00
Egor Kislitsyn
96816ceaa2 Revert "Merge branch 'revert-4fabf83a' into 'develop'" 
This reverts commit fe7fd33126, reversing
changes made to 4fabf83ad0.
 2019-09-16 17:55:04 +07:00
kaniini
c623b4324d Revert "Merge branch 'streamer-refactoring' into 'develop'" 
This reverts merge request !1653
 2019-09-16 09:09:21 +00:00
Steven Fuchs
aab264db82 Streamer refactoring 2019-09-16 07:44:03 +00:00
Egor Kislitsyn
4b7f1c6995 Improve digest email template 2019-08-14 20:46:05 +07:00
Roman Chvanikov
657277ffc0 Resolve conflicts 2019-06-29 00:52:50 +03:00
rinpatch
92213fb87c Replace Mix.env with Pleroma.Config.get(:env) 
Mix.env/0 is not availible in release environments such as distillery or
elixir's built-in releases.
 2019-06-06 23:59:51 +03:00
Roman Chvanikov
64a2c6a041 Digest emails 2019-04-20 19:42:19 +07:00
William Pitcock
22e2ed235d logging: only return ISE reasons in API responses when in dev or test mode 2019-02-20 17:36:47 +00:00
William Pitcock
8b08096436 logging: improve visibility into ISE errors 2019-02-20 17:14:18 +00:00
William Pitcock
980b5288ed update copyright years to 2019 2018-12-31 15:41:47 +00:00
William Pitcock
2791ce9a1f add license boilerplate to pleroma core 2018-12-23 20:56:42 +00:00
lain
4afbef39f4 Format the code. 2018-03-30 15:01:53 +02:00
Roger Braun
2a298d70f9 Add very basic oauth and mastodon api support. 2017-09-06 19:06:25 +02:00
Roger Braun
a93f3421a7 Phoenix skeleton 2017-03-17 17:09:58 +01:00